From acbb4cedd4c9b40f7392f6403641eda9aac74f7e Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 3 Dec 2021 10:08:04 +0100 Subject: [PATCH] chore: fix derpy merge conflicts Signed-off-by: blam --- plugins/auth-backend/src/providers/saml/provider.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts index f760c9e8ee..d0f7791aaa 100644 --- a/plugins/auth-backend/src/providers/saml/provider.ts +++ b/plugins/auth-backend/src/providers/saml/provider.ts @@ -36,13 +36,9 @@ import { import { postMessageResponse } from '../../lib/flow'; import { TokenIssuer } from '../../identity/types'; import { isError } from '@backstage/errors'; -<<<<<<< HEAD import { CatalogIdentityClient } from '../../lib/catalog'; import { Logger } from 'winston'; import { decorateWithIdentity } from '../decorateWithIdentity'; -======= -import { decorateWithIdentity } from '../decorateWithIdentity'; ->>>>>>> chore: reworking the auth providers to decorate the identity from the token that is returned from the different providers /** @public */ export type SamlAuthResult = { @@ -125,8 +121,6 @@ export class SamlAuthProvider implements AuthProviderRouteHandlers { response.backstageIdentity = decorateWithIdentity(signInResponse); } - - return postMessageResponse(res, this.appUrl, { type: 'authorization_response', response,