bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Require user to verify email to use file Send (#331)

Browse Source 
* Require user to verify email to use file Send

* Simplify alertShown logic
This commit is contained in:
Thomas Rittson
2021-04-09 07:05:15 +10:00
committed by GitHub
parent 78d40d9f18
commit 85893f5f9e
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import { MessagingService } from '../../../abstractions/messaging.service';
import { PlatformUtilsService } from '../../../abstractions/platformUtils.service'; import { PlatformUtilsService } from '../../../abstractions/platformUtils.service';
import { PolicyService } from '../../../abstractions/policy.service'; import { PolicyService } from '../../../abstractions/policy.service';
import { SendService } from '../../../abstractions/send.service'; import { SendService } from '../../../abstractions/send.service';
import { TokenService } from '../../../abstractions/token.service';
import { UserService } from '../../../abstractions/user.service'; import { UserService } from '../../../abstractions/user.service';
import { SendFileView } from '../../../models/view/sendFileView'; import { SendFileView } from '../../../models/view/sendFileView';
@@ -67,7 +68,8 @@ export class AddEditComponent implements OnInit {
deletionDateSelect = 168; deletionDateSelect = 168;
expirationDateSelect: number = null; expirationDateSelect: number = null;
canAccessPremium = true; canAccessPremium = true;
premiumRequiredAlertShown = false; emailVerified = true;
alertShown = false;
showOptions = false; showOptions = false;
safariDeletionTime: string; safariDeletionTime: string;
@@ -80,7 +82,8 @@ export class AddEditComponent implements OnInit {
constructor(protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService, constructor(protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService,
protected environmentService: EnvironmentService, protected datePipe: DatePipe, protected environmentService: EnvironmentService, protected datePipe: DatePipe,
protected sendService: SendService, protected userService: UserService, protected sendService: SendService, protected userService: UserService,
protected messagingService: MessagingService, protected policyService: PolicyService) { protected messagingService: MessagingService, protected policyService: PolicyService,
protected tokenService: TokenService) {
this.typeOptions = [ this.typeOptions = [
{ name: i18nService.t('sendTypeFile'), value: SendType.File }, { name: i18nService.t('sendTypeFile'), value: SendType.File },
{ name: i18nService.t('sendTypeText'), value: SendType.Text }, { name: i18nService.t('sendTypeText'), value: SendType.Text },
@@ -170,7 +173,8 @@ export class AddEditComponent implements OnInit {
}); });
this.canAccessPremium = await this.userService.canAccessPremium(); this.canAccessPremium = await this.userService.canAccessPremium();
if (!this.canAccessPremium) { this.emailVerified = this.tokenService.getEmailVerified();
if (!this.canAccessPremium || !this.emailVerified) {
this.type = SendType.Text; this.type = SendType.Text;
} }
@@ -355,9 +359,15 @@ export class AddEditComponent implements OnInit {
} }
typeChanged() { typeChanged() {
if (!this.canAccessPremium && this.send.type === SendType.File && !this.premiumRequiredAlertShown) { if (this.send.type === SendType.File && !this.alertShown)
this.premiumRequiredAlertShown = true; {
this.messagingService.send('premiumRequired'); if (!this.canAccessPremium) {
this.alertShown = true;
this.messagingService.send('premiumRequired');
} else if (!this.emailVerified) {
this.alertShown = true;
this.messagingService.send('emailVerificationRequired');
}
} }
} }