refactor(demo): source app ID from env vars

Author: fadi-george

examples/demo/.env.example

@@ -1,3 +1,4 @@
 VITE_ONESIGNAL_APP_ID=your_onesignal_app_id
 VITE_ONESIGNAL_API_KEY=your_rest_api_key
+VITE_ONESIGNAL_ANDROID_CHANNEL_ID=
 VITE_E2E_MODE=false

examples/demo/src/hooks/useOneSignal.ts

@@ -15,6 +15,13 @@ import { NotificationType } from '../models/NotificationType';
 import OneSignalApiService, { API_KEY } from '../services/OneSignalApiService';
 import PreferencesService from '../services/PreferencesService';
 
+const APP_ID = import.meta.env.VITE_ONESIGNAL_APP_ID as string | undefined;
+const DEFAULT_APP_ID = '77e32082-ea27-42e3-a898-c72e141824ef';
+
+function resolveAppId(): string {
+  return APP_ID?.trim() || DEFAULT_APP_ID;
+}
+
 const apiService = OneSignalApiService.getInstance();
 const preferences = new PreferencesService();
 
@@ -101,7 +108,7 @@ export type UseOneSignalReturn = {
 };
 
 export function useOneSignal(): UseOneSignalReturn {
-  const [appId, setAppId] = useState(() => preferences.getAppId());
+  const [appId, setAppId] = useState(resolveAppId);
   const [consentRequired, setConsentRequiredState] = useState(false);
   const [privacyConsentGiven, setPrivacyConsentGivenState] = useState(false);
   const [externalUserId, setExternalUserId] = useState<string | undefined>(undefined);
@@ -222,7 +229,7 @@ export function useOneSignal(): UseOneSignalReturn {
     };
 
     const load = async () => {
-      const nextAppId = preferences.getAppId();
+      const nextAppId = resolveAppId();
       const nextConsentRequired = preferences.getConsentRequired();
       const nextPrivacyConsentGiven = preferences.getConsentGiven();
       const nextIamPaused = preferences.getIamPaused();

examples/demo/src/services/OneSignalApiService.ts

@@ -5,6 +5,8 @@ import { userDataFromJson } from '../models/UserData';
 import type { UserData } from '../models/UserData';
 
 export const API_KEY = import.meta.env.VITE_ONESIGNAL_API_KEY as string | undefined;
+const ANDROID_CHANNEL_ID = import.meta.env.VITE_ONESIGNAL_ANDROID_CHANNEL_ID as string | undefined;
+const DEFAULT_ANDROID_CHANNEL_ID = 'b3b015d9-c050-4042-8548-dcc34aa44aa4';
 
 class OneSignalApiService {
   private static instance: OneSignalApiService;
@@ -49,7 +51,7 @@ class OneSignalApiService {
         headings = { en: 'Sound Notification' };
         contents = { en: 'This notification plays a custom sound' };
         extra.ios_sound = 'vine_boom.wav';
-        extra.android_channel_id = 'b3b015d9-c050-4042-8548-dcc34aa44aa4';
+        extra.android_channel_id = ANDROID_CHANNEL_ID?.trim() || DEFAULT_ANDROID_CHANNEL_ID;
         break;
       default:
         return false;

examples/demo/src/services/PreferencesService.ts

@@ -1,27 +1,16 @@
-const APP_ID_KEY = 'onesignal.demo.appId';
 const CONSENT_REQUIRED_KEY = 'onesignal.demo.consentRequired';
 const CONSENT_GIVEN_KEY = 'onesignal.demo.consentGiven';
 const EXTERNAL_ID_KEY = 'onesignal.demo.externalUserId';
 const LOCATION_SHARED_KEY = 'onesignal.demo.locationShared';
 const IAM_PAUSED_KEY = 'onesignal.demo.iamPaused';
 
-const DEFAULT_APP_ID = '77e32082-ea27-42e3-a898-c72e141824ef';
-
 function readBoolean(key: string, fallback: boolean): boolean {
   const value = localStorage.getItem(key);
   if (value === null) return fallback;
   return value === 'true';
 }
 
 export default class PreferencesService {
-  getAppId(): string {
-    return localStorage.getItem(APP_ID_KEY) ?? DEFAULT_APP_ID;
-  }
-
-  setAppId(value: string): void {
-    localStorage.setItem(APP_ID_KEY, value);
-  }
-
   getConsentRequired(): boolean {
     return readBoolean(CONSENT_REQUIRED_KEY, false);
   }

examples/demo_pods/.env.example

@@ -1,3 +1,4 @@
 VITE_ONESIGNAL_APP_ID=your_onesignal_app_id
 VITE_ONESIGNAL_API_KEY=your_rest_api_key
+VITE_ONESIGNAL_ANDROID_CHANNEL_ID=
 VITE_E2E_MODE=false

examples/demo_pods/src/hooks/useOneSignal.ts

@@ -15,6 +15,13 @@ import { NotificationType } from '../models/NotificationType';
 import OneSignalApiService, { API_KEY } from '../services/OneSignalApiService';
 import PreferencesService from '../services/PreferencesService';
 
+const APP_ID = import.meta.env.VITE_ONESIGNAL_APP_ID as string | undefined;
+const DEFAULT_APP_ID = '77e32082-ea27-42e3-a898-c72e141824ef';
+
+function resolveAppId(): string {
+  return APP_ID?.trim() || DEFAULT_APP_ID;
+}
+
 const apiService = OneSignalApiService.getInstance();
 const preferences = new PreferencesService();
 
@@ -101,7 +108,7 @@ export type UseOneSignalReturn = {
 };
 
 export function useOneSignal(): UseOneSignalReturn {
-  const [appId, setAppId] = useState(() => preferences.getAppId());
+  const [appId, setAppId] = useState(resolveAppId);
   const [consentRequired, setConsentRequiredState] = useState(false);
   const [privacyConsentGiven, setPrivacyConsentGivenState] = useState(false);
   const [externalUserId, setExternalUserId] = useState<string | undefined>(undefined);
@@ -222,7 +229,7 @@ export function useOneSignal(): UseOneSignalReturn {
     };
 
     const load = async () => {
-      const nextAppId = preferences.getAppId();
+      const nextAppId = resolveAppId();
       const nextConsentRequired = preferences.getConsentRequired();
       const nextPrivacyConsentGiven = preferences.getConsentGiven();
       const nextIamPaused = preferences.getIamPaused();

examples/demo_pods/src/services/OneSignalApiService.ts

@@ -5,6 +5,8 @@ import { userDataFromJson } from '../models/UserData';
 import type { UserData } from '../models/UserData';
 
 export const API_KEY = import.meta.env.VITE_ONESIGNAL_API_KEY as string | undefined;
+const ANDROID_CHANNEL_ID = import.meta.env.VITE_ONESIGNAL_ANDROID_CHANNEL_ID as string | undefined;
+const DEFAULT_ANDROID_CHANNEL_ID = 'b3b015d9-c050-4042-8548-dcc34aa44aa4';
 
 class OneSignalApiService {
   private static instance: OneSignalApiService;
@@ -49,7 +51,7 @@ class OneSignalApiService {
         headings = { en: 'Sound Notification' };
         contents = { en: 'This notification plays a custom sound' };
         extra.ios_sound = 'vine_boom.wav';
-        extra.android_channel_id = 'b3b015d9-c050-4042-8548-dcc34aa44aa4';
+        extra.android_channel_id = ANDROID_CHANNEL_ID?.trim() || DEFAULT_ANDROID_CHANNEL_ID;
         break;
       default:
         return false;

examples/demo_pods/src/services/PreferencesService.ts

@@ -1,27 +1,16 @@
-const APP_ID_KEY = 'onesignal.demo.appId';
 const CONSENT_REQUIRED_KEY = 'onesignal.demo.consentRequired';
 const CONSENT_GIVEN_KEY = 'onesignal.demo.consentGiven';
 const EXTERNAL_ID_KEY = 'onesignal.demo.externalUserId';
 const LOCATION_SHARED_KEY = 'onesignal.demo.locationShared';
 const IAM_PAUSED_KEY = 'onesignal.demo.iamPaused';
 
-const DEFAULT_APP_ID = '77e32082-ea27-42e3-a898-c72e141824ef';
-
 function readBoolean(key: string, fallback: boolean): boolean {
   const value = localStorage.getItem(key);
   if (value === null) return fallback;
   return value === 'true';
 }
 
 export default class PreferencesService {
-  getAppId(): string {
-    return localStorage.getItem(APP_ID_KEY) ?? DEFAULT_APP_ID;
-  }
-
-  setAppId(value: string): void {
-    localStorage.setItem(APP_ID_KEY, value);
-  }
-
   getConsentRequired(): boolean {
     return readBoolean(CONSENT_REQUIRED_KEY, false);
   }