Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-6713 load licenses in if logged in guard

Browse Source
This commit is contained in:
Dan Percic 2023-07-06 17:38:07 +03:00
parent a39451dd8d
commit 0d109b0066
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/guards/if-logged-in.guard.ts
View File

@ -4,6 +4,7 @@ import { NGXLogger } from 'ngx-logger';
import { keycloakInitializer, KeycloakStatusService, TenantsService } from '@iqser/common-ui/lib/tenants';
import { KeycloakService } from 'keycloak-angular';
import { UserService } from '@users/user.service';
import { LicenseService } from '@services/license.service';
export function ifLoggedIn(): CanActivateFn {
return async (route: ActivatedRouteSnapshot) => {
@ -13,6 +14,7 @@ export function ifLoggedIn(): CanActivateFn {
const tenantsService = inject(TenantsService);
const keycloakService = inject(KeycloakService);
const usersService = inject(UserService);
const licenseService = inject(LicenseService);
const keycloakStatusService = inject(KeycloakStatusService);
const keycloakInstance = keycloakService.getKeycloakInstance();
@ -31,6 +33,7 @@ export function ifLoggedIn(): CanActivateFn {
logger.info('[KEYCLOAK] Keycloak init done!');
await tenantsService.selectTenant(tenant);
await usersService.initialize();
await licenseService.loadLicenses();
}
const isLoggedIn = await keycloakService.isLoggedIn();

9
apps/red-ui/src/app/utils/main.resolver.ts
View File

@ -4,7 +4,6 @@ import { ConfigService } from '@services/config.service';
import { UserService } from '@users/user.service';
import { SystemPreferencesService } from '@services/system-preferences.service';
import { UserPreferenceService } from '@users/user-preference.service';
import { LicenseService } from '@services/license.service';
import { IqserPermissionsService, LoadingService } from '@iqser/common-ui';
import { FeaturesService } from '@services/features.service';
import { GeneralSettingsService } from '@services/general-settings.service';
@ -35,7 +34,6 @@ export const mainResolver: ResolveFn<void> = async () => {
const systemPreferencesService = inject(SystemPreferencesService);
const userPreferenceService = inject(UserPreferenceService);
const tenantsService = inject(TenantsService);
const licenseService = inject(LicenseService);
const loadingService = inject(LoadingService);
const configService = inject(ConfigService);
const userService = inject(UserService);
@ -44,12 +42,7 @@ export const mainResolver: ResolveFn<void> = async () => {
const generalConfig$ = inject(GeneralSettingsService).getGeneralConfigurations();
const updatedDisplayName$ = generalConfig$.pipe(tap(config => configService.updateDisplayName(config.displayName)));
await Promise.all([
systemPreferencesService.loadPreferences(),
userPreferenceService.reload(),
firstValueFrom(updatedDisplayName$),
licenseService.loadLicenses(),
]);
await Promise.all([systemPreferencesService.loadPreferences(), userPreferenceService.reload(), firstValueFrom(updatedDisplayName$)]);
const lastDossierTemplate = userPreferenceService.getLastDossierTemplate();