From e9857d0b82c36b2b0d58d842e165406dd32ee447 Mon Sep 17 00:00:00 2001 From: Joe Porpeglia Date: Tue, 11 Jan 2022 16:19:10 -0500 Subject: [PATCH] Remove 403 handling logic Signed-off-by: Joe Porpeglia --- .../src/service/CachedEntityLoader.test.ts | 12 ------------ .../src/service/CachedEntityLoader.ts | 11 +---------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts b/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts index 58d7d03761..1b8944fb87 100644 --- a/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts +++ b/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts @@ -107,18 +107,6 @@ describe('CachedEntityLoader', () => { expect(cache.set).not.toBeCalled(); }); - it('transforms 403 responses from catalog to undefined', async () => { - identity.authenticate.mockResolvedValue(identityResponse); - cache.get.mockResolvedValue(undefined); - catalog.getEntityByName.mockRejectedValue( - await ResponseError.fromResponse(new Response(null, { status: 403 })), - ); - - const result = await loader.load(entityName, token); - - expect(result).toBeUndefined(); - }); - it('uses entity ref as cache key for anonymous users', async () => { cache.get.mockResolvedValue(undefined); catalog.getEntityByName.mockResolvedValue(entity); diff --git a/plugins/techdocs-backend/src/service/CachedEntityLoader.ts b/plugins/techdocs-backend/src/service/CachedEntityLoader.ts index b65f51b4ab..9dd04968ee 100644 --- a/plugins/techdocs-backend/src/service/CachedEntityLoader.ts +++ b/plugins/techdocs-backend/src/service/CachedEntityLoader.ts @@ -21,7 +21,6 @@ import { stringifyEntityRef, } from '@backstage/catalog-model'; import { IdentityClient } from '@backstage/plugin-auth-backend'; -import { ResponseError } from '@backstage/errors'; export type CachedEntityLoaderOptions = { catalog: CatalogClient; @@ -52,15 +51,7 @@ export class CachedEntityLoader { return result; } - try { - result = await this.catalog.getEntityByName(entityName, { token }); - } catch (err) { - if (err instanceof ResponseError && err.response.status === 403) { - result = undefined; - } else { - throw err; - } - } + result = await this.catalog.getEntityByName(entityName, { token }); if (result) { this.cache.set(cacheKey, result, { ttl: 5000 });