rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: iap (#1996)

Browse Source
This commit is contained in:
Mo
2022-11-13 09:28:16 -06:00
committed by GitHub
parent e56a960bbf
commit d519aca685
49 changed files with 512 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/src/Domain/Client/Subscription/SubscriptionApiOperations.ts
View File

@@ -3,4 +3,5 @@ export enum SubscriptionApiOperations {
CancelingInvite,
ListingInvites,
AcceptingInvite,
ConfirmAppleIAP,
}

34
packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts
View File

@@ -11,6 +11,8 @@ import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/Su
import { SubscriptionApiServiceInterface } from './SubscriptionApiServiceInterface'
import { SubscriptionApiOperations } from './SubscriptionApiOperations'
import { Uuid } from '@standardnotes/common'
import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
import { AppleIAPConfirmRequestParams } from '../../Request'
export class SubscriptionApiService implements SubscriptionApiServiceInterface {
private operationsInProgress: Map<SubscriptionApiOperations, boolean>
@@ -31,11 +33,11 @@ export class SubscriptionApiService implements SubscriptionApiServiceInterface {
[ApiEndpointParam.ApiVersion]: ApiVersion.v0,
})
this.operationsInProgress.set(SubscriptionApiOperations.ListingInvites, false)
return response
} catch (error) {
throw new ApiCallError(ErrorMessage.GenericFail)
} finally {
this.operationsInProgress.set(SubscriptionApiOperations.ListingInvites, false)
}
}
@@ -52,11 +54,11 @@ export class SubscriptionApiService implements SubscriptionApiServiceInterface {
inviteUuid,
})
this.operationsInProgress.set(SubscriptionApiOperations.CancelingInvite, false)
return response
} catch (error) {
throw new ApiCallError(ErrorMessage.GenericFail)
} finally {
this.operationsInProgress.set(SubscriptionApiOperations.CancelingInvite, false)
}
}
@@ -73,11 +75,11 @@ export class SubscriptionApiService implements SubscriptionApiServiceInterface {
identifier: inviteeEmail,
})
this.operationsInProgress.set(SubscriptionApiOperations.Inviting, false)
return response
} catch (error) {
throw new ApiCallError(ErrorMessage.GenericFail)
} finally {
this.operationsInProgress.set(SubscriptionApiOperations.Inviting, false)
}
}
@@ -93,11 +95,27 @@ export class SubscriptionApiService implements SubscriptionApiServiceInterface {
inviteUuid,
})
this.operationsInProgress.set(SubscriptionApiOperations.AcceptingInvite, false)
return response
} catch (error) {
throw new ApiCallError(ErrorMessage.GenericFail)
} finally {
this.operationsInProgress.set(SubscriptionApiOperations.AcceptingInvite, false)
}
}
async confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse> {
if (this.operationsInProgress.get(SubscriptionApiOperations.ConfirmAppleIAP)) {
throw new ApiCallError(ErrorMessage.GenericInProgress)
}
this.operationsInProgress.set(SubscriptionApiOperations.ConfirmAppleIAP, true)
try {
const response = await this.subscriptionServer.confirmAppleIAP(params)
return response
} finally {
this.operationsInProgress.set(SubscriptionApiOperations.ConfirmAppleIAP, false)
}
}
}

3
packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts
View File

@@ -1,5 +1,7 @@
import { Uuid } from '@standardnotes/common'
import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
import { AppleIAPConfirmRequestParams } from '../../Request'
import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
@@ -10,4 +12,5 @@ export interface SubscriptionApiServiceInterface {
listInvites(): Promise<SubscriptionInviteListResponse>
cancelInvite(inviteUuid: Uuid): Promise<SubscriptionInviteCancelResponse>
acceptInvite(inviteUuid: Uuid): Promise<SubscriptionInviteAcceptResponse>
confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse>
}

6
packages/api/src/Domain/Http/HttpService.spec.ts
View File

@@ -10,7 +10,11 @@ describe('HttpService', () => {
const host = 'http://bar'
let updateMetaCallback: (meta: HttpResponseMeta) => void
const createService = () => new HttpService(environment, appVersion, snjsVersion, host, updateMetaCallback)
const createService = () => {
const service = new HttpService(environment, appVersion, snjsVersion, updateMetaCallback)
service.setHost(host)
return service
}
beforeEach(() => {
updateMetaCallback = jest.fn()

2
packages/api/src/Domain/Http/HttpService.ts
View File

@@ -14,12 +14,12 @@ import { HttpErrorResponseBody } from './HttpErrorResponseBody'
export class HttpService implements HttpServiceInterface {
private authorizationToken?: string
private __latencySimulatorMs?: number
private host!: string
constructor(
private environment: Environment,
private appVersion: string,
private snjsVersion: string,
private host: string,
private updateMetaCallback: (meta: HttpResponseMeta) => void,
) {}

7
packages/api/src/Domain/Request/Subscription/AppleIAPConfirmRequestParams.ts Normal file
View File

@@ -0,0 +1,7 @@
export type AppleIAPConfirmRequestParams = {
productId: string
transactionId: string
transactionDate: string
transactionReceipt: string
subscription_token: string
}

1
packages/api/src/Domain/Request/index.ts
View File

@@ -1,4 +1,5 @@
export * from './ApiEndpointParam'
export * from './Subscription/AppleIAPConfirmRequestParams'
export * from './Subscription/SubscriptionInviteAcceptRequestParams'
export * from './Subscription/SubscriptionInviteCancelRequestParams'
export * from './Subscription/SubscriptionInviteDeclineRequestParams'

9
packages/api/src/Domain/Response/Subscription/AppleIAPConfirmResponse.ts Normal file
View File

@@ -0,0 +1,9 @@
import { Either } from '@standardnotes/common'
import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
import { HttpResponse } from '../../Http/HttpResponse'
import { AppleIAPConfirmResponseBody } from './AppleIAPConfirmResponseBody'
export interface AppleIAPConfirmResponse extends HttpResponse {
data: Either<AppleIAPConfirmResponseBody, HttpErrorResponseBody>
}

1
packages/api/src/Domain/Response/Subscription/AppleIAPConfirmResponseBody.ts Normal file
View File

@@ -0,0 +1 @@
export type AppleIAPConfirmResponseBody = { success: true } | { success: false; message: string }

2
packages/api/src/Domain/Response/index.ts
View File

@@ -1,3 +1,5 @@
export * from './Subscription/AppleIAPConfirmResponse'
export * from './Subscription/AppleIAPConfirmResponseBody'
export * from './Subscription/SubscriptionInviteAcceptResponse'
export * from './Subscription/SubscriptionInviteAcceptResponseBody'
export * from './Subscription/SubscriptionInviteCancelResponse'

5
packages/api/src/Domain/Server/Subscription/Paths.ts
View File

@@ -8,8 +8,13 @@ const SharingPaths = {
listInvites: '/v1/subscription-invites',
}
const ApplePaths = {
confirmAppleIAP: '/v1/subscriptions/apple_iap_confirm',
}
export const Paths = {
v1: {
...SharingPaths,
...ApplePaths,
},
}

8
packages/api/src/Domain/Server/Subscription/SubscriptionServer.ts
View File

@@ -1,4 +1,6 @@
import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
import { AppleIAPConfirmRequestParams } from '../../Request'
import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
@@ -45,4 +47,10 @@ export class SubscriptionServer implements SubscriptionServerInterface {
return response as SubscriptionInviteResponse
}
async confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse> {
const response = await this.httpService.post(Paths.v1.confirmAppleIAP, params)
return response as AppleIAPConfirmResponse
}
}

3
packages/api/src/Domain/Server/Subscription/SubscriptionServerInterface.ts
View File

@@ -1,3 +1,5 @@
import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
import { AppleIAPConfirmRequestParams } from './../../Request/Subscription/AppleIAPConfirmRequestParams'
import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
@@ -15,4 +17,5 @@ export interface SubscriptionServerInterface {
declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse>
cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse>
listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse>
confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse>
}

6
packages/mobile/ios/Podfile.lock
View File

@@ -349,6 +349,8 @@ PODS:
- React-Core
- RNFS (2.20.0):
- React-Core
- RNIap (12.4.4):
- React-Core
- RNKeychain (8.0.0):
- React-Core
- RNPrivacySnapshot (1.0.0):
@@ -422,6 +424,7 @@ DEPENDENCIES:
- "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
- RNFileViewer (from `../node_modules/react-native-file-viewer`)
- RNFS (from `../node_modules/react-native-fs`)
- RNIap (from `../node_modules/react-native-iap`)
- RNKeychain (from `../node_modules/react-native-keychain`)
- RNPrivacySnapshot (from `../node_modules/react-native-privacy-snapshot`)
- RNShare (from `../node_modules/react-native-share`)
@@ -518,6 +521,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-file-viewer"
RNFS:
:path: "../node_modules/react-native-fs"
RNIap:
:path: "../node_modules/react-native-iap"
RNKeychain:
:path: "../node_modules/react-native-keychain"
RNPrivacySnapshot:
@@ -578,6 +583,7 @@ SPEC CHECKSUMS:
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNIap: 3bcd6982cf99503339cf9243e4ba70a45ea2cf72
RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
RNPrivacySnapshot: 8eaf571478a353f2e5184f5c803164f22428b023
RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c

4
packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj
View File

@@ -14,6 +14,7 @@
1C2EEB3B45F4EB07AC795C77 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
33BB1B14071EBE5978EBF3A8 /* libPods-StandardNotes-StandardNotesTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04FCB5A3A3387CA3CFC82AA3 /* libPods-StandardNotes-StandardNotesTests.a */; };
BC8DEA834BF198E8511F04FF /* libPods-StandardNotesDev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F2D747BE02C2A1BCFEEFD1 /* libPods-StandardNotesDev.a */; };
CD6592A9291EEFCC00C09DC6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6592A8291EEFCC00C09DC6 /* StoreKit.framework */; };
CD7D5ECA27800609005FE1BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD7D5EC927800608005FE1BF /* LaunchScreen.storyboard */; };
CD7D5ECF278015D2005FE1BF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
CD7D5ED0278015D2005FE1BF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
@@ -59,6 +60,7 @@
66417CEB7622E77D89928FCA /* Pods-StandardNotes.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StandardNotes.debug.xcconfig"; path = "Target Support Files/Pods-StandardNotes/Pods-StandardNotes.debug.xcconfig"; sourceTree = "<group>"; };
948EE90E15EA48C27577820B /* Pods-StandardNotes.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StandardNotes.release.xcconfig"; path = "Target Support Files/Pods-StandardNotes/Pods-StandardNotes.release.xcconfig"; sourceTree = "<group>"; };
A09B7794259DBFABFC4D05CE /* Pods-StandardNotesDev.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StandardNotesDev.debug.xcconfig"; path = "Target Support Files/Pods-StandardNotesDev/Pods-StandardNotesDev.debug.xcconfig"; sourceTree = "<group>"; };
CD6592A8291EEFCC00C09DC6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
CD7D5EC8278005B6005FE1BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = StandardNotes/Info.plist; sourceTree = "<group>"; };
CD7D5EC927800608005FE1BF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
CD7D5EDF278015D2005FE1BF /* StandardNotesDev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StandardNotesDev.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -86,6 +88,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CD6592A9291EEFCC00C09DC6 /* StoreKit.framework in Frameworks */,
1C2EEB3B45F4EB07AC795C77 /* (null) in Frameworks */,
DD3D1CE428EC1C8BA0C49211 /* libPods-StandardNotes.a in Frameworks */,
);
@@ -153,6 +156,7 @@
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
isa = PBXGroup;
children = (
CD6592A8291EEFCC00C09DC6 /* StoreKit.framework */,
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
04FCB5A3A3387CA3CFC82AA3 /* libPods-StandardNotes-StandardNotesTests.a */,
51F2D747BE02C2A1BCFEEFD1 /* libPods-StandardNotesDev.a */,

1
packages/mobile/package.json
View File

@@ -57,6 +57,7 @@
"react-native-fingerprint-scanner": "standardnotes/react-native-fingerprint-scanner#b55d1c0ca627a87a130f758603f12911fbac200f",
"react-native-flag-secure-android": "standardnotes/react-native-flag-secure-android#cb08e74583c22a5d912842459b35ebbbb4bcd852",
"react-native-fs": "^2.19.0",
"react-native-iap": "^12.4.4",
"react-native-keychain": "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6",
"react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe",
"react-native-share": "^7.9.0",

9
packages/mobile/src/Lib/Interface.ts
View File

@@ -1,5 +1,6 @@
import AsyncStorage from '@react-native-community/async-storage'
import SNReactNative from '@standardnotes/react-native-utils'
import { AppleIAPReceipt } from '@standardnotes/services/dist/Domain/Subscription/AppleIAPReceipt'
import {
ApplicationIdentifier,
Environment,
@@ -11,6 +12,7 @@ import {
RawKeychainValue,
removeFromArray,
TransferPayload,
AppleIAPProductId,
UuidString,
} from '@standardnotes/snjs'
import { ColorSchemeObserverService } from 'ColorSchemeObserverService'
@@ -41,6 +43,7 @@ import Share from 'react-native-share'
import { AndroidBackHandlerService } from '../AndroidBackHandlerService'
import { AppStateObserverService } from './../AppStateObserverService'
import Keychain from './Keychain'
import { PurchaseManager } from '../PurchaseManager'
export type BiometricsType = 'Fingerprint' | 'Face ID' | 'Biometrics' | 'Touch ID'
@@ -99,6 +102,10 @@ export class MobileDevice implements MobileDeviceInterface {
private colorSchemeService?: ColorSchemeObserverService,
) {}
purchaseSubscriptionIAP(plan: AppleIAPProductId): Promise<AppleIAPReceipt | undefined> {
return PurchaseManager.getInstance().purchase(plan)
}
deinit() {
this.stateObserverService?.deinit()
;(this.stateObserverService as unknown) = undefined
@@ -108,7 +115,7 @@ export class MobileDevice implements MobileDeviceInterface {
;(this.colorSchemeService as unknown) = undefined
}
consoleLog(...args: any[]): void {
consoleLog(...args: unknown[]): void {
// eslint-disable-next-line no-console
console.log(args)
}

18
packages/mobile/src/Lib/Logging.ts Normal file
View File

@@ -0,0 +1,18 @@
import { log as utilsLog } from '@standardnotes/snjs'
export enum LoggingDomain {
AppleIAP,
}
const LoggingStatus: Record<LoggingDomain, boolean> = {
[LoggingDomain.AppleIAP]: true,
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function log(domain: LoggingDomain, ...args: any[]): void {
if (!LoggingStatus[domain]) {
return
}
utilsLog(LoggingDomain[domain], ...args)
}

80
packages/mobile/src/PurchaseManager.ts Normal file
View File

@@ -0,0 +1,80 @@
import { LoggingDomain, log } from './Lib/Logging'
import { EmitterSubscription } from 'react-native'
import {
initConnection,
endConnection,
purchaseErrorListener,
purchaseUpdatedListener,
type ProductPurchase,
type PurchaseError,
type SubscriptionPurchase,
finishTransaction,
requestSubscription,
getSubscriptions,
} from 'react-native-iap'
import { AppleIAPReceipt, AppleIAPProductId } from '@standardnotes/snjs'
export class PurchaseManager {
private static instance: PurchaseManager
private listenerDisposer: EmitterSubscription
private errorDisposer: EmitterSubscription
private constructor() {
this.listenerDisposer = purchaseUpdatedListener((purchase: SubscriptionPurchase | ProductPurchase) => {
log(LoggingDomain.AppleIAP, 'purchaseUpdatedListener', purchase)
const receipt = purchase.transactionReceipt
if (receipt) {
void finishTransaction({ purchase, isConsumable: false })
}
})
this.errorDisposer = purchaseErrorListener((error: PurchaseError) => {
log(LoggingDomain.AppleIAP, 'purchaseErrorListener', error)
})
}
public static getInstance(): PurchaseManager {
if (!PurchaseManager.instance) {
PurchaseManager.instance = new PurchaseManager()
}
return PurchaseManager.instance
}
deinit() {
this.listenerDisposer.remove()
this.errorDisposer.remove()
void endConnection()
}
async purchase(sku: AppleIAPProductId): Promise<AppleIAPReceipt | undefined> {
await initConnection()
const subscriptions = await getSubscriptions({
skus: [AppleIAPProductId.PlusPlanYearly, AppleIAPProductId.ProPlanYearly],
})
log(LoggingDomain.AppleIAP, 'Retrieved subscriptions', subscriptions)
try {
const result = await requestSubscription({ sku, andDangerouslyFinishTransactionAutomaticallyIOS: true })
log(LoggingDomain.AppleIAP, 'Purchase result', result)
if (result && result.transactionId && result.transactionDate) {
return {
transactionId: result.transactionId,
productId: result.productId as AppleIAPProductId,
transactionDate: String(result.transactionDate),
transactionReceipt: result.transactionReceipt,
}
} else {
log(LoggingDomain.AppleIAP, 'Purchase method returning undefined even though successful')
return undefined
}
} catch (error) {
log(LoggingDomain.AppleIAP, error)
return undefined
}
}
}

3
packages/services/src/Domain/Device/MobileDeviceInterface.ts
View File

@@ -1,5 +1,7 @@
import { AppleIAPProductId } from './../Subscription/AppleIAPProductId'
import { DeviceInterface } from './DeviceInterface'
import { Environment, Platform, RawKeychainValue } from '@standardnotes/models'
import { AppleIAPReceipt } from '../Subscription/AppleIAPReceipt'
export interface MobileDeviceInterface extends DeviceInterface {
environment: Environment.Mobile
@@ -22,4 +24,5 @@ export interface MobileDeviceInterface extends DeviceInterface {
isUrlComponentUrl(url: string): boolean
getAppState(): Promise<'active' | 'background' | 'inactive' | 'unknown' | 'extension'>
getColorScheme(): Promise<'light' | 'dark' | null | undefined>
purchaseSubscriptionIAP(plan: AppleIAPProductId): Promise<AppleIAPReceipt | undefined>
}

1
packages/services/src/Domain/Event/ApplicationEvent.ts
View File

@@ -64,4 +64,5 @@ export enum ApplicationEvent {
CompletedInitialSync = 30,
BiometricsSoftLockEngaged = 31,
BiometricsSoftLockDisengaged = 32,
DidPurchaseSubscription = 33,
}

1
packages/services/src/Domain/Feature/FeaturesEvent.ts
View File

@@ -1,4 +1,5 @@
export enum FeaturesEvent {
UserRolesChanged = 'UserRolesChanged',
FeaturesUpdated = 'FeaturesUpdated',
DidPurchaseSubscription = 'DidPurchaseSubscription',
}

4
packages/services/src/Domain/Subscription/AppleIAPProductId.ts Normal file
View File

@@ -0,0 +1,4 @@
export enum AppleIAPProductId {
ProPlanYearly = 'pro_plan_yearly',
PlusPlanYearly = 'plus_plan_yearly',
}

8
packages/services/src/Domain/Subscription/AppleIAPReceipt.ts Normal file
View File

@@ -0,0 +1,8 @@
import { AppleIAPProductId } from './AppleIAPProductId'
export type AppleIAPReceipt = {
productId: AppleIAPProductId
transactionDate: string
transactionId: string
transactionReceipt: string
}

5
packages/services/src/Domain/Subscription/SubscriptionClientInterface.ts
View File

@@ -1,9 +1,14 @@
import { Uuid } from '@standardnotes/common'
import { Invitation } from '@standardnotes/models'
import { AppleIAPReceipt } from './AppleIAPReceipt'
export interface SubscriptionClientInterface {
listSubscriptionInvitations(): Promise<Invitation[]>
inviteToSubscription(inviteeEmail: string): Promise<boolean>
cancelInvitation(inviteUuid: Uuid): Promise<boolean>
acceptInvitation(inviteUuid: Uuid): Promise<{ success: true } | { success: false; message: string }>
confirmAppleIAP(
receipt: AppleIAPReceipt,
subscriptionToken: string,
): Promise<{ success: true } | { success: false; message: string }>
}

21
packages/services/src/Domain/Subscription/SubscriptionManager.ts
View File

@@ -4,6 +4,7 @@ import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface
import { AbstractService } from '../Service/AbstractService'
import { SubscriptionClientInterface } from './SubscriptionClientInterface'
import { Uuid } from '@standardnotes/common'
import { AppleIAPReceipt } from './AppleIAPReceipt'
export class SubscriptionManager extends AbstractService implements SubscriptionClientInterface {
constructor(
@@ -56,4 +57,24 @@ export class SubscriptionManager extends AbstractService implements Subscription
return false
}
}
async confirmAppleIAP(
params: AppleIAPReceipt,
subscriptionToken: string,
): Promise<{ success: true } | { success: false; message: string }> {
try {
const result = await this.subscriptionApiService.confirmAppleIAP({
...params,
subscription_token: subscriptionToken,
})
if (result.data.error) {
return { success: false, message: result.data.error.message }
}
return result.data
} catch (error) {
return { success: false, message: 'Could not confirm IAP.' }
}
}
}

2
packages/services/src/Domain/index.ts
View File

@@ -76,6 +76,8 @@ export * from './Strings/InfoStrings'
export * from './Strings/Messages'
export * from './Subscription/SubscriptionClientInterface'
export * from './Subscription/SubscriptionManager'
export * from './Subscription/AppleIAPProductId'
export * from './Subscription/AppleIAPReceipt'
export * from './Sync/SyncMode'
export * from './Sync/SyncOptions'
export * from './Sync/SyncQueueStrategy'

20
packages/snjs/lib/Application/Application.ts
View File

@@ -287,6 +287,10 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
return this.listedService
}
public get alerts(): ExternalServices.AlertService {
return this.alertService
}
public computePrivateUsername(username: string): Promise<string | undefined> {
return ComputePrivateUsername(this.options.crypto, username)
}
@@ -367,8 +371,12 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
await this.handleStage(ExternalServices.ApplicationStage.StorageDecrypted_09)
this.apiService.loadHost()
const host = this.apiService.loadHost()
this.httpService.setHost(host)
this.webSocketsService.loadWebSocketUrl()
await this.sessionManager.initializeFromDisk()
this.settingsService.initializeFromDisk()
@@ -594,6 +602,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
public async setCustomHost(host: string): Promise<void> {
await this.setHost(host)
this.webSocketsService.setWebSocketUrl(undefined)
}
@@ -1072,7 +1081,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.createProtocolService()
this.diskStorageService.provideEncryptionProvider(this.protocolService)
this.createChallengeService()
this.createHttpManager()
this.createLegacyHttpManager()
this.createApiService()
this.createHttpService()
this.createUserServer()
@@ -1238,6 +1247,10 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
void this.notifyEvent(ApplicationEvent.FeaturesUpdated)
break
}
case ExternalServices.FeaturesEvent.DidPurchaseSubscription: {
void this.notifyEvent(ApplicationEvent.DidPurchaseSubscription)
break
}
default: {
Utils.assertUnreachable(event)
}
@@ -1385,7 +1398,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.services.push(this.componentManagerService)
}
private createHttpManager() {
private createLegacyHttpManager() {
this.deprecatedHttpService = new InternalServices.SNHttpService(
this.environment,
this.options.appVersion,
@@ -1399,7 +1412,6 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.environment,
this.options.appVersion,
SnjsVersion,
this.options.defaultHost,
this.apiService.processMetaObject.bind(this.apiService),
)
}

4
packages/snjs/lib/Services/Api/ApiService.ts
View File

@@ -110,7 +110,7 @@ export class SNApiService
this.invalidSessionObserver = observer
}
public loadHost(): void {
public loadHost(): string {
const storedValue = this.storageService.getValue<string | undefined>(StorageKey.ServerHost)
this.host =
storedValue ||
@@ -120,6 +120,8 @@ export class SNApiService
_default_sync_server?: string
}
)._default_sync_server as string)
return this.host
}
public async setHost(host: string): Promise<void> {

44
packages/snjs/lib/Services/Features/FeaturesService.spec.ts
View File

@@ -10,6 +10,7 @@ import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
import { convertTimestampToMilliseconds } from '@standardnotes/utils'
import {
AlertService,
FeaturesEvent,
FeatureStatus,
InternalEventBusInterface,
StorageKey,
@@ -203,6 +204,47 @@ describe('featuresService', () => {
})
describe('updateRoles()', () => {
it('setRoles should notify event if roles changed', async () => {
storageService.getValue = jest.fn().mockReturnValue(roles)
const featuresService = createService()
featuresService.initializeFromDisk()
const mock = (featuresService['notifyEvent'] = jest.fn())
const newRoles = [...roles, RoleName.PlusUser]
await featuresService.setRoles(newRoles)
expect(mock.mock.calls[0][0]).toEqual(FeaturesEvent.UserRolesChanged)
})
it('should notify of subscription purchase', async () => {
storageService.getValue = jest.fn().mockReturnValue(roles)
const featuresService = createService()
featuresService.initializeFromDisk()
const spy = jest.spyOn(featuresService, 'notifyEvent' as never)
const newRoles = [...roles, RoleName.ProUser]
await featuresService.updateRolesAndFetchFeatures('123', newRoles)
expect(spy.mock.calls[2][0]).toEqual(FeaturesEvent.DidPurchaseSubscription)
})
it('should not notify of subscription purchase on initial roles load after sign in', async () => {
storageService.getValue = jest.fn().mockReturnValue(roles)
const featuresService = createService()
featuresService.initializeFromDisk()
featuresService['roles'] = []
const spy = jest.spyOn(featuresService, 'notifyEvent' as never)
const newRoles = [...roles, RoleName.ProUser]
await featuresService.updateRolesAndFetchFeatures('123', newRoles)
const triggeredEvents = spy.mock.calls.map((call) => call[0])
expect(triggeredEvents).not.toContain(FeaturesEvent.DidPurchaseSubscription)
})
it('saves new roles to storage and fetches features if a role has been added', async () => {
const newRoles = [...roles, RoleName.PlusUser]
@@ -631,7 +673,7 @@ describe('featuresService', () => {
await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser])
sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false)
featuresService.hasOnlineSubscription = jest.fn().mockReturnValue(false)
featuresService.rolesIncludePaidSubscription = jest.fn().mockReturnValue(false)
featuresService['completedSuccessfulFeaturesRetrieval'] = true
expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.NoUserSubscription)

27
packages/snjs/lib/Services/Features/FeaturesService.ts
View File

@@ -154,7 +154,7 @@ export class SNFeaturesService
if (stage === ApplicationStage.FullSyncCompleted_13) {
void this.addDarkTheme()
if (!this.hasOnlineSubscription()) {
if (!this.rolesIncludePaidSubscription()) {
const offlineRepo = this.getOfflineRepo()
if (offlineRepo) {
void this.downloadOfflineFeatures(offlineRepo)
@@ -355,8 +355,12 @@ export class SNFeaturesService
}
public async updateRolesAndFetchFeatures(userUuid: UuidString, roles: RoleName[]): Promise<void> {
const previousRoles = this.roles
const userRolesChanged = this.haveRolesChanged(roles)
const isInitialLoadRolesChange = previousRoles.length === 0 && userRolesChanged
if (!userRolesChanged && !this.needsInitialFeaturesUpdate) {
return
}
@@ -375,13 +379,23 @@ export class SNFeaturesService
await this.didDownloadFeatures(features)
}
}
if (userRolesChanged && !isInitialLoadRolesChange) {
if (this.rolesIncludePaidSubscription()) {
await this.notifyEvent(FeaturesEvent.DidPurchaseSubscription)
}
}
}
private async setRoles(roles: RoleName[]): Promise<void> {
async setRoles(roles: RoleName[]): Promise<void> {
const rolesChanged = !arraysEqual(this.roles, roles)
this.roles = roles
if (!arraysEqual(this.roles, roles)) {
if (rolesChanged) {
void this.notifyEvent(FeaturesEvent.UserRolesChanged)
}
this.storageService.setValue(StorageKey.UserRoles, this.roles)
}
@@ -434,14 +448,13 @@ export class SNFeaturesService
return this.features.find((feature) => feature.identifier === featureId)
}
hasOnlineSubscription(): boolean {
const roles = this.roles
rolesIncludePaidSubscription(): boolean {
const unpaidRoles = [RoleName.CoreUser]
return roles.some((role) => !unpaidRoles.includes(role))
return this.roles.some((role) => !unpaidRoles.includes(role))
}
public hasPaidOnlineOrOfflineSubscription(): boolean {
return this.hasOnlineSubscription() || this.hasOfflineRepo()
return this.rolesIncludePaidSubscription() || this.hasOfflineRepo()
}
public rolesBySorting(roles: RoleName[]): RoleName[] {

6
packages/styles/src/Alert/Alert.ts
View File

@@ -23,7 +23,7 @@ export class SKAlert {
buttonsString() {
const genButton = function (buttonDesc: AlertButton, index: number) {
return `
<button id='button-${index}' class='font-bold px-2.5 py-2 text-xs text-info-contrast bg-${buttonDesc.style}'>
<button id='button-${index}' class='font-bold px-2.5 py-2 text-base lg:text-xs text-info-contrast bg-${buttonDesc.style}'>
<div class='sk-label'>${buttonDesc.text}</div>
</button>
`
@@ -57,8 +57,8 @@ export class SKAlert {
buttonsTemplate = ''
panelStyle = 'style="padding-bottom: 8px"'
}
const titleTemplate = this.title ? `<div class='sk-h3 sk-panel-section-title'>${this.title}</div>` : ''
const messageTemplate = this.text ? `<p class='sk-p'>${this.text}</p>` : ''
const titleTemplate = this.title ? `<div class='mb-1 font-bold text-lg lg:text-base'>${this.title}</div>` : ''
const messageTemplate = this.text ? `<p class='sk-p text-base lg:text-sm'>${this.text}</p>` : ''
const template = `
<div class="sk-modal">

4
packages/web/src/javascripts/Application/Application.ts
View File

@@ -204,10 +204,6 @@ export class WebApplication extends SNApplication implements WebApplicationInter
return this.isNativeMobileWeb() && this.platform === Platform.Ios
}
get hideSubscriptionMarketing() {
return this.isNativeIOS()
}
mobileDevice(): MobileDeviceInterface {
if (!this.isNativeMobileWeb()) {
throw Error('Attempting to access device as mobile device on non mobile platform')

2
packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx
View File

@@ -199,7 +199,7 @@ const ApplicationView: FunctionComponent<Props> = ({ application, mainApplicatio
<AndroidBackHandlerProvider application={application}>
<DarkModeHandler application={application} />
<ResponsivePaneProvider paneController={application.getViewControllerManager().paneController}>
<PremiumModalProvider application={application} viewControllerManager={viewControllerManager}>
<PremiumModalProvider application={application} featuresController={viewControllerManager.featuresController}>
<div className={platformString + ' main-ui-view sn-component h-full'}>
<div id="app" className="app app-column-container" ref={appColumnContainerRef}>
<FileDragNDropProvider

18
packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
View File

@@ -213,16 +213,14 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
'Create powerful workflows and organizational layouts with per-tag display preferences.'}
</p>
{!application.hideSubscriptionMarketing && (
<Button
primary
small
className="col-start-1 col-end-3 mt-3 justify-self-start uppercase"
onClick={() => application.openPurchaseFlow()}
>
Upgrade Features
</Button>
)}
<Button
primary
small
className="col-start-1 col-end-3 mt-3 justify-self-start uppercase"
onClick={() => application.openPurchaseFlow()}
>
Upgrade Features
</Button>
</div>
)

14
packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx
View File

@@ -2,7 +2,6 @@ import { WebApplication } from '@/Application/Application'
import { FeaturesController } from '@/Controllers/FeaturesController'
import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController'
import { observer } from 'mobx-react-lite'
import { loadPurchaseFlowUrl } from '../PurchaseFlow/PurchaseFlowFunctions'
type Props = {
application: WebApplication
@@ -14,22 +13,11 @@ const UpgradeNow = ({ application, featuresController, subscriptionContoller }:
const shouldShowCTA = !featuresController.hasFolders
const hasAccount = subscriptionContoller.hasAccount
if (hasAccount && subscriptionContoller.hideSubscriptionMarketing) {
return null
}
return shouldShowCTA ? (
<div className="flex h-full items-center px-2">
<button
className="rounded bg-info py-0.5 px-1.5 text-sm font-bold uppercase text-info-contrast hover:brightness-125 lg:text-xs"
onClick={() => {
if (hasAccount) {
void loadPurchaseFlowUrl(application)
return
}
application.getViewControllerManager().purchaseFlowController.openPurchaseFlow()
}}
onClick={() => application.openPurchaseFlow()}
>
{hasAccount ? 'Unlock features' : 'Sign up to sync'}
</button>

19
packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
View File

@@ -2,7 +2,6 @@ import { FunctionComponent, useState } from 'react'
import { LinkButton, Text } from '@/Components/Preferences/PreferencesComponents/Content'
import Button from '@/Components/Button/Button'
import { WebApplication } from '@/Application/Application'
import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions'
type Props = {
application: WebApplication
@@ -16,9 +15,7 @@ const NoSubscription: FunctionComponent<Props> = ({ application }) => {
const errorMessage = 'There was an error when attempting to redirect you to the subscription page.'
setIsLoadingPurchaseFlow(true)
try {
if (!(await loadPurchaseFlowUrl(application))) {
setPurchaseFlowError(errorMessage)
}
application.openPurchaseFlow()
} catch (e) {
setPurchaseFlowError(errorMessage)
} finally {
@@ -31,14 +28,12 @@ const NoSubscription: FunctionComponent<Props> = ({ application }) => {
<Text>You don't have a Standard Notes subscription yet.</Text>
{isLoadingPurchaseFlow && <Text>Redirecting you to the subscription page...</Text>}
{purchaseFlowError && <Text className="text-danger">{purchaseFlowError}</Text>}
{!application.hideSubscriptionMarketing && (
<div className="flex">
<LinkButton className="mt-3 mr-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
{application.hasAccount() && (
<Button className="mt-3 min-w-20" primary label="Subscribe" onClick={onPurchaseClick} />
)}
</div>
)}
<div className="flex">
<LinkButton className="mt-3 mr-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
{application.hasAccount() && (
<Button className="mt-3 min-w-20" primary label="Subscribe" onClick={onPurchaseClick} />
)}
</div>
</>
)
}

19
packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/NoProSubscription.tsx
View File

@@ -2,7 +2,6 @@ import { FunctionComponent, useState } from 'react'
import { LinkButton, Text } from '@/Components/Preferences/PreferencesComponents/Content'
import Button from '@/Components/Button/Button'
import { WebApplication } from '@/Application/Application'
import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions'
type Props = {
application: WebApplication
@@ -16,9 +15,7 @@ const NoProSubscription: FunctionComponent<Props> = ({ application }) => {
const errorMessage = 'There was an error when attempting to redirect you to the subscription page.'
setIsLoadingPurchaseFlow(true)
try {
if (!(await loadPurchaseFlowUrl(application))) {
setPurchaseFlowError(errorMessage)
}
application.openPurchaseFlow()
} catch (e) {
setPurchaseFlowError(errorMessage)
} finally {
@@ -35,14 +32,12 @@ const NoProSubscription: FunctionComponent<Props> = ({ application }) => {
{isLoadingPurchaseFlow && <Text>Redirecting you to the subscription page...</Text>}
{purchaseFlowError && <Text className="text-danger">{purchaseFlowError}</Text>}
{!application.hideSubscriptionMarketing && (
<div className="flex">
<LinkButton className="mt-3 mr-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
{application.hasAccount() && (
<Button className="mt-3 min-w-20" primary label="Upgrade" onClick={onPurchaseClick} />
)}
</div>
)}
<div className="flex">
<LinkButton className="mt-3 mr-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
{application.hasAccount() && (
<Button className="mt-3 min-w-20" primary label="Upgrade" onClick={onPurchaseClick} />
)}
</div>
</>
)
}

4
packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeatureModalType.tsx Normal file
View File

@@ -0,0 +1,4 @@
export enum PremiumFeatureModalType {
UpgradePrompt,
UpgradeSuccess,
}

75
packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx
View File

@@ -4,7 +4,7 @@ import Icon from '@/Components/Icon/Icon'
import { WebApplication } from '@/Application/Application'
import { openSubscriptionDashboard } from '@/Utils/ManageSubscription'
import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'
import { loadPurchaseFlowUrl } from '../PurchaseFlow/PurchaseFlowFunctions'
import { PremiumFeatureModalType } from './PremiumFeatureModalType'
type Props = {
application: WebApplication
@@ -13,6 +13,7 @@ type Props = {
hasAccount: boolean
onClose: () => void
showModal: boolean
type: PremiumFeatureModalType
}
const PremiumFeaturesModal: FunctionComponent<Props> = ({
@@ -22,6 +23,7 @@ const PremiumFeaturesModal: FunctionComponent<Props> = ({
hasAccount,
onClose,
showModal,
type = PremiumFeatureModalType.UpgradePrompt,
}) => {
const plansButtonRef = useRef<HTMLButtonElement>(null)
@@ -29,11 +31,58 @@ const PremiumFeaturesModal: FunctionComponent<Props> = ({
if (hasSubscription) {
void openSubscriptionDashboard(application)
} else if (hasAccount) {
void loadPurchaseFlowUrl(application)
void application.openPurchaseFlow()
} else if (window.plansUrl) {
window.location.assign(window.plansUrl)
}
}, [application, hasSubscription, hasAccount])
onClose()
}, [application, hasSubscription, hasAccount, onClose])
const UpgradePrompt = (
<>
<AlertDialogDescription className="mb-2 px-4.5 text-center text-sm text-passive-1">
To take advantage of <span className="font-semibold">{featureName}</span> and other advanced features, upgrade
your current plan.
</AlertDialogDescription>
<div className="p-4">
<button
onClick={handleClick}
className="no-border w-full cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125"
ref={plansButtonRef}
>
Upgrade
</button>
</div>
</>
)
const SuccessPrompt = (
<>
<AlertDialogDescription className="mb-2 px-4.5 text-center text-sm text-passive-1">
Enjoy your new powered up experience.
</AlertDialogDescription>
<div className="p-4">
<button
onClick={onClose}
className="no-border w-full cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125"
ref={plansButtonRef}
>
Continue
</button>
</div>
</>
)
const title =
type === PremiumFeatureModalType.UpgradePrompt ? 'Enable Advanced Features' : 'Your purchase was successful!'
const iconName = type === PremiumFeatureModalType.UpgradePrompt ? PremiumFeatureIconName : '🎉'
const iconClass =
type === PremiumFeatureModalType.UpgradePrompt
? `h-12 w-12 ${PremiumFeatureIconClass}`
: 'px-7 py-2 h-24 w-24 text-[50px]'
return showModal ? (
<AlertDialog leastDestructiveRef={plansButtonRef} className="p-0">
@@ -53,25 +102,11 @@ const PremiumFeaturesModal: FunctionComponent<Props> = ({
className="mx-auto mb-5 flex h-24 w-24 items-center justify-center rounded-[50%] bg-contrast"
aria-hidden={true}
>
<Icon className={`h-12 w-12 ${PremiumFeatureIconClass}`} type={PremiumFeatureIconName} />
<Icon className={iconClass} size={'custom'} type={iconName} />
</div>
<div className="mb-1 text-center text-lg font-bold">Enable Advanced Features</div>
<div className="mb-1 text-center text-lg font-bold">{title}</div>
</AlertDialogLabel>
<AlertDialogDescription className="mb-2 px-4.5 text-center text-sm text-passive-1">
To take advantage of <span className="font-semibold">{featureName}</span> and other advanced features,
upgrade your current plan.
</AlertDialogDescription>
{!application.hideSubscriptionMarketing && (
<div className="p-4">
<button
onClick={handleClick}
className="no-border w-full cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125"
ref={plansButtonRef}
>
Upgrade
</button>
</div>
)}
{type === PremiumFeatureModalType.UpgradePrompt ? UpgradePrompt : SuccessPrompt}
</div>
</div>
</AlertDialog>

30
packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
View File

@@ -7,7 +7,6 @@ import { ChangeEventHandler, FunctionComponent, useEffect, useRef, useState } fr
import FloatingLabelInput from '@/Components/Input/FloatingLabelInput'
import { isEmailValid } from '@/Utils'
import { BlueDotIcon, CircleIcon, DiamondIcon, CreateAccountIllustration } from '@standardnotes/icons'
import { loadPurchaseFlowUrl } from '../PurchaseFlowFunctions'
type Props = {
viewControllerManager: ViewControllerManager
@@ -52,10 +51,7 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
}
const subscribeWithoutAccount = () => {
loadPurchaseFlowUrl(application).catch((err) => {
console.error(err)
application.alertService.alert(err).catch(console.error)
})
application.getViewControllerManager().purchaseFlowController.openPurchaseWebpage()
}
const handleCreateAccount = async () => {
@@ -93,13 +89,7 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
await application.register(email, password)
viewControllerManager.purchaseFlowController.closePurchaseFlow()
if (!application.hideSubscriptionMarketing) {
loadPurchaseFlowUrl(application).catch((err) => {
console.error(err)
application.alertService.alert(err).catch(console.error)
})
}
viewControllerManager.purchaseFlowController.openPurchaseFlow()
} catch (err) {
console.error(err)
application.alertService.alert(err as string).catch(console.error)
@@ -170,13 +160,15 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
>
Sign in instead
</button>
<button
onClick={subscribeWithoutAccount}
disabled={isCreatingAccount}
className="flex cursor-pointer items-start border-0 bg-default p-0 font-medium text-info hover:underline"
>
Subscribe without account
</button>
{!application.isNativeIOS() && (
<button
onClick={subscribeWithoutAccount}
disabled={isCreatingAccount}
className="flex cursor-pointer items-start border-0 bg-default p-0 font-medium text-info hover:underline"
>
Subscribe without account
</button>
)}
</div>
<Button
className="mb-4 py-2.5 md:mb-0"

9
packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
View File

@@ -7,7 +7,6 @@ import { ChangeEventHandler, FunctionComponent, useEffect, useRef, useState } fr
import FloatingLabelInput from '@/Components/Input/FloatingLabelInput'
import { isEmailValid } from '@/Utils'
import { BlueDotIcon, CircleIcon, DiamondIcon } from '@standardnotes/icons'
import { loadPurchaseFlowUrl } from '../PurchaseFlowFunctions'
type Props = {
viewControllerManager: ViewControllerManager
@@ -75,13 +74,7 @@ const SignIn: FunctionComponent<Props> = ({ viewControllerManager, application }
throw new Error(response.error?.message || response.data?.error?.message)
} else {
viewControllerManager.purchaseFlowController.closePurchaseFlow()
if (!application.hideSubscriptionMarketing) {
loadPurchaseFlowUrl(application).catch((err) => {
console.error(err)
application.alertService.alert(err).catch(console.error)
})
}
viewControllerManager.purchaseFlowController.openPurchaseFlow()
}
} catch (err) {
console.error(err)

19
packages/web/src/javascripts/Controllers/FeaturesController.ts
View File

@@ -1,4 +1,5 @@
import { WebApplication } from '@/Application/Application'
import { PremiumFeatureModalType } from '@/Components/PremiumFeaturesModal/PremiumFeatureModalType'
import { destroyAllObjectProperties } from '@/Utils'
import {
ApplicationEvent,
@@ -16,6 +17,7 @@ export class FeaturesController extends AbstractViewController {
hasSmartViews: boolean
hasFiles: boolean
premiumAlertFeatureName: string | undefined
premiumAlertType: PremiumFeatureModalType | undefined = undefined
override deinit() {
super.deinit()
@@ -25,6 +27,7 @@ export class FeaturesController extends AbstractViewController {
;(this.hasSmartViews as unknown) = undefined
;(this.hasFiles as unknown) = undefined
;(this.premiumAlertFeatureName as unknown) = undefined
;(this.premiumAlertType as unknown) = undefined
destroyAllObjectProperties(this)
}
@@ -43,10 +46,11 @@ export class FeaturesController extends AbstractViewController {
hasFolders: observable,
hasSmartViews: observable,
hasFiles: observable,
premiumAlertType: observable,
premiumAlertFeatureName: observable,
showPremiumAlert: action,
closePremiumAlert: action,
showPurchaseSuccessAlert: action,
})
this.showPremiumAlert = this.showPremiumAlert.bind(this)
@@ -55,6 +59,9 @@ export class FeaturesController extends AbstractViewController {
this.disposers.push(
application.addEventObserver(async (event) => {
switch (event) {
case ApplicationEvent.DidPurchaseSubscription:
this.showPurchaseSuccessAlert()
break
case ApplicationEvent.FeaturesUpdated:
case ApplicationEvent.Launched:
runInAction(() => {
@@ -76,11 +83,17 @@ export class FeaturesController extends AbstractViewController {
public async showPremiumAlert(featureName: string): Promise<void> {
this.premiumAlertFeatureName = featureName
return when(() => this.premiumAlertFeatureName === undefined)
this.premiumAlertType = PremiumFeatureModalType.UpgradePrompt
return when(() => this.premiumAlertType === undefined)
}
showPurchaseSuccessAlert = () => {
this.premiumAlertType = PremiumFeatureModalType.UpgradeSuccess
}
public closePremiumAlert() {
this.premiumAlertFeatureName = undefined
this.premiumAlertType = undefined
}
private isEntitledToFiles(): boolean {

57
packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts
View File

@@ -1,5 +1,6 @@
import { LoggingDomain, log } from '@/Logging'
import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions'
import { InternalEventBus } from '@standardnotes/snjs'
import { InternalEventBus, AppleIAPProductId } from '@standardnotes/snjs'
import { action, makeObservable, observable } from 'mobx'
import { WebApplication } from '../../Application/Application'
import { AbstractViewController } from '../Abstract/AbstractViewController'
@@ -26,15 +27,67 @@ export class PurchaseFlowController extends AbstractViewController {
this.currentPane = currentPane
}
openPurchaseFlow = (): void => {
openPurchaseFlow = (plan = AppleIAPProductId.ProPlanYearly): void => {
const user = this.application.getUser()
if (!user) {
this.isOpen = true
return
}
if (this.application.isNativeIOS()) {
void this.beginIosIapPurchaseFlow(plan)
} else {
loadPurchaseFlowUrl(this.application).catch(console.error)
}
}
openPurchaseWebpage = () => {
loadPurchaseFlowUrl(this.application).catch((err) => {
console.error(err)
this.application.alertService.alert(err).catch(console.error)
})
}
beginIosIapPurchaseFlow = async (plan: AppleIAPProductId): Promise<void> => {
const result = await this.application.mobileDevice().purchaseSubscriptionIAP(plan)
log(LoggingDomain.Purchasing, 'BeginIosIapPurchaseFlow result', result)
if (!result) {
void this.application.alertService.alert('Your purchase was canceled or failed. Please try again.')
return
}
const showGenericError = () => {
void this.application.alertService.alert(
'There was an error confirming your purchase. Please contact support at help@standardnotes.com.',
)
}
log(LoggingDomain.Purchasing, 'Confirming result with our server')
const token = await this.application.getNewSubscriptionToken()
if (!token) {
log(LoggingDomain.Purchasing, 'Unable to generate subscription token')
showGenericError()
return
}
const confirmResult = await this.application.subscriptions.confirmAppleIAP(result, token)
log(LoggingDomain.Purchasing, 'Server confirm result', confirmResult)
if (confirmResult) {
void this.application.alerts.alert(
'Please allow a few minutes for your subscription benefits to activate. You will see a confirmation alert in the app when your subscription is ready.',
'Your purchase was successful!',
)
} else {
showGenericError()
}
}
closePurchaseFlow = (): void => {
this.isOpen = false
}

3
packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
View File

@@ -21,7 +21,6 @@ export class SubscriptionController extends AbstractViewController {
userSubscription: Subscription | undefined = undefined
availableSubscriptions: AvailableSubscriptions | undefined = undefined
subscriptionInvitations: Invitation[] | undefined = undefined
hideSubscriptionMarketing: boolean
hasAccount: boolean
override deinit() {
@@ -39,14 +38,12 @@ export class SubscriptionController extends AbstractViewController {
private subscriptionManager: SubscriptionClientInterface,
) {
super(application, eventBus)
this.hideSubscriptionMarketing = application.hideSubscriptionMarketing
this.hasAccount = application.hasAccount()
makeObservable(this, {
userSubscription: observable,
availableSubscriptions: observable,
subscriptionInvitations: observable,
hideSubscriptionMarketing: observable,
hasAccount: observable,
userSubscriptionName: computed,

29
packages/web/src/javascripts/Hooks/usePremiumModal.tsx
View File

@@ -1,8 +1,8 @@
import { WebApplication } from '@/Application/Application'
import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
import { observer } from 'mobx-react-lite'
import { FunctionComponent, createContext, useCallback, useContext, ReactNode } from 'react'
import PremiumFeaturesModal from '@/Components/PremiumFeaturesModal/PremiumFeaturesModal'
import { FeaturesController } from '@/Controllers/FeaturesController'
type PremiumModalContextData = {
activate: (featureName: string) => void
@@ -24,15 +24,13 @@ export const usePremiumModal = (): PremiumModalContextData => {
interface Props {
application: WebApplication
viewControllerManager: ViewControllerManager
featuresController: FeaturesController
children: ReactNode
}
const PremiumModalProvider: FunctionComponent<Props> = observer(
({ application, viewControllerManager, children }: Props) => {
const featureName = viewControllerManager.featuresController.premiumAlertFeatureName || ''
const showModal = !!featureName
({ application, featuresController, children }: Props) => {
const featureName = featuresController.premiumAlertFeatureName || ''
const hasSubscription = application.hasValidSubscription()
@@ -40,25 +38,26 @@ const PremiumModalProvider: FunctionComponent<Props> = observer(
const activate = useCallback(
(feature: string) => {
viewControllerManager.featuresController.showPremiumAlert(feature).catch(console.error)
featuresController.showPremiumAlert(feature).catch(console.error)
},
[viewControllerManager],
[featuresController],
)
const close = useCallback(() => {
viewControllerManager.featuresController.closePremiumAlert()
}, [viewControllerManager])
featuresController.closePremiumAlert()
}, [featuresController])
return (
<>
{showModal && (
{featuresController.premiumAlertType != undefined && (
<PremiumFeaturesModal
application={application}
featureName={featureName}
hasSubscription={hasSubscription}
hasAccount={hasAccount}
onClose={close}
showModal={!!featureName}
showModal={featuresController.premiumAlertType != undefined}
type={featuresController.premiumAlertType}
/>
)}
<PremiumModalProvider_ value={{ activate }}>{children}</PremiumModalProvider_>
@@ -71,12 +70,10 @@ PremiumModalProvider.displayName = 'PremiumModalProvider'
const PremiumModalProviderWithDeallocateHandling: FunctionComponent<Props> = ({
application,
viewControllerManager,
featuresController,
children,
}) => {
return (
<PremiumModalProvider application={application} viewControllerManager={viewControllerManager} children={children} />
)
return <PremiumModalProvider application={application} featuresController={featuresController} children={children} />
}
export default observer(PremiumModalProviderWithDeallocateHandling)

4
packages/web/src/javascripts/Logging.ts
View File

@@ -9,6 +9,7 @@ export enum LoggingDomain {
Viewport,
Selection,
BlockEditor,
Purchasing,
}
const LoggingStatus: Record<LoggingDomain, boolean> = {
@@ -18,7 +19,8 @@ const LoggingStatus: Record<LoggingDomain, boolean> = {
[LoggingDomain.NavigationList]: false,
[LoggingDomain.Viewport]: false,
[LoggingDomain.Selection]: false,
[LoggingDomain.BlockEditor]: true,
[LoggingDomain.BlockEditor]: false,
[LoggingDomain.Purchasing]: true,
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any