Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-21 16:18:28 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1879] Add null check for collection view helpers (#7073)

Browse Source 
* [AC-1879] Add null check for collection view helpers

* [AC-1879] Add additional null check to organization-options.component.ts
This commit is contained in:
Shane Melton 2023-12-21 15:51:48 -08:00 committed by GitHub
parent bbdf704763
commit a19a4ffdf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
View File

@ -87,9 +87,9 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
}
allowEnrollmentChanges(org: OrganizationFilter): boolean {
if (org.usePolicies && org.useResetPassword && org.hasPublicAndPrivateKeys) {
if (org?.usePolicies && org?.useResetPassword && org?.hasPublicAndPrivateKeys) {
if (this.resetPasswordPolicy != undefined && this.resetPasswordPolicy.enabled) {
return !(org.resetPasswordEnrolled && this.resetPasswordPolicy.data.autoEnrollEnabled);
return !(org?.resetPasswordEnrolled && this.resetPasswordPolicy.data.autoEnrollEnabled);
}
}
@ -97,7 +97,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
}
showSsoOptions(org: OrganizationFilter) {
return org.useSso && org.identifier;
return org?.useSso && org?.identifier;
}
async unlinkSso(org: Organization) {

4
libs/common/src/vault/models/view/collection.view.ts
View File

@ -33,7 +33,7 @@ export class CollectionView implements View, ITreeNodeObject {
// For editing collection details, not the items within it.
canEdit(org: Organization, flexibleCollectionsEnabled: boolean): boolean {
if (org.id !== this.organizationId) {
if (org != null && org.id !== this.organizationId) {
throw new Error(
"Id of the organization provided does not match the org id of the collection.",
);
@ -46,7 +46,7 @@ export class CollectionView implements View, ITreeNodeObject {
// For deleting a collection, not the items within it.
canDelete(org: Organization, flexibleCollectionsEnabled: boolean): boolean {
if (org.id !== this.organizationId) {
if (org != null && org.id !== this.organizationId) {
throw new Error(
"Id of the organization provided does not match the org id of the collection.",
);