more clean up of types usage

Author: fadi-george

src/core/types/api.ts

@@ -1,11 +1,15 @@
 import type { SetRequired } from 'type-fest';
 
-import type { APIHeaders } from 'src/shared/models/APIHeaders';
 import type {
   NotificationTypeValue,
   SubscriptionTypeValue,
 } from 'src/shared/subscriptions/types';
 
+export interface APIHeaders {
+  Authorization?: string;
+  [key: string]: any;
+}
+
 export interface RequestMetadata {
   appId: string;
   subscriptionId?: string;

src/shared/api/base.ts

@@ -1,10 +1,10 @@
 import { RETRY_MS } from 'src/core/operationRepo/constants';
+import type { APIHeaders } from 'src/core/types/api';
 import { getOneSignalApiUrl } from '../environment/detect';
 import { AppIDMissingError, RetryLimitError } from '../errors/common';
 import { delay } from '../helpers/general';
 import { isValidUuid } from '../helpers/validators';
 import { error } from '../libraries/log';
-import type { APIHeaders } from '../models/APIHeaders';
 import { IS_SERVICE_WORKER, VERSION } from '../utils/env';
 
 type SupportedMethods = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';

src/shared/api/sw.ts

@@ -1,10 +1,11 @@
 import { IdentityConstants } from 'src/core/constants';
 import { updateUserByAlias } from 'src/core/requests/api';
 import type { IUpdateUser } from 'src/core/types/api';
+import { debug } from 'src/shared/libraries/log';
 import type { ServerAppConfig } from '../config/types';
 import { enforceAlias, enforceAppId } from '../context/helpers';
+import type { DeliveryPlatformKindValue } from '../environment/constants';
 import { getSubscriptionType } from '../environment/detect';
-import type { DeliveryPlatformKindValue } from '../models/DeliveryPlatformKind';
 import {
   OutcomeAttributionType,
   type OutcomeAttribution,
@@ -13,7 +14,6 @@ import type { OutcomeRequestData } from '../outcomes/types';
 import { NotificationType } from '../subscriptions/constants';
 import * as OneSignalApiBase from './base';
 import { sendOutcome } from './shared';
-import { debug } from 'src/shared/libraries/log';
 
 export async function downloadSWServerAppConfig(
   appId: string,

src/shared/models/DeliveryPlatformKind.ts src/shared/environment/constants.tssrc/shared/models/DeliveryPlatformKind.ts renamed to src/shared/environment/constants.ts

@@ -1,12 +1,12 @@
-import {
-  DeliveryPlatformKind,
-  type DeliveryPlatformKindValue,
-} from '../models/DeliveryPlatformKind';
 import { SubscriptionType } from '../subscriptions/constants';
 import type { SubscriptionTypeValue } from '../subscriptions/types';
 import { Browser } from '../useragent/constants';
 import { getBrowserName, getBrowserVersion } from '../useragent/detect';
 import { API_ORIGIN, API_TYPE, IS_SERVICE_WORKER } from '../utils/env';
+import {
+  DeliveryPlatformKind,
+  type DeliveryPlatformKindValue,
+} from './constants';
 
 export const isBrowser = () => typeof window !== 'undefined';
 

src/shared/environment/detect.ts

@@ -17,12 +17,12 @@ import {
   mockPushSubscription,
   MockServiceWorker,
 } from '__test__/support/mocks/MockServiceWorker';
-import { setPushToken } from '../database/subscription';
-import { IDManager } from './IDManager';
+import { setPushToken } from '../../database/subscription';
+import { IDManager } from '../IDManager';
 import {
   SubscriptionManagerPage,
   updatePushSubscriptionModelWithRawSubscription,
-} from './subscription/page';
+} from './page';
 
 describe('SubscriptionManager', () => {
   beforeEach(() => {

src/shared/managers/SubscriptionManager.ts

@@ -14,11 +14,11 @@ import {
   putNotificationClickedForOutcomes,
 } from 'src/shared/database/notifications';
 import { getSubscription } from 'src/shared/database/subscription';
+import { DeliveryPlatformKind } from 'src/shared/environment/constants';
 import * as Log from 'src/shared/libraries/log';
 import { WorkerMessengerCommand } from 'src/shared/libraries/workerMessenger/constants';
 import { DEFAULT_DEVICE_ID } from 'src/shared/managers/subscription/constants';
 import { SubscriptionManagerSW } from 'src/shared/managers/subscription/sw';
-import { DeliveryPlatformKind } from 'src/shared/models/DeliveryPlatformKind';
 import { RawPushSubscription } from 'src/shared/models/RawPushSubscription';
 import { SubscriptionStrategyKind } from 'src/shared/models/SubscriptionStrategyKind';
 import {

…red/managers/SubscriptionManager.test.ts …hared/managers/subscription/page.test.tssrc/shared/managers/SubscriptionManager.test.ts renamed to src/shared/managers/subscription/page.test.ts src/shared/managers/SubscriptionManager.test.ts renamed to src/shared/managers/subscription/page.test.ts

@@ -20,6 +20,7 @@ import {
   getSubscription,
   setSubscription,
 } from 'src/shared/database/subscription';
+import type { DeliveryPlatformKindValue } from 'src/shared/environment/constants';
 import { getDeviceType } from 'src/shared/environment/detect';
 import { delay } from 'src/shared/helpers/general';
 import {
@@ -31,7 +32,6 @@ import { WorkerMessengerCommand } from 'src/shared/libraries/workerMessenger/con
 import { WorkerMessengerSW } from 'src/shared/libraries/workerMessenger/sw';
 import type { WorkerMessengerMessage } from 'src/shared/libraries/workerMessenger/types';
 import ContextSW from 'src/shared/models/ContextSW';
-import type { DeliveryPlatformKindValue } from 'src/shared/models/DeliveryPlatformKind';
 import { RawPushSubscription } from 'src/shared/models/RawPushSubscription';
 import { SubscriptionStrategyKind } from 'src/shared/models/SubscriptionStrategyKind';
 import type {