From 08a4b73a3a963be526f511c811edf20145f57bee Mon Sep 17 00:00:00 2001 From: markuczy Date: Tue, 19 Mar 2024 09:38:46 +0100 Subject: [PATCH] fix: IAuthService moved --- libs/angular-accelerator/src/index.ts | 1 - .../angular-accelerator/src/lib/mock-auth/mock-auth.service.ts | 2 +- libs/angular-integration-interface/src/index.ts | 1 + .../src/lib/api/iauth.service.ts | 0 libs/keycloak-auth/src/lib/keycloak-auth.service.ts | 3 +-- libs/keycloak-auth/src/lib/token.interceptor.ts | 3 +-- .../core/components/inline-profile/inline-profile.component.ts | 3 +-- .../src/lib/core/components/portal-header/header.component.ts | 2 +- .../src/lib/core/initializer/standalone.initializer.ts | 2 +- .../src/lib/mock-auth/mock-auth.service.ts | 2 +- 10 files changed, 8 insertions(+), 11 deletions(-) rename libs/{angular-accelerator => angular-integration-interface}/src/lib/api/iauth.service.ts (100%) diff --git a/libs/angular-accelerator/src/index.ts b/libs/angular-accelerator/src/index.ts index ed365f1a..de772a6a 100644 --- a/libs/angular-accelerator/src/index.ts +++ b/libs/angular-accelerator/src/index.ts @@ -37,7 +37,6 @@ export * from './lib/model/diagram-type' export * from './lib/model/search-config-info' // core -export * from './lib/api/iauth.service' export * from './lib/angular-accelerator.module' export * from './lib/angular-accelerator-primeng.module' diff --git a/libs/angular-accelerator/src/lib/mock-auth/mock-auth.service.ts b/libs/angular-accelerator/src/lib/mock-auth/mock-auth.service.ts index 4454b40f..e87814f3 100644 --- a/libs/angular-accelerator/src/lib/mock-auth/mock-auth.service.ts +++ b/libs/angular-accelerator/src/lib/mock-auth/mock-auth.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { BehaviorSubject } from 'rxjs' import { UserProfile } from '@onecx/integration-interface' -import { IAuthService } from '../api/iauth.service' +import { IAuthService } from '@onecx/angular-integration-interface' @Injectable() export class MockAuthService implements IAuthService { diff --git a/libs/angular-integration-interface/src/index.ts b/libs/angular-integration-interface/src/index.ts index ca03a98c..a1c7915b 100644 --- a/libs/angular-integration-interface/src/index.ts +++ b/libs/angular-integration-interface/src/index.ts @@ -9,6 +9,7 @@ export * from './lib/services/theme.service' export * from './lib/model/config-key.model' // core +export * from './lib/api/iauth.service' export * from './lib/api/injection-tokens' // utils diff --git a/libs/angular-accelerator/src/lib/api/iauth.service.ts b/libs/angular-integration-interface/src/lib/api/iauth.service.ts similarity index 100% rename from libs/angular-accelerator/src/lib/api/iauth.service.ts rename to libs/angular-integration-interface/src/lib/api/iauth.service.ts diff --git a/libs/keycloak-auth/src/lib/keycloak-auth.service.ts b/libs/keycloak-auth/src/lib/keycloak-auth.service.ts index 8fe26823..7b887cfa 100644 --- a/libs/keycloak-auth/src/lib/keycloak-auth.service.ts +++ b/libs/keycloak-auth/src/lib/keycloak-auth.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core' -import { IAuthService } from '@onecx/angular-accelerator' -import { AppStateService, ConfigurationService, CONFIG_KEY } from '@onecx/angular-integration-interface' +import { AppStateService, ConfigurationService, CONFIG_KEY, IAuthService } from '@onecx/angular-integration-interface' import { KeycloakEventType, KeycloakOptions, KeycloakService } from 'keycloak-angular' import { KeycloakConfig } from 'keycloak-js' diff --git a/libs/keycloak-auth/src/lib/token.interceptor.ts b/libs/keycloak-auth/src/lib/token.interceptor.ts index ed23b6da..0033e80e 100644 --- a/libs/keycloak-auth/src/lib/token.interceptor.ts +++ b/libs/keycloak-auth/src/lib/token.interceptor.ts @@ -1,7 +1,6 @@ import { Inject, Injectable, Optional } from '@angular/core' import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http' -import { AUTH_SERVICE } from '@onecx/angular-integration-interface' -import { IAuthService } from '@onecx/angular-accelerator' +import { AUTH_SERVICE, IAuthService } from '@onecx/angular-integration-interface' import { Observable } from 'rxjs' import { KeycloakAuthModuleConfig } from './keycloak-auth.module' import { KEYCLOAK_AUTH_CONFIG } from './keycloak-injection-token' diff --git a/libs/portal-integration-angular/src/lib/core/components/inline-profile/inline-profile.component.ts b/libs/portal-integration-angular/src/lib/core/components/inline-profile/inline-profile.component.ts index 93da5d9b..870bd51d 100644 --- a/libs/portal-integration-angular/src/lib/core/components/inline-profile/inline-profile.component.ts +++ b/libs/portal-integration-angular/src/lib/core/components/inline-profile/inline-profile.component.ts @@ -3,8 +3,7 @@ import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy' import { map, Observable } from 'rxjs' import { MenuItem } from 'primeng/api' -import { IAuthService } from '@onecx/angular-accelerator' -import { UserService, AUTH_SERVICE } from '@onecx/angular-integration-interface' +import { UserService, AUTH_SERVICE, IAuthService } from '@onecx/angular-integration-interface' import { MenuService } from '../../../services/app.menu.service' import { UserProfile } from '../../../model/user-profile.model' diff --git a/libs/portal-integration-angular/src/lib/core/components/portal-header/header.component.ts b/libs/portal-integration-angular/src/lib/core/components/portal-header/header.component.ts index eb83c410..0ff067b2 100644 --- a/libs/portal-integration-angular/src/lib/core/components/portal-header/header.component.ts +++ b/libs/portal-integration-angular/src/lib/core/components/portal-header/header.component.ts @@ -12,9 +12,9 @@ import { AUTH_SERVICE, ConfigurationService, CONFIG_KEY, + IAuthService, } from '@onecx/angular-integration-interface' -import { IAuthService } from '@onecx/angular-accelerator' import { UserProfile } from '../../../model/user-profile.model' import { MenuService } from '../../../services/app.menu.service' import { ImageLogoUrlUtils } from '../../utils/image-logo-url.utils' diff --git a/libs/portal-integration-angular/src/lib/core/initializer/standalone.initializer.ts b/libs/portal-integration-angular/src/lib/core/initializer/standalone.initializer.ts index 3ca29bd4..972d8911 100644 --- a/libs/portal-integration-angular/src/lib/core/initializer/standalone.initializer.ts +++ b/libs/portal-integration-angular/src/lib/core/initializer/standalone.initializer.ts @@ -1,11 +1,11 @@ import { firstValueFrom } from 'rxjs' -import { IAuthService } from '@onecx/angular-accelerator' import { AppStateService, UserService, ThemeService, ConfigurationService, CONFIG_KEY, + IAuthService, } from '@onecx/angular-integration-interface' import { MfeInfo } from '@onecx/integration-interface' import { PortalApiService } from '../../services/portal-api.service' diff --git a/libs/portal-integration-angular/src/lib/mock-auth/mock-auth.service.ts b/libs/portal-integration-angular/src/lib/mock-auth/mock-auth.service.ts index 11b375be..9e51ec13 100644 --- a/libs/portal-integration-angular/src/lib/mock-auth/mock-auth.service.ts +++ b/libs/portal-integration-angular/src/lib/mock-auth/mock-auth.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core' import { BehaviorSubject } from 'rxjs' -import { IAuthService } from '@onecx/angular-accelerator' +import { IAuthService } from '@onecx/angular-integration-interface' import { UserProfile } from '../model/user-profile.model' @Injectable()