From af84d09b7a531f9fa7e5e1f06d98807f29ff8c44 Mon Sep 17 00:00:00 2001 From: Mo Date: Wed, 26 Apr 2023 08:50:46 -0500 Subject: [PATCH] chore(snjs): remove cloudlink --- .../src/Domain/Feature/FeatureIdentifier.ts | 4 ---- .../features/src/Domain/Lists/ServerFeatures.ts | 15 --------------- .../src/Domain/Permission/PermissionName.ts | 4 ---- packages/snjs/lib/Application/Application.ts | 5 ----- .../lib/Services/Settings/SNSettingsService.ts | 14 +------------- .../snjs/lib/Services/Settings/SettingsList.ts | 8 -------- 6 files changed, 1 insertion(+), 49 deletions(-) diff --git a/packages/features/src/Domain/Feature/FeatureIdentifier.ts b/packages/features/src/Domain/Feature/FeatureIdentifier.ts index 51a5fcae1..c95090a7e 100644 --- a/packages/features/src/Domain/Feature/FeatureIdentifier.ts +++ b/packages/features/src/Domain/Feature/FeatureIdentifier.ts @@ -1,9 +1,5 @@ export enum FeatureIdentifier { - CloudLink = 'org.standardnotes.cloudlink', - DailyDropboxBackup = 'org.standardnotes.daily-dropbox-backup', DailyEmailBackup = 'org.standardnotes.daily-email-backup', - DailyGDriveBackup = 'org.standardnotes.daily-gdrive-backup', - DailyOneDriveBackup = 'org.standardnotes.daily-onedrive-backup', Files = 'org.standardnotes.files', FilesLowStorageTier = 'org.standardnotes.files-low-storage-tier', FilesMaximumStorageTier = 'org.standardnotes.files-max-storage-tier', diff --git a/packages/features/src/Domain/Lists/ServerFeatures.ts b/packages/features/src/Domain/Lists/ServerFeatures.ts index f56d4feab..ad2f794d7 100644 --- a/packages/features/src/Domain/Lists/ServerFeatures.ts +++ b/packages/features/src/Domain/Lists/ServerFeatures.ts @@ -41,21 +41,6 @@ export function serverFeatures(): ServerFeatureDescription[] { identifier: FeatureIdentifier.SignInAlerts, permission_name: PermissionName.SignInAlerts, }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - identifier: FeatureIdentifier.DailyDropboxBackup, - permission_name: PermissionName.DailyDropboxBackup, - }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - identifier: FeatureIdentifier.DailyGDriveBackup, - permission_name: PermissionName.DailyGDriveBackup, - }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - identifier: FeatureIdentifier.DailyOneDriveBackup, - permission_name: PermissionName.DailyOneDriveBackup, - }, { availableInSubscriptions: [SubscriptionName.ProPlan], identifier: FeatureIdentifier.FilesMaximumStorageTier, diff --git a/packages/features/src/Domain/Permission/PermissionName.ts b/packages/features/src/Domain/Permission/PermissionName.ts index b278a16a9..b268d9d05 100644 --- a/packages/features/src/Domain/Permission/PermissionName.ts +++ b/packages/features/src/Domain/Permission/PermissionName.ts @@ -2,14 +2,10 @@ export enum PermissionName { AccountSwitcher = 'app:account-switcher', AutobiographyTheme = 'theme:autobiography', BoldEditor = 'editor:bold', - CloudLink = 'component:cloud-link', CodeEditor = 'editor:code-editor', ComponentFilesafe = 'component:filesafe', ComponentFolders = 'component:folders', - DailyDropboxBackup = 'server:daily-dropbox-backup', DailyEmailBackup = 'server:daily-email-backup', - DailyGDriveBackup = 'server:daily-gdrive-backup', - DailyOneDriveBackup = 'server:daily-onedrive-backup', Files = 'app:files', FilesMaximumStorageTier = 'server:files-max-storage-tier', FilesLowStorageTier = 'server:files-low-storage-tier', diff --git a/packages/snjs/lib/Application/Application.ts b/packages/snjs/lib/Application/Application.ts index 4f0488956..df596877c 100644 --- a/packages/snjs/lib/Application/Application.ts +++ b/packages/snjs/lib/Application/Application.ts @@ -29,7 +29,6 @@ import * as Models from '@standardnotes/models' import * as Responses from '@standardnotes/responses' import * as InternalServices from '../Services' import * as Utils from '@standardnotes/utils' -import * as Settings from '@standardnotes/settings' import { Subscription } from '@standardnotes/security' import { UuidString, ApplicationEventPayload } from '../Types' import { applicationEventForSyncEvent } from '@Lib/Application/Event' @@ -1154,10 +1153,6 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli return this.apiService.isThirdPartyHostUsed() } - public getCloudProviderIntegrationUrl(cloudProviderName: Settings.CloudProvider): string { - return this.settingsService.getCloudProviderIntegrationUrl(cloudProviderName) - } - private constructServices() { this.createMappers() this.createPayloadManager() diff --git a/packages/snjs/lib/Services/Settings/SNSettingsService.ts b/packages/snjs/lib/Services/Settings/SNSettingsService.ts index c38799305..37a8bebf9 100644 --- a/packages/snjs/lib/Services/Settings/SNSettingsService.ts +++ b/packages/snjs/lib/Services/Settings/SNSettingsService.ts @@ -1,8 +1,7 @@ import { SNApiService } from '../Api/ApiService' import { SettingsGateway } from './SettingsGateway' import { SNSessionManager } from '../Session/SessionManager' -import { CloudProvider, EmailBackupFrequency, SettingName } from '@standardnotes/settings' -import { ExtensionsServerURL } from '@Lib/Hosts' +import { EmailBackupFrequency, SettingName } from '@standardnotes/settings' import { AbstractService, InternalEventBusInterface } from '@standardnotes/services' import { SettingsClientInterface } from './SettingsClientInterface' @@ -14,12 +13,6 @@ export class SNSettingsService extends AbstractService implements SettingsClient [EmailBackupFrequency.Weekly]: 'Weekly', } - private cloudProviderIntegrationUrlEndpoints = { - [CloudProvider.Dropbox]: 'dropbox', - [CloudProvider.Google]: 'gdrive', - [CloudProvider.OneDrive]: 'onedrive', - } - constructor( private readonly sessionManager: SNSessionManager, private readonly apiService: SNApiService, @@ -60,11 +53,6 @@ export class SNSettingsService extends AbstractService implements SettingsClient return this.frequencyOptionsLabels[frequency] } - getCloudProviderIntegrationUrl(cloudProviderName: CloudProvider): string { - const { Prod } = ExtensionsServerURL - return `${Prod}/${this.cloudProviderIntegrationUrlEndpoints[cloudProviderName]}?redirect_url=${Prod}/components/cloudlink?` - } - override deinit(): void { this.provider?.deinit() ;(this.provider as unknown) = undefined diff --git a/packages/snjs/lib/Services/Settings/SettingsList.ts b/packages/snjs/lib/Services/Settings/SettingsList.ts index 3a0f08e83..69c9062cc 100644 --- a/packages/snjs/lib/Services/Settings/SettingsList.ts +++ b/packages/snjs/lib/Services/Settings/SettingsList.ts @@ -1,13 +1,9 @@ import { SettingData } from '@standardnotes/responses' import { - OneDriveBackupFrequency, MuteSignInEmailsOption, MuteFailedCloudBackupsEmailsOption, MuteFailedBackupsEmailsOption, - CloudProvider, - DropboxBackupFrequency, EmailBackupFrequency, - GoogleDriveBackupFrequency, ListedAuthorSecretsData, LogSessionUserAgentOption, SettingName, @@ -15,17 +11,13 @@ import { } from '@standardnotes/settings' type SettingType = - | CloudProvider - | DropboxBackupFrequency | EmailBackupFrequency - | GoogleDriveBackupFrequency | ListedAuthorSecretsData | LogSessionUserAgentOption | MuteFailedBackupsEmailsOption | MuteFailedCloudBackupsEmailsOption | MuteSignInEmailsOption | MuteMarketingEmailsOption - | OneDriveBackupFrequency export class SettingsList { private map: Partial> = {}