@strapi/plugin-users-permissions 5.0.0-rc.0 → 5.0.0-rc.2

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-iaebB1BT.js");
+const index = require("../_chunks/index-B1qzCQd5.js");
 module.exports = index.index;
 //# sourceMappingURL=index.js.map

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-Cf2sMpyd.mjs";
+import { i } from "../_chunks/index-DUjTQKud.mjs";
 export {
   i as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.2",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@strapi/design-system": "2.0.0-beta.6",
     "@strapi/icons": "2.0.0-beta.6",
-    "@strapi/utils": "5.0.0-rc.0",
+    "@strapi/utils": "5.0.0-rc.2",
     "bcryptjs": "2.4.3",
     "formik": "2.4.5",
     "grant-koa": "5.4.8",
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@strapi/pack-up": "5.0.0",
-    "@strapi/strapi": "5.0.0-rc.0",
+    "@strapi/strapi": "5.0.0-rc.2",
     "@testing-library/dom": "10.1.0",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.5.2",
@@ -96,5 +96,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "ec0af1ddc1aa1c774e42db971848c6b95517d4ad"
+  "gitHead": "c3f078328f8506cd543f6635b992d8648cb8c501"
 }

package/server/bootstrap/index.js

@@ -9,22 +9,26 @@
  */
 const crypto = require('crypto');
 const _ = require('lodash');
-const urljoin = require('url-join');
 const { getService } = require('../utils');
-const getGrantConfig = require('./grant-config');
 const usersPermissionsActions = require('./users-permissions-actions');
 
 const initGrant = async (pluginStore) => {
-  const apiPrefix = strapi.config.get('api.rest.prefix');
-  const baseURL = urljoin(strapi.config.server.url, apiPrefix, 'auth');
+  const allProviders = getService('providers-registry').getAll();
 
-  const grantConfig = getGrantConfig(baseURL);
+  const grantConfig = Object.entries(allProviders).reduce((acc, [name, provider]) => {
+    const { icon, enabled, grantConfig } = provider;
+
+    acc[name] = {
+      icon,
+      enabled,
+      ...grantConfig,
+    };
+    return acc;
+  }, {});
 
   const prevGrantConfig = (await pluginStore.get({ key: 'grant' })) || {};
-  // store grant auth config to db
-  // when plugin_users-permissions_grant is not existed in db
-  // or we have added/deleted provider here.
-  if (!prevGrantConfig || !_.isEqual(_.keys(prevGrantConfig), _.keys(grantConfig))) {
+
+  if (!prevGrantConfig || !_.isEqual(prevGrantConfig, grantConfig)) {
     // merge with the previous provider config.
     _.keys(grantConfig).forEach((key) => {
       if (key in prevGrantConfig) {