Merge branch '1.1.x' of github.com:janus-idp/backstage-showcase into …

…cherry-pick-1095-to-1.1.x
janus-idp · Mar 23, 2024 · b0a1c1a · b0a1c1a
2 parents ade22c1 + 8b31f5a
commit b0a1c1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/app/src/themes/componentOverrides.ts b/packages/app/src/themes/componentOverrides.ts
@@ -1,6 +1,6 @@
 import { UnifiedThemeOptions } from '@backstage/theme';
-import { defaultThemePalette } from './defaultThemePalette';
 import { ThemeColors } from '../types/types';
+import { defaultThemePalette } from './defaultThemePalette';
 
 const redhatFont = `@font-face {
   font-family: 'Red Hat Font';
@@ -18,6 +18,7 @@ export const components = (
 ): UnifiedThemeOptions['components'] => {
   const themePalette = defaultThemePalette(mode);
   return {
+    // @ts-expect-error - BackstageHeaderTabs is a custom component
     BackstageHeaderTabs: {
       styleOverrides: {
         tabsWrapper: {

diff --git a/plugins/auth-backend-module-oidc-provider/src/module.test.ts b/plugins/auth-backend-module-oidc-provider/src/module.test.ts
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-import request from 'supertest';
-import { decodeOAuthState } from '@backstage/plugin-auth-node';
-import { setupServer } from 'msw/node';
-import { rest } from 'msw';
 import {
   mockServices,
   setupRequestMockHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
+import { decodeOAuthState } from '@backstage/plugin-auth-node';
 import { Server } from 'http';
 import { JWK, SignJWT, exportJWK, generateKeyPair } from 'jose';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import request from 'supertest';
 import { authModuleOidcProvider } from './module';
 
 describe('authModuleOidcProvider', () => {
@@ -184,7 +184,7 @@ describe('authModuleOidcProvider', () => {
     });
     expect(nonceCookie).toBeDefined();
 
-    const startUrl = new URL(startResponse.get('location'));
+    const startUrl = new URL(startResponse.get('location') ?? '');
     expect(startUrl.origin).toBe('https://oidc.test');
     expect(startUrl.pathname).toBe('/oauth2/authorize');
     expect(Object.fromEntries(startUrl.searchParams)).toEqual({