move session module to src/shared/session

Author: fadi-george

src/shared/helpers/ServiceWorkerHelper.ts

@@ -8,15 +8,15 @@ import OneSignalApiSW from '../api/OneSignalApiSW';
 import Utils from '../context/Utils';
 import type { OutcomesNotificationClicked } from '../models/OutcomesNotificationEvents';
 import Path from '../models/Path';
+import type { OutcomesConfig } from '../outcomes/types';
+import Database from '../services/Database';
 import {
   initializeNewSession,
   type Session,
   SessionOrigin,
   type SessionOriginValue,
   SessionStatus,
-} from '../models/Session';
-import type { OutcomesConfig } from '../outcomes/types';
-import Database from '../services/Database';
+} from '../session';
 import { OneSignalUtils } from '../utils/OneSignalUtils';
 import OutcomesHelper from './OutcomesHelper';
 

src/shared/managers/ServiceWorkerManager.ts

@@ -17,12 +17,9 @@ import {
   type NotificationForegroundWillDisplayEventSerializable,
 } from '../models/NotificationEvent';
 import Path from '../models/Path';
-import {
-  type PageVisibilityRequest,
-  type PageVisibilityResponse,
-} from '../models/Session';
 import Database from '../services/Database';
 import OneSignalEvent from '../services/OneSignalEvent';
+import type { PageVisibilityRequest, PageVisibilityResponse } from '../session';
 import { VERSION } from '../utils/EnvVariables';
 import OneSignalUtils from '../utils/OneSignalUtils';
 

src/shared/managers/SubscriptionManager.ts

@@ -29,7 +29,6 @@ import type { ContextSWInterface } from '../models/ContextSW';
 import { NotificationPermission } from '../models/NotificationPermission';
 import type { PushSubscriptionState } from '../models/PushSubscriptionState';
 import { RawPushSubscription } from '../models/RawPushSubscription';
-import { SessionOrigin } from '../models/Session';
 import { Subscription } from '../models/Subscription';
 import {
   SubscriptionStrategyKind,
@@ -41,6 +40,7 @@ import {
 } from '../models/UnsubscriptionStrategy';
 import Database from '../services/Database';
 import OneSignalEvent from '../services/OneSignalEvent';
+import { SessionOrigin } from '../session';
 import { Browser, getBrowserName } from '../useragent';
 import { base64ToUint8Array } from '../utils/Encoding';
 import { IS_SERVICE_WORKER } from '../utils/EnvVariables';

src/shared/managers/UpdateManager.ts

@@ -6,7 +6,7 @@ import FuturePushSubscriptionRecord from '../../page/userModel/FuturePushSubscri
 import OneSignalApiShared from '../api/OneSignalApiShared';
 import Log from '../libraries/Log';
 import type { ContextSWInterface } from '../models/ContextSW';
-import { SessionOrigin } from '../models/Session';
+import { SessionOrigin } from '../session';
 import { logMethodCall } from '../utils/utils';
 
 export class UpdateManager {

src/shared/managers/sessionManager/SessionManager.test.ts

@@ -1,11 +1,10 @@
-import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
-import { SessionManager } from './SessionManager';
-
 import { DUMMY_EXTERNAL_ID } from '__test__/support/constants';
+import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
 import { setAddAliasResponse } from '__test__/support/helpers/requests';
 import LoginManager from 'src/page/managers/LoginManager';
 import Log from 'src/shared/libraries/Log';
-import { SessionOrigin } from 'src/shared/models/Session';
+import { SessionOrigin } from 'src/shared/session';
+import { SessionManager } from './SessionManager';
 
 vi.spyOn(Log, 'error').mockImplementation(() => '');
 

src/shared/managers/sessionManager/SessionManager.ts

@@ -1,6 +1,11 @@
 import type { IUpdateUser } from 'src/core/types/api';
 import { NotificationType } from 'src/core/types/subscription';
 import { supportsServiceWorkers } from 'src/shared/environment';
+import {
+  SessionOrigin,
+  type SessionOriginValue,
+  type UpsertOrDeactivateSessionPayload,
+} from 'src/shared/session';
 import AliasPair from '../../../core/requestService/AliasPair';
 import { RequestService } from '../../../core/requestService/RequestService';
 import { isCompleteSubscriptionObject } from '../../../core/utils/typePredicates';
@@ -12,11 +17,6 @@ import OneSignalError from '../../../shared/errors/OneSignalError';
 import MainHelper from '../../helpers/MainHelper';
 import Log from '../../libraries/Log';
 import { WorkerMessengerCommand } from '../../libraries/WorkerMessenger';
-import {
-  SessionOrigin,
-  type SessionOriginValue,
-  type UpsertOrDeactivateSessionPayload,
-} from '../../models/Session';
 import { OneSignalUtils } from '../../utils/OneSignalUtils';
 import type { ISessionManager } from './types';
 

src/shared/managers/sessionManager/types.ts

@@ -1,4 +1,4 @@
-import type { SessionOriginValue } from '../../models/Session';
+import type { SessionOriginValue } from '../../session';
 
 export interface ISessionManager {
   setupSessionEventListeners(): void;

src/shared/services/Database.ts

@@ -26,9 +26,9 @@ import type {
   OutcomesNotificationClicked,
   OutcomesNotificationReceived,
 } from '../models/OutcomesNotificationEvents';
-import { ONESIGNAL_SESSION_KEY, type Session } from '../models/Session';
 import { Subscription } from '../models/Subscription';
 import { UserState } from '../models/UserState';
+import { ONESIGNAL_SESSION_KEY, type Session } from '../session';
 
 const DatabaseEventName = {
   SET: 0,

src/shared/session/constants.ts

@@ -0,0 +1,15 @@
+export const SessionStatus = {
+  Active: 'active',
+  Inactive: 'inactive',
+} as const;
+
+export const SessionOrigin = {
+  UserCreate: 1,
+  UserNewSession: 2,
+  VisibilityVisible: 3,
+  VisibilityHidden: 4,
+  BeforeUnload: 5,
+  PageRefresh: 6,
+  Focus: 7,
+  Blur: 8,
+} as const;

src/shared/session/index.ts

@@ -0,0 +1,3 @@
+export * from './constants';
+export * from './session';
+export * from './types';