From 80a3df73fcced39c7625d8b0ddb003b322028022 Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Fri, 16 Aug 2024 15:48:59 +0200 Subject: [PATCH] Remove config Dependency Signed-off-by: Johan Haals --- plugins/auth-backend/api-report.md | 3 ++- plugins/auth-backend/package.json | 1 - plugins/auth-backend/src/service/router.ts | 4 ++-- yarn.lock | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md index 29086cf86b..f801c92597 100644 --- a/plugins/auth-backend/api-report.md +++ b/plugins/auth-backend/api-report.md @@ -37,6 +37,7 @@ import { OidcAuthResult as OidcAuthResult_2 } from '@backstage/plugin-auth-backe import { prepareBackstageIdentityResponse as prepareBackstageIdentityResponse_2 } from '@backstage/plugin-auth-node'; import { Profile } from 'passport'; import { ProfileInfo as ProfileInfo_2 } from '@backstage/plugin-auth-node'; +import { RootConfigService } from '@backstage/backend-plugin-api'; import { SignInInfo as SignInInfo_2 } from '@backstage/plugin-auth-node'; import { SignInResolver as SignInResolver_2 } from '@backstage/plugin-auth-node'; import { TokenManager } from '@backstage/backend-common'; @@ -654,7 +655,7 @@ export interface RouterOptions { // (undocumented) catalogApi?: CatalogApi; // (undocumented) - config: Config; + config: RootConfigService; // (undocumented) database: DatabaseService; // (undocumented) diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json index 9c7b205352..7402e0d242 100644 --- a/plugins/auth-backend/package.json +++ b/plugins/auth-backend/package.json @@ -47,7 +47,6 @@ "@backstage/backend-plugin-api": "workspace:^", "@backstage/catalog-client": "workspace:^", "@backstage/catalog-model": "workspace:^", - "@backstage/config": "workspace:^", "@backstage/errors": "workspace:^", "@backstage/plugin-auth-backend-module-atlassian-provider": "workspace:^", "@backstage/plugin-auth-backend-module-aws-alb-provider": "workspace:^", diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts index 033f9f8d21..b954eb4dbb 100644 --- a/plugins/auth-backend/src/service/router.ts +++ b/plugins/auth-backend/src/service/router.ts @@ -23,6 +23,7 @@ import { DiscoveryService, HttpAuthService, LoggerService, + RootConfigService, TokenManagerService, } from '@backstage/backend-plugin-api'; import { defaultAuthProviderFactories } from '../providers'; @@ -44,7 +45,6 @@ import { readBackstageTokenExpiration } from './readBackstageTokenExpiration'; import { TokenIssuer } from '../identity/types'; import { StaticTokenIssuer } from '../identity/StaticTokenIssuer'; import { StaticKeyStore } from '../identity/StaticKeyStore'; -import { Config } from '@backstage/config'; import { bindProviderRouters, ProviderFactories } from '../providers/router'; /** @@ -54,7 +54,7 @@ import { bindProviderRouters, ProviderFactories } from '../providers/router'; export interface RouterOptions { logger: LoggerService; database: DatabaseService; - config: Config; + config: RootConfigService; discovery: DiscoveryService; tokenManager: TokenManagerService; auth?: AuthService; diff --git a/yarn.lock b/yarn.lock index 301d7de22f..8956a0159e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5146,7 +5146,6 @@ __metadata: "@backstage/catalog-client": "workspace:^" "@backstage/catalog-model": "workspace:^" "@backstage/cli": "workspace:^" - "@backstage/config": "workspace:^" "@backstage/errors": "workspace:^" "@backstage/plugin-auth-backend-module-atlassian-provider": "workspace:^" "@backstage/plugin-auth-backend-module-aws-alb-provider": "workspace:^"