diff --git a/web/store/account.ts b/web/store/account.ts index c64b3a666a..4e135cab73 100644 --- a/web/store/account.ts +++ b/web/store/account.ts @@ -31,6 +31,7 @@ export const useAccountStore = defineStore('account', () => { const serverAccountPayload = computed(() => serverStore.serverAccountPayload); const inIframe = computed(() => serverStore.inIframe); + const sendType = computed(() => callbackStore.sendType); // State const accountAction = ref(); @@ -84,6 +85,7 @@ export const useAccountStore = defineStore('account', () => { type: 'downgradeOs', }], inIframe.value ? 'newTab' : (autoRedirectReplace ? 'replace' : undefined), + sendType.value, ); }; @@ -97,6 +99,7 @@ export const useAccountStore = defineStore('account', () => { type: 'manage', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const myKeys = async () => { @@ -114,6 +117,7 @@ export const useAccountStore = defineStore('account', () => { type: 'myKeys', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const linkKey = async () => { @@ -131,6 +135,7 @@ export const useAccountStore = defineStore('account', () => { type: 'linkKey', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const recover = () => { @@ -143,6 +148,7 @@ export const useAccountStore = defineStore('account', () => { type: 'recover', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const replace = () => { @@ -155,6 +161,7 @@ export const useAccountStore = defineStore('account', () => { type: 'replace', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const signIn = () => { @@ -167,6 +174,7 @@ export const useAccountStore = defineStore('account', () => { type: 'signIn', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const signOut = () => { @@ -179,6 +187,7 @@ export const useAccountStore = defineStore('account', () => { type: 'signOut', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const trialExtend = () => { @@ -191,6 +200,7 @@ export const useAccountStore = defineStore('account', () => { type: 'trialExtend', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const trialStart = () => { @@ -203,6 +213,7 @@ export const useAccountStore = defineStore('account', () => { type: 'trialStart', }], inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; diff --git a/web/store/purchase.ts b/web/store/purchase.ts index 625d4be26d..b346cd4ccb 100644 --- a/web/store/purchase.ts +++ b/web/store/purchase.ts @@ -14,16 +14,21 @@ export const usePurchaseStore = defineStore('purchase', () => { const callbackStore = useCallbackActionsStore(); const serverStore = useServerStore(); + const serverPurchasePayload = computed(() => serverStore.serverPurchasePayload); + const inIframe = computed(() => serverStore.inIframe); + const sendType = computed(() => callbackStore.sendType); + const activate = () => { callbackStore.send( PURCHASE_CALLBACK.toString(), [{ server: { - ...serverStore.serverPurchasePayload, + ...serverPurchasePayload.value, }, type: 'activate', }], - serverStore.inIframe ? 'newTab' : undefined, + inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const redeem = () => { @@ -31,11 +36,12 @@ export const usePurchaseStore = defineStore('purchase', () => { PURCHASE_CALLBACK.toString(), [{ server: { - ...serverStore.serverPurchasePayload, + ...serverPurchasePayload.value, }, type: 'redeem', }], - serverStore.inIframe ? 'newTab' : undefined, + inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const purchase = () => { @@ -43,11 +49,12 @@ export const usePurchaseStore = defineStore('purchase', () => { PURCHASE_CALLBACK.toString(), [{ server: { - ...serverStore.serverPurchasePayload, + ...serverPurchasePayload.value, }, type: 'purchase', }], - serverStore.inIframe ? 'newTab' : undefined, + inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const upgrade = () => { @@ -55,11 +62,12 @@ export const usePurchaseStore = defineStore('purchase', () => { PURCHASE_CALLBACK.toString(), [{ server: { - ...serverStore.serverPurchasePayload, + ...serverPurchasePayload.value, }, type: 'upgrade', }], - serverStore.inIframe ? 'newTab' : undefined, + inIframe.value ? 'newTab' : undefined, + sendType.value, ); }; const renew = () => { @@ -67,11 +75,12 @@ export const usePurchaseStore = defineStore('purchase', () => { PURCHASE_CALLBACK.toString(), [{ server: { - ...serverStore.serverPurchasePayload, + ...serverPurchasePayload.value, }, type: 'renew', }], - serverStore.inIframe ? 'newTab' : undefined, + inIframe.value ? 'newTab' : undefined, + sendType.value, ); };