Browse Source

chore: change tenancy name placeholder

pull/4956/head
mehmet-erim 6 years ago
parent
commit
5ba15323c2
  1. 14
      npm/ng-packs/packages/core/src/lib/tests/multi-tenancy-utils.spec.ts
  2. 2
      npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

14
npm/ng-packs/packages/core/src/lib/tests/multi-tenancy-utils.spec.ts

@ -12,12 +12,12 @@ const environment = {
production: false, production: false,
hmr: false, hmr: false,
application: { application: {
baseUrl: 'https://{TENANCY_NAME}.volosoft.com', baseUrl: 'https://{0}.volosoft.com',
name: 'MyProjectName', name: 'MyProjectName',
logoUrl: '', logoUrl: '',
}, },
oAuthConfig: { oAuthConfig: {
issuer: 'https://{TENANCY_NAME}.api.volosoft.com', issuer: 'https://{0}.api.volosoft.com',
clientId: 'MyProjectName_App', clientId: 'MyProjectName_App',
dummyClientSecret: '1q2w3e*', dummyClientSecret: '1q2w3e*',
scope: 'MyProjectName', scope: 'MyProjectName',
@ -26,10 +26,10 @@ const environment = {
}, },
apis: { apis: {
default: { default: {
url: 'https://{TENANCY_NAME}.api.volosoft.com', url: 'https://{0}.api.volosoft.com',
}, },
abp: { abp: {
url: 'https://api.volosoft.com/{TENANCY_NAME}', url: 'https://api.volosoft.com/{0}',
}, },
}, },
}; };
@ -62,13 +62,13 @@ describe('MultiTenancyUtils', () => {
describe('#getCurrentTenancyNameOrNull', () => { describe('#getCurrentTenancyNameOrNull', () => {
test('should get tenancy name from href', async () => { test('should get tenancy name from href', async () => {
setHref('https://abp.volosoft.com/'); setHref('https://abp.volosoft.com/');
expect(getCurrentTenancyNameOrNull('https://{TENANCY_NAME}.volosoft.com')).toBe('abp'); expect(getCurrentTenancyNameOrNull('https://{0}.volosoft.com')).toBe('abp');
setHref('https://volosoft.com/'); setHref('https://volosoft.com/');
expect(getCurrentTenancyNameOrNull('https://{TENANCY_NAME}.com')).toBe('volosoft'); expect(getCurrentTenancyNameOrNull('https://{0}.com')).toBe('volosoft');
setHref('https://volosoft.com/abp/'); setHref('https://volosoft.com/abp/');
expect(getCurrentTenancyNameOrNull('https://volosoft.com/{TENANCY_NAME}')).toBe('abp'); expect(getCurrentTenancyNameOrNull('https://volosoft.com/{0}')).toBe('abp');
}); });
}); });

2
npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

@ -7,7 +7,7 @@ import { MultiTenancyService } from '../services/multi-tenancy.service';
import { ConfigState } from '../states/config.state'; import { ConfigState } from '../states/config.state';
import { FormattedStringValueExtractor } from './formatted-string-value-extractor'; import { FormattedStringValueExtractor } from './formatted-string-value-extractor';
const tenancyPlaceholder = '{TENANCY_NAME}'; const tenancyPlaceholder = '{0}';
export function getCurrentTenancyNameOrNull(appBaseUrl: string): string { export function getCurrentTenancyNameOrNull(appBaseUrl: string): string {
if (appBaseUrl.indexOf(tenancyPlaceholder) < 0) return null; if (appBaseUrl.indexOf(tenancyPlaceholder) < 0) return null;

Loading…
Cancel
Save