diff --git a/jslib b/jslib index e07526a1..700e9450 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit e07526a1b6cae520561e452a6695a1508d785585 +Subproject commit 700e945008edb38543d619e9dd4543908c057f5c diff --git a/src/app/layouts/organization-layout.component.ts b/src/app/layouts/organization-layout.component.ts index 9410d394..5c3e36a2 100644 --- a/src/app/layouts/organization-layout.component.ts +++ b/src/app/layouts/organization-layout.component.ts @@ -34,11 +34,11 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy { private environmentService: EnvironmentService) { } ngOnInit() { - this.enterpriseUrl = 'https://enterprise.bitwarden.com'; + this.enterpriseUrl = 'https://portal.bitwarden.com'; if (this.environmentService.enterpriseUrl != null) { this.enterpriseUrl = this.environmentService.enterpriseUrl; } else if (this.environmentService.baseUrl != null) { - this.enterpriseUrl = this.environmentService.baseUrl + '/enterprise'; + this.enterpriseUrl = this.environmentService.baseUrl + '/portal'; } document.body.classList.remove('layout_frontend'); diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index 49a21622..dc4290f1 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -141,7 +141,7 @@ export function initFactory(): Function { environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : - 'https://enterprise.bitwarden.com'; // window.location.origin + '/enterprise'; + 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; } apiService.setUrls({ base: isDev ? null : window.location.origin, diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts index cfe7c7ec..fd6e3889 100644 --- a/src/app/settings/organization-plans.component.ts +++ b/src/app/settings/organization-plans.component.ts @@ -67,8 +67,10 @@ export class OrganizationPlansComponent implements OnInit { } async ngOnInit() { - const plans = await this.apiService.getPlans(); - this.plans = plans.data; + if (!this.selfHosted) { + const plans = await this.apiService.getPlans(); + this.plans = plans.data; + } this.loading = false; }