strapi-plugin-oidc 1.0.7 → 1.0.8

package/dist/server/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const axios = require("axios");
 const node_crypto = require("node:crypto");
 const pkceChallenge = require("pkce-challenge");
 const strapiUtils = require("@strapi/utils");
 const generator = require("generate-password");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const axios__default = /* @__PURE__ */ _interopDefault(axios);
 const pkceChallenge__default = /* @__PURE__ */ _interopDefault(pkceChallenge);
 const strapiUtils__default = /* @__PURE__ */ _interopDefault(strapiUtils);
 const generator__default = /* @__PURE__ */ _interopDefault(generator);
@@ -163,23 +161,40 @@ async function oidcSignIn(ctx) {
   ctx.set("Location", authorizationUrl);
   return ctx.send({}, 302);
 }
-async function exchangeTokenAndFetchUserInfo(httpClient, config2, params) {
-  const response = await httpClient.post(config2.OIDC_TOKEN_ENDPOINT, params, {
+async function exchangeTokenAndFetchUserInfo(config2, params) {
+  const response = await fetch(config2.OIDC_TOKEN_ENDPOINT, {
+    method: "POST",
+    body: params,
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
     }
   });
+  if (!response.ok) {
+    const errText = await response.text();
+    throw new Error(
+      `Failed to exchange token: ${response.status} ${response.statusText} - ${errText}`
+    );
+  }
+  const tokenData = await response.json();
   let userInfoEndpointHeaders = {};
-  let userInfoEndpointParameters = `?access_token=${response.data.access_token}`;
+  let userInfoEndpointParameters = `?access_token=${tokenData.access_token}`;
   if (config2.OIDC_USER_INFO_ENDPOINT_WITH_AUTH_HEADER) {
     userInfoEndpointHeaders = {
-      headers: { Authorization: `Bearer ${response.data.access_token}` }
+      Authorization: `Bearer ${tokenData.access_token}`
     };
     userInfoEndpointParameters = "";
   }
   const userInfoEndpoint = `${config2.OIDC_USER_INFO_ENDPOINT}${userInfoEndpointParameters}`;
-  const userResponse = await httpClient.get(userInfoEndpoint, userInfoEndpointHeaders);
-  return userResponse.data;
+  const userResponse = await fetch(userInfoEndpoint, {
+    headers: userInfoEndpointHeaders
+  });
+  if (!userResponse.ok) {
+    const errText = await userResponse.text();
+    throw new Error(
+      `Failed to fetch user info: ${userResponse.status} ${userResponse.statusText} - ${errText}`
+    );
+  }
+  return await userResponse.json();
 }
 async function registerNewUser(userService, oauthService2, roleService2, email, userResponseData, whitelistUser, config2, ctx) {
   let roles2 = [];
@@ -225,7 +240,6 @@ async function handleUserAuthentication(userService, oauthService2, roleService2
 }
 async function oidcSignInCallback(ctx) {
   const config2 = configValidation();
-  const httpClient = axios__default.default.create();
   const userService = strapi.service("admin::user");
   const oauthService2 = strapi.plugin("strapi-plugin-oidc").service("oauth");
   const roleService2 = strapi.plugin("strapi-plugin-oidc").service("role");
@@ -244,7 +258,7 @@ async function oidcSignInCallback(ctx) {
   params.append("grant_type", config2.OIDC_GRANT_TYPE);
   params.append("code_verifier", ctx.session.codeVerifier);
   try {
-    const userResponseData = await exchangeTokenAndFetchUserInfo(httpClient, config2, params);
+    const userResponseData = await exchangeTokenAndFetchUserInfo(config2, params);
     const { activateUser, jwtToken } = await handleUserAuthentication(
       userService,
       oauthService2,

package/dist/server/index.mjs

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { randomUUID, randomBytes } from "node:crypto";
 import pkceChallenge from "pkce-challenge";
 import strapiUtils from "@strapi/utils";
@@ -156,23 +155,40 @@ async function oidcSignIn(ctx) {
   ctx.set("Location", authorizationUrl);
   return ctx.send({}, 302);
 }
-async function exchangeTokenAndFetchUserInfo(httpClient, config2, params) {
-  const response = await httpClient.post(config2.OIDC_TOKEN_ENDPOINT, params, {
+async function exchangeTokenAndFetchUserInfo(config2, params) {
+  const response = await fetch(config2.OIDC_TOKEN_ENDPOINT, {
+    method: "POST",
+    body: params,
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
     }
   });
+  if (!response.ok) {
+    const errText = await response.text();
+    throw new Error(
+      `Failed to exchange token: ${response.status} ${response.statusText} - ${errText}`
+    );
+  }
+  const tokenData = await response.json();
   let userInfoEndpointHeaders = {};
-  let userInfoEndpointParameters = `?access_token=${response.data.access_token}`;
+  let userInfoEndpointParameters = `?access_token=${tokenData.access_token}`;
   if (config2.OIDC_USER_INFO_ENDPOINT_WITH_AUTH_HEADER) {
     userInfoEndpointHeaders = {
-      headers: { Authorization: `Bearer ${response.data.access_token}` }
+      Authorization: `Bearer ${tokenData.access_token}`
     };
     userInfoEndpointParameters = "";
   }
   const userInfoEndpoint = `${config2.OIDC_USER_INFO_ENDPOINT}${userInfoEndpointParameters}`;
-  const userResponse = await httpClient.get(userInfoEndpoint, userInfoEndpointHeaders);
-  return userResponse.data;
+  const userResponse = await fetch(userInfoEndpoint, {
+    headers: userInfoEndpointHeaders
+  });
+  if (!userResponse.ok) {
+    const errText = await userResponse.text();
+    throw new Error(
+      `Failed to fetch user info: ${userResponse.status} ${userResponse.statusText} - ${errText}`
+    );
+  }
+  return await userResponse.json();
 }
 async function registerNewUser(userService, oauthService2, roleService2, email, userResponseData, whitelistUser, config2, ctx) {
   let roles2 = [];
@@ -218,7 +234,6 @@ async function handleUserAuthentication(userService, oauthService2, roleService2
 }
 async function oidcSignInCallback(ctx) {
   const config2 = configValidation();
-  const httpClient = axios.create();
   const userService = strapi.service("admin::user");
   const oauthService2 = strapi.plugin("strapi-plugin-oidc").service("oauth");
   const roleService2 = strapi.plugin("strapi-plugin-oidc").service("role");
@@ -237,7 +252,7 @@ async function oidcSignInCallback(ctx) {
   params.append("grant_type", config2.OIDC_GRANT_TYPE);
   params.append("code_verifier", ctx.session.codeVerifier);
   try {
-    const userResponseData = await exchangeTokenAndFetchUserInfo(httpClient, config2, params);
+    const userResponseData = await exchangeTokenAndFetchUserInfo(config2, params);
     const { activateUser, jwtToken } = await handleUserAuthentication(
       userService,
       oauthService2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-oidc",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A Strapi plugin that provides OpenID Connect (OIDC) authentication functionality for the Strapi Admin Panel.",
   "strapi": {
     "displayName": "OIDC Plugin",
@@ -38,7 +38,6 @@
     "@strapi/design-system": "^2.2.0",
     "@strapi/icons": "^2.2.0",
     "@strapi/utils": "^5.41.1",
-    "axios": "^1.14.0",
     "generate-password": "^1.7.1",
     "pkce-challenge": "^6.0.0",
     "react": "^18.3.1",
@@ -84,7 +83,7 @@
     "globals": "^17.4.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
-    "msw": "^2.12.14",
+    "msw": "^2.13.0",
     "prettier": "^3.8.1",
     "supertest": "^7.2.2",
     "typescript": "^5.9.3",