@punch-in/strapi-admin 1.0.7 → 1.0.8

package/admin/src/containers/Users/ListPage/ModalForm.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Button } from '@buffetjs/core';
+import { Button } from '@punch-in/buffet-modern-core';
 import { Modal, ModalFooter, ModalHeader, useGlobalContext } from 'strapi-helper-plugin';
 import stepper from './stepper';
 

package/admin/src/containers/Users/ListPage/index.js

@@ -9,7 +9,7 @@ import {
 } from 'strapi-helper-plugin';
 import { get } from 'lodash';
 import { useHistory, useLocation } from 'react-router-dom';
-import { Flex, Padded } from '@buffetjs/core';
+import { Flex, Padded } from '@punch-in/buffet-modern-core';
 import PageTitle from '../../../components/SettingsPageTitle';
 import { useSettingsHeaderSearchContext } from '../../../hooks';
 import { Footer, List, Filter, FilterPicker, SortPicker } from '../../../components/Users';

package/admin/src/containers/Webhooks/EditView/index.js

@@ -7,8 +7,8 @@
 import React, { useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import { get, isEmpty, isEqual, omit } from 'lodash';
-import { Header, Inputs as InputsIndex } from '@buffetjs/custom';
-import { Play } from '@buffetjs/icons';
+import { Header, Inputs as InputsIndex } from '@punch-in/buffet-modern-custom';
+import { Play } from '@punch-in/buffet-modern-icons';
 import {
   request,
   useGlobalContext,

package/admin/src/containers/Webhooks/ListView/index.js

@@ -6,9 +6,9 @@
 
 import React, { useEffect, useReducer, useRef, useState } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { Header, List } from '@buffetjs/custom';
-import { Button } from '@buffetjs/core';
-import { Plus } from '@buffetjs/icons';
+import { Header, List } from '@punch-in/buffet-modern-custom';
+import { Button } from '@punch-in/buffet-modern-core';
+import { Plus } from '@punch-in/buffet-modern-icons';
 import { omit } from 'lodash';
 import { useIntl } from 'react-intl';
 import {

package/admin/src/hooks/index.js

@@ -7,3 +7,4 @@ export { default as useSettingsHeaderSearchContext } from './useSettingsHeaderSe
 export { default as useSettingsMenu } from './useSettingsMenu';
 export { default as useSettingsForm } from './useSettingsForm';
 export { default as usePermissionsDataManager } from './usePermissionsDataManager';
+export { default as useAuthProviders } from './useAuthProviders';

package/admin/src/hooks/useAuthProviders/index.js

@@ -0,0 +1,54 @@
+import { useReducer, useEffect } from 'react';
+import { request } from 'strapi-helper-plugin';
+
+import { getRequestUrl } from '../../../utils';
+import reducer, { initialState } from './reducer';
+
+const useAuthProviders = () => {
+  const [state, dispatch] = useReducer(reducer, initialState);
+
+  useEffect(() => {
+    fetchAuthProviders();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const fetchAuthProviders = async () => {
+    try {
+      const requestUrl = getRequestUrl('providers');
+      const data = await request(requestUrl, { method: 'GET' });
+
+      dispatch({
+        type: 'GET_DATA_SUCCEEDED',
+        data,
+      });
+    } catch (err) {
+      console.error(err);
+
+      dispatch({
+        type: 'GET_DATA_ERROR',
+      });
+
+      strapi.notification.toggle({
+        type: 'warning',
+        message: { id: 'notification.error' },
+        centered: true,
+      });
+    }
+  };
+
+  return state;
+};
+
+export default useAuthProviders;
+
+
+
+
+
+
+
+
+
+
+
+

package/admin/src/hooks/useAuthProviders/initialState.js

@@ -0,0 +1,16 @@
+export const initialState = {
+  data: [],
+  isLoading: true,
+};
+
+
+
+
+
+
+
+
+
+
+
+

package/admin/src/hooks/useAuthProviders/reducer.js

@@ -0,0 +1,39 @@
+import { initialState } from './initialState';
+
+const reducer = (state, action) => {
+  switch (action.type) {
+    case 'GET_DATA':
+      return {
+        ...state,
+        isLoading: true,
+      };
+    case 'GET_DATA_SUCCEEDED':
+      return {
+        ...state,
+        data: action.data,
+        isLoading: false,
+      };
+    case 'GET_DATA_ERROR':
+      return {
+        ...state,
+        isLoading: false,
+      };
+    default:
+      return state;
+  }
+};
+
+export default reducer;
+export { initialState };
+
+
+
+
+
+
+
+
+
+
+
+

package/admin/src/hooks/useSettingsMenu/init.js

@@ -1,4 +1,6 @@
-import { retrieveGlobalLinks, retrievePluginsMenu, sortLinks } from '../../utils';
+import retrieveGlobalLinks from '../../utils/retrieveGlobalLinks';
+import retrievePluginsMenu from '../../utils/retrievePluginsMenu';
+import sortLinks from '../../utils/sortLinks';
 import { SETTINGS_BASE_URL } from '../../config';
 import adminPermissions from '../../permissions';
 import formatLinks from './utils/formatLinks';

package/admin/src/themes/colors.js

@@ -34,10 +34,10 @@ const colors = {
     'background-alpha': 'rgba(14, 22, 34, 0.02)',
   },
   leftMenu: {
-    'link-hover': '#c6eaff',
-    'link-visited': '#00458f',
-    'link-color': '#666e7d',
-    'title-color': '#5b626f',
+    'link-hover': '#00458f',
+    'link-visited': '#03a9f4',
+    'link-color': '#002b7d',
+    'title-color': '#002b7d',
     'background-header-link': '#007eff',
   },
   strapi: {
@@ -46,7 +46,8 @@ const colors = {
     'blue-darker': '#18202e',
     'blue-dark': '#151c2e',
     blue: '#0097f7',
-    'light-blue-transparent': '#0097f71c'
+    'light-blue-transparent': '#d0edff',
+    red: '#E91E63'
   },
 };
 

package/admin/src/themes/sizes.js

@@ -1,5 +1,5 @@
 const sizes = {
-  borderRadius: '2px',
+  borderRadius: '5px',
   header: {
     height: '6rem',
   },

package/admin/src/translations/en.json

@@ -2,6 +2,7 @@
   "Analytics": "Analytics",
   "Auth.advanced.allow_register": "",
   "Auth.components.Oops.text": "Your account has been suspended",
+  "Auth.components.sso.info": "Login with your existing account:",
   "Auth.form.button.forgot-password": "Send Email",
   "Auth.form.button.go-home": "GO BACK HOME",
   "Auth.form.button.login": "Log in",

package/controllers/authentication.js

@@ -178,4 +178,97 @@ module.exports = {
       },
     };
   },
+
+  async getProviders(ctx) {
+    try {
+      // Mock providers - in a real implementation, these would come from configuration
+      const providers = [
+        {
+          uid: 'google',
+          displayName: 'Google',
+          icon: 'https://developers.google.com/identity/images/g-logo.png',
+        },
+        {
+          uid: 'github',
+          displayName: 'GitHub',
+          icon: 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png',
+        },
+        {
+          uid: 'microsoft',
+          displayName: 'Microsoft',
+          icon: 'https://upload.wikimedia.org/wikipedia/commons/4/44/Microsoft_logo.svg',
+        },
+        {
+          uid: 'facebook',
+          displayName: 'Facebook',
+          icon: 'https://upload.wikimedia.org/wikipedia/commons/5/51/Facebook_f_logo_%282019%29.svg',
+        },
+        {
+          uid: 'linkedin',
+          displayName: 'LinkedIn',
+          icon: 'https://upload.wikimedia.org/wikipedia/commons/c/ca/LinkedIn_logo_initials.png',
+        },
+      ];
+
+      ctx.body = providers;
+    } catch (err) {
+      ctx.badRequest(null, 'An error occurred while retrieving providers');
+    }
+  },
+
+  async providerLogin(ctx) {
+    try {
+      const { provider } = ctx.params;
+      
+      // This is where you would implement the actual OAuth flow
+      // For now, we'll just redirect to the provider's OAuth URL
+      const providerUrls = {
+        google: `https://accounts.google.com/oauth/authorize?client_id=${process.env.GOOGLE_CLIENT_ID}&redirect_uri=${process.env.GOOGLE_REDIRECT_URI}&scope=openid%20email%20profile&response_type=code`,
+        github: `https://github.com/login/oauth/authorize?client_id=${process.env.GITHUB_CLIENT_ID}&redirect_uri=${process.env.GITHUB_REDIRECT_URI}&scope=user:email`,
+        microsoft: `https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=${process.env.MICROSOFT_CLIENT_ID}&redirect_uri=${process.env.MICROSOFT_REDIRECT_URI}&scope=openid%20email%20profile&response_type=code`,
+        facebook: `https://www.facebook.com/v18.0/dialog/oauth?client_id=${process.env.FACEBOOK_CLIENT_ID}&redirect_uri=${process.env.FACEBOOK_REDIRECT_URI}&scope=email%20public_profile&response_type=code`,
+        linkedin: `https://www.linkedin.com/oauth/v2/authorization?client_id=${process.env.LINKEDIN_CLIENT_ID}&redirect_uri=${process.env.LINKEDIN_REDIRECT_URI}&scope=r_liteprofile%20r_emailaddress&response_type=code`,
+      };
+
+      const authUrl = providerUrls[provider];
+      
+      if (!authUrl) {
+        return ctx.badRequest(null, 'Provider not supported');
+      }
+
+      ctx.redirect(authUrl);
+    } catch (err) {
+      ctx.badRequest(null, 'An error occurred while connecting to provider');
+    }
+  },
+
+  async getProviderLoginOptions(ctx) {
+    try {
+      // Mock provider login options - in a real implementation, these would come from configuration
+      const options = {
+        autoRegister: true,
+        defaultRole: 'authenticated',
+      };
+
+      ctx.body = {
+        data: options,
+      };
+    } catch (err) {
+      ctx.badRequest(null, 'An error occurred while retrieving provider login options');
+    }
+  },
+
+  async updateProviderLoginOptions(ctx) {
+    try {
+      const input = ctx.request.body;
+      
+      // In a real implementation, you would validate and save these options
+      // For now, we'll just return the input as confirmation
+      ctx.body = {
+        data: input,
+      };
+    } catch (err) {
+      ctx.badRequest(null, 'An error occurred while updating provider login options');
+    }
+  },
 };