bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 02:33:46 +00:00
Code Issues Releases Wiki Activity

handle redirect params for create org/premium

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-20 10:29:40 -04:00
parent a5246df3ed
commit b99df5905f
6 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/accounts/login.component.ts
View File

@@ -32,6 +32,12 @@ export class LoginComponent extends BaseLoginComponent {
if (qParams.email != null && qParams.email.indexOf('@') > -1) {
this.email = qParams.email;
}
if (qParams.premium != null) {
this.stateService.save('loginRedirect', { route: '/settings/premium' });
} else if (qParams.org != null) {
this.stateService.save('loginRedirect',
{ route: '/settings/create-organization', qParams: { plan: qParams.org } });
}
await super.ngOnInit();
});
}
@@ -41,7 +47,13 @@ export class LoginComponent extends BaseLoginComponent {
if (invite != null) {
this.router.navigate(['accept-organization'], { queryParams: invite });
} else {
this.router.navigate([this.successRoute]);
const loginRedirect = await this.stateService.get<any>('loginRedirect');
if (loginRedirect != null) {
this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
await this.stateService.remove('loginRedirect');
} else {
this.router.navigate([this.successRoute]);
}
}
}
}

3
src/app/accounts/register.component.html
View File

@@ -4,6 +4,9 @@
<p class="lead text-center mb-4">{{'createAccount' | i18n}}</p>
<div class="card">
<div class="card-body">
<app-callout title="{{'createOrganizationStep1' | i18n}}" type="info" icon="fa-thumb-tack" *ngIf="showCreateOrgMessage">
{{'createOrganizationCreatePersonalAccount' | i18n}}
</app-callout>
<div class="form-group">
<label for="email">{{'emailAddress' | i18n}}</label>
<input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required [appAutofocus]="email === ''"

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

@@ -20,6 +20,8 @@ import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/compon
templateUrl: 'register.component.html',
})
export class RegisterComponent extends BaseRegisterComponent {
showCreateOrgMessage = false;
constructor(authService: AuthService, router: Router,
analytics: Angulartics2, toasterService: ToasterService,
i18nService: I18nService, cryptoService: CryptoService,
@@ -33,6 +35,13 @@ export class RegisterComponent extends BaseRegisterComponent {
if (qParams.email != null && qParams.email.indexOf('@') > -1) {
this.email = qParams.email;
}
if (qParams.premium != null) {
this.stateService.save('loginRedirect', { route: '/settings/premium' });
} else if (qParams.org != null) {
this.showCreateOrgMessage = true;
this.stateService.save('loginRedirect',
{ route: '/settings/create-organization', qParams: { plan: qParams.org } });
}
});
}
}

8
src/app/accounts/two-factor.component.ts
View File

@@ -63,7 +63,13 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
if (invite != null) {
this.router.navigate(['accept-organization'], { queryParams: invite });
} else {
this.router.navigate([this.successRoute]);
const loginRedirect = await this.stateService.get<any>('loginRedirect');
if (loginRedirect != null) {
this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
await this.stateService.remove('loginRedirect');
} else {
this.router.navigate([this.successRoute]);
}
}
}
}