From 5d5c9bfb4c8b0f4002c07ffd0e28baaa814f2fed Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 4 Feb 2022 13:11:10 +0100
Subject: [PATCH] auth-backend: removed cookieConfigurer from router options

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/metal-lions-fix.md              | 2 +-
 plugins/auth-backend/api-report.md         | 2 --
 plugins/auth-backend/src/service/router.ts | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.changeset/metal-lions-fix.md b/.changeset/metal-lions-fix.md
index 5d35d3d0d3..913098bbf7 100644
--- a/.changeset/metal-lions-fix.md
+++ b/.changeset/metal-lions-fix.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-auth-backend': patch
 ---
 
-Added a new `cookieConfigurer` option to `createRouter` that makes it possible to override the default logic for configuring OAuth provider cookies.
+Added a new `cookieConfigurer` option to `AuthProviderConfig` that makes it possible to override the default logic for configuring OAuth provider cookies.
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index ddbef77766..aaacd05815 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -676,8 +676,6 @@ export interface RouterOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  cookieConfigurer?: CookieConfigurer;
-  // (undocumented)
   database: PluginDatabaseManager;
   // (undocumented)
   discovery: PluginEndpointDiscovery;
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index 101deb9350..ec1a52ffc9 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -34,7 +34,6 @@ import { createOidcRouter, TokenFactory, KeyStores } from '../identity';
 import session from 'express-session';
 import passport from 'passport';
 import { Minimatch } from 'minimatch';
-import { CookieConfigurer } from '../providers/types';
 
 type ProviderFactories = { [s: string]: AuthProviderFactory };
 
@@ -45,7 +44,6 @@ export interface RouterOptions {
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
   providerFactories?: ProviderFactories;
-  cookieConfigurer?: CookieConfigurer;
 }
 
 export async function createRouter(
@@ -58,7 +56,6 @@ export async function createRouter(
     database,
     tokenManager,
     providerFactories,
-    cookieConfigurer,
   } = options;
   const router = Router();
 
@@ -118,7 +115,6 @@ export async function createRouter(
             baseUrl: authUrl,
             appUrl,
             isOriginAllowed,
-            cookieConfigurer,
           },
           config: providersConfig.getConfig(providerId),
           logger,