diff --git a/src/index.ts b/src/index.ts index 9d7c8c2..d6bd5ca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,3 @@ -export * from './lib/common-ui.module'; export * from './lib/buttons'; export * from './lib/dialog'; export * from './lib/form'; @@ -6,7 +5,6 @@ export * from './lib/listing'; export * from './lib/help-mode'; export * from './lib/inputs'; export * from './lib/services'; -export * from './lib/shared'; export * from './lib/loading'; export * from './lib/error'; export * from './lib/search'; @@ -17,4 +15,3 @@ export * from './lib/translations'; export * from './lib/pipes'; export * from './lib/permissions'; export * from './lib/directives'; -export * from './lib/tenants'; diff --git a/src/lib/filtering/filter.service.ts b/src/lib/filtering/filter.service.ts index dd055c4..f5c4f80 100644 --- a/src/lib/filtering/filter.service.ts +++ b/src/lib/filtering/filter.service.ts @@ -11,12 +11,11 @@ import { IFilter } from './models/filter.model'; @Injectable() export class FilterService { - readonly showResetFilters$: Observable; - readonly filterGroups$: Observable; - readonly #singleFilters = new Map>(); readonly #filterGroups$ = new BehaviorSubject([]); readonly #refresh$ = new Subject(); + readonly showResetFilters$: Observable; + readonly filterGroups$: Observable; constructor() { this.filterGroups$ = this.#refresh$.pipe( diff --git a/src/lib/tenants/guards/if-not-logged-in.guard.ts b/src/lib/tenants/guards/if-not-logged-in.guard.ts deleted file mode 100644 index 87eed68..0000000 --- a/src/lib/tenants/guards/if-not-logged-in.guard.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router'; -import { inject } from '@angular/core'; -import { NGXLogger } from 'ngx-logger'; -import { KeycloakService } from 'keycloak-angular'; - -export const ifNotLoggedIn: CanActivateFn = async (route: ActivatedRouteSnapshot) => { - const logger = inject(NGXLogger); - const router = inject(Router); - const keycloakService = inject(KeycloakService); - - const isLoggedIn = await keycloakService.isLoggedIn(); - - if (!isLoggedIn) { - logger.info('[ROUTES] Not logged in, continuing to selected route'); - return true; - } - - const tenant = route.paramMap.get('tenant') || keycloakService.getKeycloakInstance().realm; - if (!tenant) { - logger.error('[ROUTES] Tenant not found in route or keycloak realm'); - return false; - } - - logger.warn('[ROUTES] Is logged in for ' + tenant + ', redirecting to /' + tenant); - await router.navigate([tenant]); - return false; -}; diff --git a/src/lib/tenants/index.ts b/src/lib/tenants/index.ts index 501911d..592eca8 100644 --- a/src/lib/tenants/index.ts +++ b/src/lib/tenants/index.ts @@ -1,5 +1,4 @@ export * from './keycloak-initializer'; -export * from './guards/if-not-logged-in.guard'; export * from './services'; export * from './tenant.pipe'; export * from './tenants.module';