Upstream
/
bitwarden-browser
mirror of https://github.com/bitwarden/browser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add sponsorship pre validate to families redeem page (#1315) 

* Add sponsorship pre validate to families redeem page

* Update messaging

* update jslib
This commit is contained in:
Matt Gibson 2021-11-24 14:31:16 -06:00 committed by GitHub
parent 9cc7dfb884
commit 6ec22a9408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit b4f475251aa6817403117b71fb5a8836cdae9c75
Subproject commit d02fcd082edd8f94cff30d057644540eb6ccde87

5
src/app/organizations/sponsorships/families-for-enterprise-setup.component.html
View File

@ -6,7 +6,10 @@
<i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
<span class="sr-only">{{'loading' | i18n}}</span>
</div>
<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="!loading">
<div *ngIf="!loading && badToken" class="mt-5 d-flex justify-content-center">
<span>{{'badToken' | i18n}}</span>
</div>
<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="!loading && !badToken">
<p>
<span>{{'acceptBitwardenFamiliesHelp' | i18n}}</span>
</p>

2
src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts
View File

@ -55,6 +55,7 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit {
@ViewChild('deleteOrganizationTemplate', { read: ViewContainerRef, static: true }) deleteModalRef: ViewContainerRef;
loading = true;
badToken = false;
formPromise: Promise<any>;
token: string;
@ -89,6 +90,7 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit {
this.token = qParams.token;
await this.syncService.fullSync(true);
this.badToken = !await this.apiService.postPreValidateSponsorshipToken(this.token);
this.loading = false;
this.existingFamilyOrganizations = (await this.userService.getAllOrganizations())

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

@ -4506,6 +4506,9 @@
"sponsoredFamiliesSharedCollections": {
"message": "Shared collections for Family secrets"
},
"badToken": {
"message": "The link is no longer valid. Please have the sponsor resend the offer."
},
"reclaimedFreePlan": {
"message": "Reclaimed free plan"
},
@ -4540,7 +4543,7 @@
}
},
"sponsoredFamiliesOffer": {
"message": "Redeem Free Bitwarden Families Organization Offer"
"message": "Accept Free Bitwarden Families"
},
"sponsoredFamiliesOfferRedeemed": {
"message": "Free Bitwarden Families offer successfully redeemed"
@ -4702,7 +4705,7 @@
"message": "Please provide a payment method to associate with the organization. Don't worry, we won't charge you anything unless you select additional features or your sponsorship expires. "
},
"orgCreatedSponsorshipInvalid": {
"message": "The sponsorship offer has expired you may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
"message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
},
"newFamiliesOrganization": {
"message": "New Families Organization"