Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-17 15:37:57 +01:00
Code Issues Projects Releases Wiki Activity

use send.bitwarden.com (#304)

Browse Source
This commit is contained in:
Kyle Spearrin 2021-03-11 10:08:28 -05:00 committed by GitHub
parent 5d32ba68ec
commit c8cab2a9e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/angular/components/send/add-edit.component.ts
View File

@ -74,7 +74,7 @@ export class AddEditComponent implements OnInit {
safariDeletionTimeOptions: TimeOption[];
safariExpirationTimeOptions: TimeOption[];
private webVaultUrl: string;
private sendLinkBaseUrl: string;
constructor(protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService,
protected environmentService: EnvironmentService, protected datePipe: DatePipe,
@ -97,15 +97,17 @@ export class AddEditComponent implements OnInit {
{ name: i18nService.t('never'), value: null },
].concat([...this.deletionDateOptions]);
this.webVaultUrl = this.environmentService.getWebVaultUrl();
if (this.webVaultUrl == null) {
this.webVaultUrl = 'https://vault.bitwarden.com';
const webVaultUrl = this.environmentService.getWebVaultUrl();
if (webVaultUrl == null) {
this.sendLinkBaseUrl = 'https://send.bitwarden.com/#';
} else {
this.sendLinkBaseUrl = webVaultUrl + '/#/send/';
}
}
get link(): string {
if (this.send.id != null && this.send.accessId != null) {
return this.webVaultUrl + '/#/send/' + this.send.accessId + '/' + this.send.urlB64Key;
return this.sendLinkBaseUrl + this.send.accessId + '/' + this.send.urlB64Key;
}
return null;
}
@ -484,7 +486,7 @@ export class AddEditComponent implements OnInit {
standard: this.datePipe.transform(this.expirationDateTimeFallback, 'hh:mm a'),
military: this.datePipe.transform(this.expirationDateTimeFallback, 'HH:mm'),
};
return [previousValue, {standard: null, military: null}, ...validTimes];
return [previousValue, { standard: null, military: null }, ...validTimes];
} else if (field === DateField.DeletionDate && this.deletionDateTimeFallback != null && this.editMode) {
const previousValue: TimeOption = {
standard: this.datePipe.transform(this.deletionDateTimeFallback, 'hh:mm a'),
@ -492,7 +494,7 @@ export class AddEditComponent implements OnInit {
};
return [previousValue, ...validTimes];
} else {
return [{standard: null, military: null}, ...validTimes];
return [{ standard: null, military: null }, ...validTimes];
}
}
}