adjust paths to portal

This commit is contained in:
Kyle Spearrin 2020-08-27 16:12:20 -04:00
parent e17a49acd5
commit fa11382c08
4 changed files with 8 additions and 6 deletions

2
jslib

@ -1 +1 @@
Subproject commit e07526a1b6cae520561e452a6695a1508d785585
Subproject commit 700e945008edb38543d619e9dd4543908c057f5c

View File

@ -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');

View File

@ -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,

View File

@ -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;
}