bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-24 08:33:29 +00:00
Code Issues Releases Wiki Activity

add back defensive programming. update restore

Browse Source
This commit is contained in:
jaasen-livefront
2026-02-10 16:53:29 -08:00
parent 0d780fad34
commit c78c019787
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web/src/app/admin-console/organizations/collections/vault.component.ts
View File

@@ -962,10 +962,10 @@ export class VaultComponent implements OnInit, OnDestroy {
await this.editCipher(cipher, true);
}
restore = async (c: CipherViewLike): Promise<boolean> => {
restore = async (c: CipherViewLike) => {
const organization = await firstValueFrom(this.organization$);
if (!CipherViewLikeUtils.isDeleted(c)) {
return false;
return;
}
if (
@@ -974,11 +974,11 @@ export class VaultComponent implements OnInit, OnDestroy {
!organization.allowAdminAccessToAllCollectionItems
) {
this.showMissingPermissionsError();
return false;
return;
}
if (!(await this.repromptCipher([c]))) {
return false;
return;
}
// Allow restore of an Unassigned Item
@@ -996,10 +996,10 @@ export class VaultComponent implements OnInit, OnDestroy {
message: this.i18nService.t("restoredItem"),
});
this.refresh();
return true;
return;
} catch (e) {
this.logService.error(e);
return false;
return;
}
};

2
apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
View File

@@ -100,7 +100,7 @@ export interface VaultItemDialogParams {
/**
* Function to restore a cipher from the trash.
*/
restore?: (c: CipherViewLike) => Promise<boolean>;
restore?: (c: CipherViewLike) => Promise<void>;
}
export const VaultItemDialogResult = {

18
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -467,7 +467,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
collections,
filter.collectionId,
);
searchableCollectionNodes = selectedCollection.children;
searchableCollectionNodes = selectedCollection?.children;
}
if (await this.searchService.isSearchable(activeUserId, searchText)) {
@@ -606,7 +606,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
this.collections = collections;
this.selectedCollection = selectedCollection;
this.canCreateCollections = allOrganizations.some(
this.canCreateCollections = allOrganizations?.some(
(o) => o.canCreateNewCollections && !o.isProviderUser,
);
@@ -876,7 +876,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
* @returns
*/
async editCipherAttachments(cipher: C) {
if (cipher.reprompt !== 0 && !(await this.passwordRepromptService.showPasswordPrompt())) {
if (cipher?.reprompt !== 0 && !(await this.passwordRepromptService.showPasswordPrompt())) {
await this.go({ cipherId: null, itemId: null });
return;
}
@@ -1256,16 +1256,16 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
restore = async (c: CipherViewLike) => {
let toastMessage;
if (!CipherViewLikeUtils.isDeleted(c)) {
return false;
return;
}
if (!c.edit) {
this.showMissingPermissionsError();
return false;
return;
}
if (!(await this.repromptCipher([c]))) {
return false;
return;
}
if (CipherViewLikeUtils.isArchived(c)) {
@@ -1284,9 +1284,9 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
this.refresh();
} catch (e) {
this.logService.error(e);
return false;
return;
}
return true;
return;
};
async bulkRestore(ciphers: C[]) {
@@ -1585,7 +1585,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
*/
private async getPasswordFromCipherViewLike(cipher: C): Promise<string | undefined> {
if (!CipherViewLikeUtils.isCipherListView(cipher)) {
return Promise.resolve(cipher.login.password);
return Promise.resolve(cipher?.login?.password);
}
const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));