Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User model/fix subscription state predicates #1032

Merged
merged 2 commits into from
May 8, 2023
Merged

User model/fix subscription state predicates #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0ea26
Fix Type Predicates
rgomezp May 5, 2023
a3ea2c8
Bugfix: pass the `data` property not the whole `OSModel`
rgomezp May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/core/utils/typePredicates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ export function isModelDelta<Model>(delta: CoreDelta<Model>): delta is ModelDelt
}

export function isPureObject(obj: any): obj is Object {
return obj !== null && typeof obj === "object" && obj.constructor === Object;
return obj !== null && typeof obj === "object" && obj?.constructor === Object;
}

export function isOSModel<Model>(obj: any): obj is OSModel<Model> {
return obj !== null && typeof obj === "object" && obj.constructor === OSModel;
return obj !== null && typeof obj === "object" && obj?.constructor === OSModel;
}

export function isOSModelUpdatedArgs<Model>(obj: any): obj is OSModelUpdatedArgs<Model> {
return obj !== null && typeof obj === "object" && obj.constructor === OSModelUpdatedArgs;
return obj !== null && typeof obj === "object" && obj?.constructor === OSModelUpdatedArgs;
}

export function isModelStoreHydratedObject<Model>(obj: any): obj is ModelStoreHydrated<Model> {
return obj !== null && typeof obj === "object" && obj.constructor === ModelStoreHydrated;
return obj !== null && typeof obj === "object" && obj?.constructor === ModelStoreHydrated;
}

export function isIdentityObject(obj: any): obj is IdentityModel {
return obj.onesignal_id !== undefined;
return obj?.onesignal_id !== undefined;
}

export function isFutureSubscriptionObject(obj: any): obj is FutureSubscriptionModel {
return obj.type !== undefined;
return obj?.type !== undefined;
}

export function isCompleteSubscriptionObject(obj: any): obj is SubscriptionModel {
return obj.type !== undefined && obj.id !== undefined;
return obj?.type !== undefined && obj?.id !== undefined;
}
4 changes: 2 additions & 2 deletions src/shared/managers/SubscriptionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,8 +793,8 @@ export class SubscriptionManager {
private async getSubscriptionStateForSecure(): Promise<PushSubscriptionState> {
const { optedOut, subscriptionToken } = await Database.getSubscription();

const pushSubscriptionOSModel: OSModel<SupportedSubscription> = await OneSignal.coreDirector.getCurrentPushSubscriptionModel();
const isValidPushSubscription = isCompleteSubscriptionObject(pushSubscriptionOSModel) && !!pushSubscriptionOSModel.onesignalId;
const pushSubscriptionOSModel: OSModel<SupportedSubscription> | undefined = await OneSignal.coreDirector.getCurrentPushSubscriptionModel();
const isValidPushSubscription = isCompleteSubscriptionObject(pushSubscriptionOSModel?.data) && !!pushSubscriptionOSModel?.onesignalId;

if (SubscriptionManager.isSafari()) {
const subscriptionState: SafariRemoteNotificationPermission | undefined =
Expand Down