fix: rename the Internal token handler

Signed-off-by: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
This commit is contained in:
Juan Pablo Garcia Ripa
2025-09-06 19:11:23 +02:00
parent 95396a44f9
commit 6361c0c00f
4 changed files with 14 additions and 14 deletions
@@ -25,7 +25,7 @@ import {
import { AuthenticationError } from '@backstage/errors';
import { JsonObject } from '@backstage/types';
import { decodeJwt } from 'jose';
import { ExternalAuthTokenManager } from './external/export class ExternalAuthTokenManager {';
import { ExternalAuthTokenHandler } from './external/ExternalAuthTokenHandler';
import {
createCredentialsWithNonePrincipal,
createCredentialsWithServicePrincipal,
@@ -41,7 +41,7 @@ export class DefaultAuthService implements AuthService {
constructor(
private readonly userTokenHandler: UserTokenHandler,
private readonly pluginTokenHandler: PluginTokenHandler,
private readonly externalTokenHandler: ExternalAuthTokenManager,
private readonly externalTokenHandler: ExternalAuthTokenHandler,
private readonly pluginId: string,
private readonly disableDefaultAuthPolicy: boolean,
private readonly pluginKeySource: PluginKeySource,
@@ -21,7 +21,7 @@ import {
} from '@backstage/backend-plugin-api';
import { DefaultAuthService } from './DefaultAuthService';
import {
ExternalAuthTokenManager,
ExternalAuthTokenHandler,
externalTokenTypeHandlersRef,
} from './external/ExternalAuthTokenHandler';
import {
@@ -107,7 +107,7 @@ export const authServiceFactory = createServiceFactory({
}),
);
const externalTokens = ExternalAuthTokenManager.create({
const externalTokens = ExternalAuthTokenHandler.create({
ownPluginId: plugin.getId(),
config,
logger,
@@ -15,7 +15,7 @@
*/
import { BackstagePrincipalAccessRestrictions } from '@backstage/backend-plugin-api';
import { ExternalAuthTokenManager } from './ExternalAuthTokenHandler';
import { ExternalAuthTokenHandler } from './ExternalAuthTokenHandler';
import { createExternalTokenHandler } from './helpers';
import { AccessRestrictionsMap, ExternalTokenHandler } from './types';
import {
@@ -108,7 +108,7 @@ describe('ExternalTokenHandler', () => {
}),
);
const plugin1 = new ExternalAuthTokenManager('plugin1', [
const plugin1 = new ExternalAuthTokenHandler('plugin1', [
{
context: undefined,
handler: handler1,
@@ -119,7 +119,7 @@ describe('ExternalTokenHandler', () => {
allAccessRestrictions: accessRestrictions,
},
]);
const plugin2 = new ExternalAuthTokenManager('plugin2', [
const plugin2 = new ExternalAuthTokenHandler('plugin2', [
{
context: undefined,
handler: handler1,
@@ -160,7 +160,7 @@ describe('ExternalTokenHandler', () => {
),
);
const handler = ExternalAuthTokenManager.create({
const handler = ExternalAuthTokenHandler.create({
ownPluginId: 'catalog',
logger: mockServices.logger.mock(),
config: mockServices.rootConfig({
@@ -252,7 +252,7 @@ describe('ExternalTokenHandler', () => {
const verifyMock = jest.fn().mockResolvedValue({});
const initializeMock = jest.fn().mockReturnValue({ context: 'a' });
const handler = ExternalAuthTokenManager.create({
const handler = ExternalAuthTokenHandler.create({
ownPluginId: 'catalog',
logger: mockServices.logger.mock(),
config: mockServices.rootConfig({
@@ -305,7 +305,7 @@ describe('ExternalTokenHandler', () => {
});
it('should fail if config contains types not declared', async () => {
const createHandler = () =>
ExternalAuthTokenManager.create({
ExternalAuthTokenHandler.create({
ownPluginId: 'catalog',
logger: mockServices.logger.mock(),
config: mockServices.rootConfig({
@@ -338,7 +338,7 @@ describe('ExternalTokenHandler', () => {
it('should show valid custom types in errors', async () => {
const createHandler = () =>
ExternalAuthTokenManager.create({
ExternalAuthTokenHandler.create({
ownPluginId: 'catalog',
logger: mockServices.logger.mock(),
config: mockServices.rootConfig({
@@ -60,13 +60,13 @@ type ContextMapEntry<T> = {
*
* @internal
*/
export class ExternalAuthTokenManager {
export class ExternalAuthTokenHandler {
static create(options: {
ownPluginId: string;
config: RootConfigService;
logger: LoggerService;
externalTokenHandlers?: ExternalTokenHandler<unknown>[];
}): ExternalAuthTokenManager {
}): ExternalAuthTokenHandler {
const {
ownPluginId,
config,
@@ -110,7 +110,7 @@ export class ExternalAuthTokenManager {
);
}
return new ExternalAuthTokenManager(ownPluginId, contexts);
return new ExternalAuthTokenHandler(ownPluginId, contexts);
}
constructor(