fix(oidc): changes to fix build

changes to fix build after merging with latest develop

re Fallenbagel#184

server/utils/oidc.ts

@@ -5,7 +5,6 @@ import type {
   OidcTokenResponse,
 } from '@server/interfaces/api/oidcInterfaces';
 import { getSettings } from '@server/lib/settings';
-import axios from 'axios';
 import type { Request } from 'express';
 import * as yup from 'yup';
 
@@ -16,13 +15,11 @@ export async function getOIDCWellknownConfiguration(domain: string) {
     domain.replace(/\/$/, '') + '/.well-known/openid-configuration'
   ).toString();
 
-  const wellKnownInfo: OidcProviderMetadata = await axios
-    .get(wellKnownUrl, {
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    })
-    .then((r) => r.data);
+  const wellKnownInfo: OidcProviderMetadata = await fetch(wellKnownUrl, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  }).then((response) => response.json());
 
   return wellKnownInfo;
 }
@@ -68,24 +65,23 @@ export async function fetchOIDCTokenData(
   formData.append('client_id', oidc.clientId);
   formData.append('code', code);
 
-  return await axios
-    .post<OidcTokenResponse>(wellKnownInfo.token_endpoint, formData)
-    .then((r) => r.data);
+  return fetch(wellKnownInfo.token_endpoint, {
+    method: 'POST',
+    body: formData,
+  }).then((response) => response.json());
 }
 
 export async function getOIDCUserInfo(
   wellKnownInfo: OidcProviderMetadata,
   authToken: string
 ) {
-  const userInfo = await axios
-    .get(wellKnownInfo.userinfo_endpoint, {
-      headers: {
-        Authorization: `Bearer ${authToken}`,
-        Accept: 'application/json',
-      },
-    })
-    .then((r) => r.data);
-
+  const response = await fetch(wellKnownInfo.userinfo_endpoint, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+      Accept: 'application/json',
+    },
+  });
+  const userInfo = await response.json();
   return userInfo;
 }
 

src/components/Login/ErrorCallout.tsx

@@ -1,6 +1,5 @@
 import Alert from '@app/components/Common/Alert';
 import { Transition } from '@headlessui/react';
-import type React from 'react';
 
 interface LoginErrorProps {
   error: string;

src/components/Login/OidcLogin.tsx

@@ -3,7 +3,6 @@ import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import OIDCAuth from '@app/utils/oidc';
 import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
-import type React from 'react';
 import { useEffect } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 

src/utils/oidc.ts

@@ -1,26 +1,21 @@
 import PopupWindow from '@app/utils/popupWindow';
-import axios from 'axios';
 
 export async function processCallback(params: URLSearchParams) {
-  return await axios
-    .get('/api/v1/auth/oidc-callback', { params })
-    .then((r) => ({
+  return fetch(`/api/v1/auth/oidc-callback?${new URLSearchParams(params)}`)
+    .then((response) => {
+      if (!response.ok) {
+        throw new Error('Network response was not ok');
+      }
+      return response.json();
+    })
+    .then((data) => ({
       type: 'success',
-      message: r.data,
+      message: data,
     }))
-    .catch((e) => {
-      if (e.response && e.response.data && e.response.data.message) {
-        return {
-          type: 'error',
-          message: e.response.data.message,
-        };
-      } else {
-        return {
-          type: 'error',
-          message: e.message,
-        };
-      }
-    });
+    .catch((error) => ({
+      type: 'error',
+      message: error.message || 'An error occurred',
+    }));
 }
 
 class OIDCAuth extends PopupWindow {