bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

Fix warning when attempting a double login in the cli (#468)

Browse Source 
* Replace call to `getEntityType` with a static string

* Delete several unused `StateService` methods
This commit is contained in:
Addison Beck
2024-03-19 09:30:38 -05:00
committed by GitHub
parent 5ce3b01ff1
commit cc05bcb4a6
3 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jslib/common/src/abstractions/state.service.ts
View File

@@ -210,9 +210,6 @@ export abstract class StateService<T extends Account = Account> {
getEncryptedSends: (options?: StorageOptions) => Promise<{ [id: string]: SendData }>;
setEncryptedSends: (value: { [id: string]: SendData }, options?: StorageOptions) => Promise<void>;
getEntityId: (options?: StorageOptions) => Promise<string>;
setEntityId: (value: string, options?: StorageOptions) => Promise<void>;
getEntityType: (options?: StorageOptions) => Promise<any>;
setEntityType: (value: string, options?: StorageOptions) => Promise<void>;
getEnvironmentUrls: (options?: StorageOptions) => Promise<EnvironmentUrls>;
setEnvironmentUrls: (value: EnvironmentUrls, options?: StorageOptions) => Promise<void>;
getEquivalentDomains: (options?: StorageOptions) => Promise<any>;

28
jslib/common/src/services/state.service.ts
View File

@@ -1355,34 +1355,6 @@ export class StateService<
)?.profile?.entityId;
}
async setEntityId(value: string, options?: StorageOptions): Promise<void> {
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()),
);
account.profile.entityId = value;
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()),
);
}
async getEntityType(options?: StorageOptions): Promise<any> {
return (
await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
)?.profile?.entityType;
}
async setEntityType(value: string, options?: StorageOptions): Promise<void> {
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()),
);
account.profile.entityType = value;
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()),
);
}
async getEnvironmentUrls(options?: StorageOptions): Promise<EnvironmentUrls> {
if (this.state.activeUserId == null) {
return await this.getGlobalEnvironmentUrls(options);

3
src/program.ts
View File

@@ -301,10 +301,9 @@ export class Program extends BaseProgram {
async exitIfAuthed() {
const authed = await this.stateService.getIsAuthenticated();
if (authed) {
const type = await this.stateService.getEntityType();
const id = await this.stateService.getEntityId();
this.processResponse(
Response.error("You are already logged in as " + type + "." + id + "."),
Response.error("You are already logged in as organization." + id + "."),
true,
);
}