Merge pull request #996 from OneSignal/user-model/fix-privacy-consent…

…-block User model/fix privacy consent block
OneSignal · Feb 25, 2023 · 8f99d22 · 8f99d22
2 parents 53437c6 + a194fe3
commit 8f99d22
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/core/executors/ExecutorBase.ts b/src/core/executors/ExecutorBase.ts
@@ -7,6 +7,8 @@ import { logMethodCall } from "../../shared/utils/utils";
 import { SupportedModel } from "../models/SupportedModels";
 import ExecutorResult from "./ExecutorResult";
 import Log from "../../shared/libraries/Log";
+import Database from "../../shared/services/Database";
+import LocalStorage from "../../shared/utils/LocalStorage";
 
 const RETRY_AFTER = 5_000;
 
@@ -105,6 +107,13 @@ export default abstract class ExecutorBase {
   abstract getOperationsFromCache(): Promise<Operation<SupportedModel>[]>;
 
   protected async _processOperationQueue(): Promise<void> {
+    const consentRequired = OneSignal.config.userConfig.requiresUserPrivacyConsent || LocalStorage.getConsentRequired();
+    const consentGiven = await Database.getConsentGiven();
+
+    if (consentRequired && !consentGiven) {
+      return;
+    }
+
     const cachedOperations = await this.getOperationsFromCache();
     this._operationQueue = [...cachedOperations, ...this._operationQueue];
 

diff --git a/src/onesignal/OneSignal.ts b/src/onesignal/OneSignal.ts
@@ -96,6 +96,13 @@ export default class OneSignal {
   static async login(externalId: string, token?: string): Promise<void> {
     logMethodCall('login', { externalId, token });
 
+    const consentRequired = OneSignal.config?.userConfig.requiresUserPrivacyConsent || LocalStorage.getConsentRequired();
+    const consentGiven = await Database.getConsentGiven();
+
+    if (consentRequired && !consentGiven) {
+      throw new OneSignalError('Login: Consent required but not given, skipping login');
+    }
+
     try {
       // before, logging in, process anything waiting in the delta queue so it's not lost
       this.coreDirector.forceDeltaQueueProcessingOnAllExecutors();
@@ -219,6 +226,8 @@ export default class OneSignal {
       return;
     }
 
+    await OneSignal._initializeCoreModuleAndUserNamespace();
+
     if (OneSignal.config.userConfig.requiresUserPrivacyConsent || LocalStorage.getConsentRequired()) {
       const providedConsent = await Database.getConsentGiven();
       if (!providedConsent) {
@@ -231,7 +240,6 @@ export default class OneSignal {
   }
 
   private static async _delayedInit(): Promise<void> {
-    await OneSignal._initializeCoreModuleAndUserNamespace();
     OneSignal.pendingInit = false;
     // Ignore Promise as doesn't return until the service worker becomes active.
     OneSignal.context.workerMessenger.listen();