bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-15 07:43:16 +00:00
Code Issues Releases Wiki Activity

adjust paths to portal

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: e07526a1b6...700e945008

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

@@ -34,11 +34,11 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
private environmentService: EnvironmentService) { } private environmentService: EnvironmentService) { }
ngOnInit() { ngOnInit() {
this.enterpriseUrl = 'https://enterprise.bitwarden.com'; this.enterpriseUrl = 'https://portal.bitwarden.com';
if (this.environmentService.enterpriseUrl != null) { if (this.environmentService.enterpriseUrl != null) {
this.enterpriseUrl = this.environmentService.enterpriseUrl; this.enterpriseUrl = this.environmentService.enterpriseUrl;
} else if (this.environmentService.baseUrl != null) { } else if (this.environmentService.baseUrl != null) {
this.enterpriseUrl = this.environmentService.baseUrl + '/enterprise'; this.enterpriseUrl = this.environmentService.baseUrl + '/portal';
} }
document.body.classList.remove('layout_frontend'); document.body.classList.remove('layout_frontend');

2
src/app/services/services.module.ts
View File

@@ -141,7 +141,7 @@ export function initFactory(): Function {
environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' :
'https://enterprise.bitwarden.com'; // window.location.origin + '/enterprise'; 'https://portal.bitwarden.com'; // window.location.origin + '/portal';
} }
apiService.setUrls({ apiService.setUrls({
base: isDev ? null : window.location.origin, base: isDev ? null : window.location.origin,

6
src/app/settings/organization-plans.component.ts
View File

@@ -67,8 +67,10 @@ export class OrganizationPlansComponent implements OnInit {
} }
async ngOnInit() { async ngOnInit() {
const plans = await this.apiService.getPlans(); if (!this.selfHosted) {
this.plans = plans.data; const plans = await this.apiService.getPlans();
this.plans = plans.data;
}
this.loading = false; this.loading = false;
} }