Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Nit use helper method
Browse files Browse the repository at this point in the history
shepherd-l committed Sep 10, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 351936f commit ab5900b
Showing 2 changed files with 12 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/core/CoreModuleDirector.ts
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ import User from '../onesignal/User';
import OneSignal from '../onesignal/OneSignal';
import Database from '../shared/services/Database';
import EventHelper from '../shared/helpers/EventHelper';
import { isSubscriptionType } from './utils/typePredicates';

/* Contains OneSignal User-Model-specific logic*/

@@ -257,9 +258,9 @@ export class CoreModuleDirector {
logMethodCall('CoreModuleDirector.getPushSubscriptionModelByCurrentToken');
const pushToken = await MainHelper.getCurrentPushToken();
if (pushToken) {
const pushSubscriptions = this.getAllPushSubscriptionModels();
return Object.values(pushSubscriptions).find(
(subscription) => subscription.data.token === pushToken,
return this.getSubscriptionOfTypeWithToken(
ModelName.Subscriptions,
pushToken,
);
}
return undefined;
@@ -330,7 +331,7 @@ export class CoreModuleDirector {
}

public getSubscriptionOfTypeWithToken(
type: SubscriptionType,
type: SubscriptionType | ModelName.Subscriptions,
token: string,
): OSModel<SupportedSubscription> | undefined {
logMethodCall('CoreModuleDirector.getSubscriptionOfTypeWithToken', {
@@ -350,8 +351,9 @@ export class CoreModuleDirector {
(subscription) => subscription.data.token === token,
);
}
case ModelName.Subscriptions:
default:
if (this.isPushSubscriptionType(type)) {
if (isSubscriptionType(type) && this.isPushSubscriptionType(type)) {
const pushSubscriptions = this.getAllPushSubscriptionModels();
return Object.values(pushSubscriptions).find(
(subscription) => subscription.data.token === token,
5 changes: 5 additions & 0 deletions src/core/utils/typePredicates.ts
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import { ModelStoreHydrated } from '../models/ModelStoreChange';
import {
FutureSubscriptionModel,
SubscriptionModel,
SubscriptionType,
} from '../models/SubscriptionModels';

export function isPropertyDelta<Model>(
@@ -68,3 +69,7 @@ export function isCompleteSubscriptionObject(
): obj is SubscriptionModel {
return obj?.type !== undefined && obj?.id !== undefined;
}

export function isSubscriptionType(obj: any): obj is SubscriptionType {
return Object.values(SubscriptionType).includes(obj);
}

0 comments on commit ab5900b

Please sign in to comment.