remove app state

Author: fadi-george

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -10,10 +10,10 @@ import { createPushSub } from '__test__/support/environment/TestEnvironmentHelpe
 import { MockServiceWorker } from '__test__/support/mocks/MockServiceWorker';
 import { clearStore, db, getOptionsValue } from 'src/shared/database/client';
 import { setAppState as setDBAppState } from 'src/shared/database/config';
+import type { AppState } from 'src/shared/database/types';
 import * as PermissionUtils from 'src/shared/helpers/permissions';
 import Emitter from 'src/shared/libraries/Emitter';
 import { checkAndTriggerSubscriptionChanged } from 'src/shared/listeners';
-import { AppState } from 'src/shared/models/AppState';
 import MainHelper from '../../../src/shared/helpers/MainHelper';
 
 vi.mock('src/shared/libraries/Log');

package.json

@@ -84,12 +84,12 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "51.91 kB",
+      "limit": "51.88 kB",
       "gzip": true
     },
     {
       "path": "./build/releases/OneSignalSDK.sw.js",
-      "limit": "14.04 kB",
+      "limit": "14.01 kB",
       "gzip": true
     },
     {

src/shared/database/config.ts

@@ -1,7 +1,7 @@
 import { getConsentRequired } from '../helpers/localStorage';
 import Log from '../libraries/Log';
-import { AppState } from '../models/AppState';
 import { db, getIdsValue, getOptionsValue } from './client';
+import type { AppState } from './types';
 
 export const getDBAppConfig = async () => {
   const config: any = {};
@@ -12,21 +12,27 @@ export const getDBAppConfig = async () => {
 };
 
 export const getAppState = async (): Promise<AppState> => {
-  const state = new AppState();
-  state.defaultNotificationUrl = await getOptionsValue<string>('defaultUrl');
-  state.defaultNotificationTitle =
+  const defaultNotificationUrl = await getOptionsValue<string>('defaultUrl');
+  const defaultNotificationTitle =
     await getOptionsValue<string>('defaultTitle');
-  state.lastKnownPushEnabled = await getOptionsValue<boolean>('isPushEnabled');
-  state.lastKnownOptedIn = await getOptionsValue<boolean>('lastOptedIn');
+  const lastKnownPushEnabled = await getOptionsValue<boolean>('isPushEnabled');
+  const lastKnownOptedIn = await getOptionsValue<boolean>('lastOptedIn');
 
   // lastKnown<PushId|PushToken|OptedIn> are used to track changes to the user's subscription
   // state. Displayed in the `current` & `previous` fields of the `subscriptionChange` event.
   // want undefined instead of null since its used to check for subscription changes
-  state.lastKnownPushId =
+  const lastKnownPushId =
     (await getOptionsValue<string>('lastPushId')) ?? undefined;
-  state.lastKnownPushToken =
+  const lastKnownPushToken =
     (await getOptionsValue<string>('lastPushToken')) ?? undefined;
-  return state;
+  return {
+    defaultNotificationUrl,
+    defaultNotificationTitle,
+    lastKnownPushEnabled,
+    lastKnownPushId,
+    lastKnownPushToken,
+    lastKnownOptedIn,
+  };
 };
 
 export const setAppState = async (appState: AppState) => {

src/shared/database/types.ts

@@ -4,7 +4,6 @@ import type {
   NotificationClickForOpenHandlingSchema,
   NotificationReceivedForOutcomesSchema,
 } from '../helpers/serializer';
-import type { AppState } from '../models/AppState';
 import type { SentUniqueOutcome } from '../models/Outcomes';
 import type { Session } from '../session/types';
 
@@ -187,4 +186,22 @@ export interface IndexedDBSchema extends DBSchema {
   };
 }
 
+export interface AppState {
+  defaultNotificationUrl: string | null | undefined;
+  defaultNotificationTitle: string | null | undefined;
+
+  /**
+   * Whether the user is currently completely subscribed, including not opted out. Database cached version of
+   * isPushNotificationsEnabled().
+   */
+  lastKnownPushEnabled: boolean | null | undefined;
+
+  lastKnownPushToken: string | null | undefined;
+
+  lastKnownPushId: string | null | undefined;
+
+  // default true
+  lastKnownOptedIn: boolean | null;
+}
+
 export type IDBStoreName = StoreNames<IndexedDBSchema>;