bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

handle empty strings in identity view for sdk cipher encryption (#17423)

Browse Source
This commit is contained in:
SmithThe4th
2025-11-17 15:10:50 -05:00
committed by GitHub
parent 4e2d8988f2
commit de17b33dd5
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/common/src/vault/models/view/identity.view.ts
View File

@@ -94,16 +94,16 @@ export class IdentityView extends ItemView implements SdkIdentityView {
this.lastName != null this.lastName != null
) { ) {
let name = ""; let name = "";
if (this.title != null) { if (!Utils.isNullOrWhitespace(this.title)) {
name += this.title + " "; name += this.title + " ";
} }
if (this.firstName != null) { if (!Utils.isNullOrWhitespace(this.firstName)) {
name += this.firstName + " "; name += this.firstName + " ";
} }
if (this.middleName != null) { if (!Utils.isNullOrWhitespace(this.middleName)) {
name += this.middleName + " "; name += this.middleName + " ";
} }
if (this.lastName != null) { if (!Utils.isNullOrWhitespace(this.lastName)) {
name += this.lastName; name += this.lastName;
} }
return name.trim(); return name.trim();
@@ -130,14 +130,20 @@ export class IdentityView extends ItemView implements SdkIdentityView {
} }
get fullAddressPart2(): string | undefined { get fullAddressPart2(): string | undefined {
if (this.city == null && this.state == null && this.postalCode == null) { const hasCity = !Utils.isNullOrWhitespace(this.city);
const hasState = !Utils.isNullOrWhitespace(this.state);
const hasPostalCode = !Utils.isNullOrWhitespace(this.postalCode);
if (!hasCity && !hasState && !hasPostalCode) {
return undefined; return undefined;
} }
const city = this.city || "-";
const city = hasCity ? this.city : "-";
const state = this.state; const state = this.state;
const postalCode = this.postalCode || "-"; const postalCode = hasPostalCode ? this.postalCode : "-";
let addressPart2 = city; let addressPart2 = city;
if (!Utils.isNullOrWhitespace(state)) { if (hasState) {
addressPart2 += ", " + state; addressPart2 += ", " + state;
} }
addressPart2 += ", " + postalCode; addressPart2 += ", " + postalCode;