Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #829 from bitwarden/verify-email-for-send

Browse Source 
Require user to verify email to use file Send
This commit is contained in:
Thomas Rittson 2021-04-12 08:21:13 +10:00 committed by GitHub
commit 70aef37f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 78d40d9f18c23a185465d5fca238b258b2848193
Subproject commit 85893f5f9efb201a45c5af54896a82e6eb185108

9
src/app/app.component.ts
View File

@ -217,6 +217,15 @@ export class AppComponent implements OnInit {
this.openModal<PremiumComponent>(PremiumComponent, this.premiumRef);
}
break;
case 'emailVerificationRequired':
const emailVerificationConfirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('emailVerificationRequiredDesc'),
this.i18nService.t('emailVerificationRequired'),
this.i18nService.t('learnMore'), this.i18nService.t('cancel'));
if (emailVerificationConfirmed) {
this.platformUtilsService.launchUri('https://bitwarden.com/help/article/create-bitwarden-account/');
}
break;
case 'syncVault':
try {
await this.syncService.fullSync(true, true);

5
src/app/send/add-edit.component.ts
View File

@ -8,6 +8,7 @@ import { MessagingService } from 'jslib/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service';
import { SendService } from 'jslib/abstractions/send.service';
import { TokenService } from 'jslib/abstractions/token.service';
import { UserService } from 'jslib/abstractions/user.service';
import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/send/add-edit.component';
@ -20,9 +21,9 @@ export class AddEditComponent extends BaseAddEditComponent {
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
environmentService: EnvironmentService, datePipe: DatePipe,
sendService: SendService, userService: UserService,
messagingService: MessagingService, policyService: PolicyService) {
messagingService: MessagingService, policyService: PolicyService, tokenService: TokenService) {
super(i18nService, platformUtilsService, environmentService,
datePipe, sendService, userService, messagingService, policyService);
datePipe, sendService, userService, messagingService, policyService, tokenService);
}
async refresh() {

6
src/locales/en/messages.json
View File

@ -1662,5 +1662,11 @@
},
"sendOptionsPolicyInEffect": {
"message": "One or more organization policies are affecting your Send options."
},
"emailVerificationRequired": {
"message": "Email Verification Required"
},
"emailVerificationRequiredDesc": {
"message": "You must verify your email to use this feature."
}
}