Browse Source

Finalize implementation

pull/1967/head
Thomas 2 years ago
parent
commit
525b8e908c
  1. 23
      apps/api/src/app/info/info.service.ts
  2. 1
      apps/client/src/app/core/auth.guard.ts

23
apps/api/src/app/info/info.service.ts

@ -116,19 +116,28 @@ export class InfoService {
globalPermissions.push(permissions.createUserAccount); globalPermissions.push(permissions.createUserAccount);
} }
const [benchmarks, demoAuthToken, statistics, subscriptions, tags] =
await Promise.all([
this.benchmarkService.getBenchmarkAssetProfiles(),
this.getDemoAuthToken(),
this.getStatistics(),
this.getSubscriptions(),
this.tagService.get()
]);
return { return {
...info, ...info,
benchmarks,
demoAuthToken,
globalPermissions, globalPermissions,
isReadOnlyMode, isReadOnlyMode,
platforms, platforms,
statistics,
subscriptions,
systemMessage, systemMessage,
tags,
baseCurrency: this.configurationService.get('BASE_CURRENCY'), baseCurrency: this.configurationService.get('BASE_CURRENCY'),
benchmarks: await this.benchmarkService.getBenchmarkAssetProfiles(), currencies: this.exchangeRateDataService.getCurrencies()
currencies: this.exchangeRateDataService.getCurrencies(),
demoAuthToken: await this.getDemoAuthToken(),
statistics: await this.getStatistics(),
subscriptions: await this.getSubscriptions(),
tags: await this.tagService.get()
}; };
} }
@ -335,7 +344,7 @@ export class InfoService {
)) as string; )) as string;
const get = bent( const get = bent(
`https://betteruptime.com/api/v2/${monitorId}/398104/sla`, `https://betteruptime.com/api/v2/monitors/${monitorId}/sla`,
'GET', 'GET',
'json', 'json',
200, 200,

1
apps/client/src/app/core/auth.guard.ts

@ -24,6 +24,7 @@ export class AuthGuard implements CanActivate {
'/faq', '/faq',
'/features', '/features',
'/markets', '/markets',
'/open',
'/p', '/p',
'/pricing', '/pricing',
'/register', '/register',

Loading…
Cancel
Save