mirror of
https://github.com/bitwarden/browser.git
synced 2024-10-29 07:59:42 +01:00
refresh token and UI when license updated
This commit is contained in:
parent
a18e7ab2da
commit
eb99fe58dd
@ -1,23 +1,30 @@
|
||||
import {
|
||||
Component,
|
||||
NgZone,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
} from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
|
||||
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
|
||||
|
||||
import { UserService } from 'jslib/abstractions/user.service';
|
||||
|
||||
import { Organization } from 'jslib/models/domain/organization';
|
||||
|
||||
const BroadcasterSubscriptionId = 'OrganizationLayoutComponent';
|
||||
|
||||
@Component({
|
||||
selector: 'app-organization-layout',
|
||||
templateUrl: 'organization-layout.component.html',
|
||||
})
|
||||
export class OrganizationLayoutComponent implements OnInit {
|
||||
export class OrganizationLayoutComponent implements OnInit, OnDestroy {
|
||||
organization: Organization;
|
||||
|
||||
private organizationId: string;
|
||||
|
||||
constructor(private route: ActivatedRoute, private userService: UserService) { }
|
||||
constructor(private route: ActivatedRoute, private userService: UserService,
|
||||
private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
|
||||
|
||||
ngOnInit() {
|
||||
document.body.classList.remove('layout_frontend');
|
||||
@ -25,6 +32,20 @@ export class OrganizationLayoutComponent implements OnInit {
|
||||
this.organizationId = params.organizationId;
|
||||
await this.load();
|
||||
});
|
||||
|
||||
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
|
||||
this.ngZone.run(async () => {
|
||||
switch (message.command) {
|
||||
case 'updatedOrgLicense':
|
||||
await this.load();
|
||||
break;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
|
||||
}
|
||||
|
||||
async load() {
|
||||
|
@ -14,6 +14,7 @@ import { OrganizationBillingResponse } from 'jslib/models/response/organizationB
|
||||
|
||||
import { ApiService } from 'jslib/abstractions/api.service';
|
||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||
import { MessagingService } from 'jslib/abstractions/messaging.service';
|
||||
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
|
||||
import { TokenService } from 'jslib/abstractions/token.service';
|
||||
|
||||
@ -48,7 +49,7 @@ export class OrganizationBillingComponent implements OnInit {
|
||||
constructor(private tokenService: TokenService, private apiService: ApiService,
|
||||
private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
|
||||
private analytics: Angulartics2, private toasterService: ToasterService,
|
||||
private route: ActivatedRoute) {
|
||||
private messagingService: MessagingService, private route: ActivatedRoute) {
|
||||
this.selfHosted = platformUtilsService.isSelfHost();
|
||||
}
|
||||
|
||||
@ -159,10 +160,11 @@ export class OrganizationBillingComponent implements OnInit {
|
||||
} catch { }
|
||||
}
|
||||
|
||||
closeUpdateLicense(load: boolean) {
|
||||
closeUpdateLicense(updated: boolean) {
|
||||
this.showUpdateLicense = false;
|
||||
if (load) {
|
||||
if (updated) {
|
||||
this.load();
|
||||
this.messagingService.send('updatedOrgLicense');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -38,12 +38,17 @@ export class UpdateLicenseComponent {
|
||||
const fd = new FormData();
|
||||
fd.append('license', files[0]);
|
||||
|
||||
let updatePromise: Promise<any> = null;
|
||||
if (this.organizationId == null) {
|
||||
this.formPromise = this.apiService.postAccountLicense(fd);
|
||||
updatePromise = this.apiService.postAccountLicense(fd);
|
||||
} else {
|
||||
this.formPromise = this.apiService.postOrganizationLicenseUpdate(this.organizationId, fd);
|
||||
updatePromise = this.apiService.postOrganizationLicenseUpdate(this.organizationId, fd);
|
||||
}
|
||||
|
||||
this.formPromise = updatePromise.then(() => {
|
||||
return this.apiService.refreshIdentityToken();
|
||||
});
|
||||
|
||||
await this.formPromise;
|
||||
this.analytics.eventTrack.next({ action: 'Updated License' });
|
||||
this.toasterService.popAsync('success', null, this.i18nService.t('updatedLicense'));
|
||||
|
Loading…
Reference in New Issue
Block a user