fix: Fixes issue where self-hosted accounts may not have loaded correct server
This commit is contained in:
@@ -1529,7 +1529,6 @@ export class Dependencies {
|
||||
this.get<HttpService>(TYPES.HttpService),
|
||||
this.get<DiskStorageService>(TYPES.DiskStorageService),
|
||||
this.options.defaultHost,
|
||||
this.options.identifier,
|
||||
this.get<InMemoryStore>(TYPES.InMemoryStore),
|
||||
this.get<PureCryptoInterface>(TYPES.Crypto),
|
||||
this.get<SessionStorageMapper>(TYPES.SessionStorageMapper),
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -106,7 +106,6 @@ export class LegacyApiService
|
||||
private httpService: HttpServiceInterface,
|
||||
private storageService: DiskStorageService,
|
||||
private host: string,
|
||||
private workspaceIdentifier: string,
|
||||
private inMemoryStore: KeyValueStoreInterface<string>,
|
||||
private crypto: PureCryptoInterface,
|
||||
private sessionStorageMapper: MapperInterface<Session, Record<string, unknown>>,
|
||||
@@ -143,16 +142,14 @@ export class LegacyApiService
|
||||
}
|
||||
|
||||
public loadHost(): string {
|
||||
const storedValue = this.storageService.getValue<string | undefined>(
|
||||
`${StorageKey.ServerHost}:${this.workspaceIdentifier}`,
|
||||
)
|
||||
const storedValue = this.storageService.getValue<string | undefined>(StorageKey.ServerHost)
|
||||
this.host = storedValue || this.host
|
||||
return this.host
|
||||
}
|
||||
|
||||
public async setHost(host: string): Promise<void> {
|
||||
this.host = host
|
||||
this.storageService.setValue(`${StorageKey.ServerHost}:${this.workspaceIdentifier}`, host)
|
||||
this.storageService.setValue(StorageKey.ServerHost, host)
|
||||
}
|
||||
|
||||
public getHost(): string {
|
||||
|
||||
@@ -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) {
|
||||
void this.apiService.setHost(serverHost)
|
||||
this.httpService.setHost(serverHost)
|
||||
|
||||
Reference in New Issue
Block a user