vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Merge branch 'feature/reference-id'

This commit is contained in:
Chad Scharf 2020-06-25 16:36:28 -04:00
parent 394a7e42fb 88c8c8ae55
commit 240c576bad
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 7f6d7424e77bccd68b63506b1205ef0dfa7c21bd Subproject commit 57ace4084556758fdc2989cf1a8cf6a5d1736a29

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

@ -77,6 +77,14 @@ export class RegisterComponent extends BaseRegisterComponent {
if (qParams.layout != null) { if (qParams.layout != null) {
this.layout = qParams.layout; this.layout = qParams.layout;
} }
if (qParams.reference != null) {
this.referenceId = qParams.reference;
} else {
this.referenceId = ('; ' + document.cookie).split('; reference=').pop().split(';').shift();
}
if (this.referenceId === '') {
this.referenceId = null;
}
if (queryParamsSub != null) { if (queryParamsSub != null) {
queryParamsSub.unsubscribe(); queryParamsSub.unsubscribe();
} }

2
src/app/layouts/organization-layout.component.ts
View File

@ -8,8 +8,8 @@ import { ActivatedRoute } from '@angular/router';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
import { UserService } from 'jslib/abstractions/user.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Organization } from 'jslib/models/domain/organization'; import { Organization } from 'jslib/models/domain/organization';