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

fix: Fixes issue where self-hosted accounts may not have loaded correct server

Browse Source
This commit is contained in:
Mo
2024-01-06 15:00:41 -06:00
parent 604f341f8f
commit acd20dcc70
4 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/snjs/lib/Application/Dependencies/Dependencies.ts
View File

@@ -1529,7 +1529,6 @@ export class Dependencies {
this.get<HttpService>(TYPES.HttpService), this.get<HttpService>(TYPES.HttpService),
this.get<DiskStorageService>(TYPES.DiskStorageService), this.get<DiskStorageService>(TYPES.DiskStorageService),
this.options.defaultHost, this.options.defaultHost,
this.options.identifier,
this.get<InMemoryStore>(TYPES.InMemoryStore), this.get<InMemoryStore>(TYPES.InMemoryStore),
this.get<PureCryptoInterface>(TYPES.Crypto), this.get<PureCryptoInterface>(TYPES.Crypto),
this.get<SessionStorageMapper>(TYPES.SessionStorageMapper), this.get<SessionStorageMapper>(TYPES.SessionStorageMapper),

27
packages/snjs/lib/Migrations/Versions/2_204_8.ts
View File

@@ -1,27 +0,0 @@
import { ApplicationStage, StorageKey } from '@standardnotes/services'
import { Migration } from '@Lib/Migrations/Migration'
export class Migration2_204_8 extends Migration {
static override version(): string {
return '2.204.8'
}
protected registerStageHandlers(): void {
this.registerStageHandler(ApplicationStage.Launched_10, async () => {
await this.migrateHostKeyStoredToWorkspaceIdentified()
this.markDone()
})
}
private async migrateHostKeyStoredToWorkspaceIdentified(): Promise<void> {
const existingHostKeyValue = this.services.storageService.getValue<string | undefined>(StorageKey.ServerHost)
if (existingHostKeyValue === undefined) {
return
}
this.services.storageService.setValue(`${StorageKey.ServerHost}:${this.services.identifier}`, existingHostKeyValue)
await this.services.storageService.removeValue(StorageKey.ServerHost)
}
}

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

@@ -106,7 +106,6 @@ export class LegacyApiService
private httpService: HttpServiceInterface, private httpService: HttpServiceInterface,
private storageService: DiskStorageService, private storageService: DiskStorageService,
private host: string, private host: string,
private workspaceIdentifier: string,
private inMemoryStore: KeyValueStoreInterface<string>, private inMemoryStore: KeyValueStoreInterface<string>,
private crypto: PureCryptoInterface, private crypto: PureCryptoInterface,
private sessionStorageMapper: MapperInterface<Session, Record<string, unknown>>, private sessionStorageMapper: MapperInterface<Session, Record<string, unknown>>,
@@ -143,16 +142,14 @@ export class LegacyApiService
} }
public loadHost(): string { public loadHost(): string {
const storedValue = this.storageService.getValue<string | undefined>( const storedValue = this.storageService.getValue<string | undefined>(StorageKey.ServerHost)
`${StorageKey.ServerHost}:${this.workspaceIdentifier}`,
)
this.host = storedValue || this.host this.host = storedValue || this.host
return this.host return this.host
} }
public async setHost(host: string): Promise<void> { public async setHost(host: string): Promise<void> {
this.host = host this.host = host
this.storageService.setValue(`${StorageKey.ServerHost}:${this.workspaceIdentifier}`, host) this.storageService.setValue(StorageKey.ServerHost, host)
} }
public getHost(): string { public getHost(): string {

2
packages/snjs/lib/Services/Session/SessionManager.ts
View File

@@ -169,7 +169,7 @@ export class SessionManager
} }
} }
const serverHost = this.storage.getValue<string | undefined>(`${StorageKey.ServerHost}:${this.workspaceIdentifier}`) const serverHost = this.storage.getValue<string | undefined>(StorageKey.ServerHost)
if (serverHost) { if (serverHost) {
void this.apiService.setHost(serverHost) void this.apiService.setHost(serverHost)
this.httpService.setHost(serverHost) this.httpService.setHost(serverHost)