@punch-in/strapi-admin 1.0.7 → 1.0.9

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');
+    }
+  },
 };

package/css/custom.css

@@ -0,0 +1,9 @@
+.zeroheight {
+    overflow:hidden;
+    height:0;
+    transition: height 350ms;
+}
+
+.animatedbox {
+    height:auto;
+}

package/ee/admin/components/ProviderButton/ProviderButtonStyles.js

@@ -1,7 +1,7 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 import React from 'react';
 import styled from 'styled-components';
-import { Flex, Text } from '@buffetjs/core';
+import { Flex, Text } from '@punch-in/buffet-modern-core';
 
 export const ProviderButtonWrapper = styled(props => <Flex {...props} />)`
   width: 11rem;

package/ee/admin/components/ProviderButton/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text } from '@buffetjs/core';
-import { Tooltip } from '@buffetjs/styles';
+import { Text } from '@punch-in/buffet-modern-core';
+import { Tooltip } from '@punch-in/buffet-modern-styles';
 import { ProviderButtonWrapper, ProviderLink } from './ProviderButtonStyles';
 
 const ProviderButton = ({ provider }) => {

package/ee/admin/containers/AuthPage/components/Login/index.js

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { useTheme } from 'styled-components';
 import { Link } from 'react-router-dom';
 import { useIntl } from 'react-intl';
-import { Flex, Padded, Separator } from '@buffetjs/core';
-import { LoadingIndicator, Tooltip } from '@buffetjs/styles';
-import { Dots } from '@buffetjs/icons';
+import { Flex, Padded, Separator } from '@punch-in/buffet-modern-core';
+import { LoadingIndicator, Tooltip } from '@punch-in/buffet-modern-styles';
+import { Dots } from '@punch-in/buffet-modern-icons';
 import { BaselineAlignment } from 'strapi-helper-plugin';
 
 import BaseLogin from '../../../../../../admin/src/containers/AuthPage/components/Login/BaseLogin';

package/ee/admin/containers/AuthPage/components/Providers/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Button, Flex, Padded, Separator } from '@buffetjs/core';
-import { LoadingIndicator } from '@buffetjs/styles';
+import { Button, Flex, Padded, Separator } from '@punch-in/buffet-modern-core';
+import { LoadingIndicator } from '@punch-in/buffet-modern-styles';
 import { Redirect, useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 import { useIntl } from 'react-intl';

package/ee/admin/containers/Roles/CreatePage/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react';
-import { Header } from '@buffetjs/custom';
-import { Padded } from '@buffetjs/core';
+import { Header } from '@punch-in/buffet-modern-custom';
+import { Padded } from '@punch-in/buffet-modern-core';
 import moment from 'moment';
 import { Formik } from 'formik';
 import { get, isEmpty } from 'lodash';

package/ee/admin/containers/Roles/ListPage/CustomCheckbox.js

@@ -1,4 +1,4 @@
-import { Checkbox as Base } from '@buffetjs/core';
+import { Checkbox as Base } from '@punch-in/buffet-modern-core';
 import styled from 'styled-components';
 
 const CustomCheckbox = styled(Base)`

package/ee/admin/containers/Roles/ListPage/RoleRow.js

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useGlobalContext } from 'strapi-helper-plugin';
 import { useHistory } from 'react-router-dom';
-import { Pencil, Duplicate } from '@buffetjs/icons';
+import { Pencil, Duplicate } from '@punch-in/buffet-modern-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { RoleRow as RoleRowBase } from '../../../../../admin/src/components/Roles';
 import Checkbox from './CustomCheckbox';

package/ee/admin/containers/Roles/ListPage/index.js

@@ -1,8 +1,8 @@
 import React, { useEffect, useReducer, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { Button } from '@buffetjs/core';
-import { List, Header } from '@buffetjs/custom';
-import { Plus } from '@buffetjs/icons';
+import { Button } from '@punch-in/buffet-modern-core';
+import { List, Header } from '@punch-in/buffet-modern-custom';
+import { Plus } from '@punch-in/buffet-modern-icons';
 import matchSorter from 'match-sorter';
 import { get } from 'lodash';
 import {

package/index.html

@@ -6,7 +6,7 @@
   <!-- Make the page mobile compatible -->
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="mobile-web-app-capable" content="yes">
-  <title>Strapi Admin</title>
+  <title>Punch-in Admin Portal</title>
 </head>
 <body>
 <!-- The app hooks into this div -->

package/index.js

@@ -39,7 +39,7 @@ function getCustomWebpackConfig(dir, config) {
 async function build({ dir, env, options, optimize }) {
   // Create the cache dir containing the front-end files.
   await createCacheDir(dir);
-
+  console.log('build env: ' + env);
   const cacheDir = path.resolve(dir, '.cache');
   const entry = path.resolve(cacheDir, 'admin', 'src', 'app.js');
   const dest = path.resolve(dir, 'build');
@@ -127,6 +127,7 @@ module.exports = {
 }
 
 async function clean({ dir }) {
+  console.log(`Cleaning up first...`)
   const buildDir = path.join(dir, 'build');
   const cacheDir = path.join(dir, '.cache');
 

package/middlewares/features-routes/defaults.json

@@ -0,0 +1,16 @@
+{
+  "features-routes": {
+    "enabled": true
+  }
+}
+
+
+
+
+
+
+
+
+
+
+

package/middlewares/features-routes/index.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const routes = require('./routes');
+
+module.exports = strapi => ({
+  beforeInitialize() {
+    strapi.config.middleware.load.before.unshift('features-routes');
+  },
+
+  initialize() {
+    loadFeaturesRoutes();
+  },
+});
+
+const loadFeaturesRoutes = () => {
+  for (const [feature, getFeatureRoutes] of Object.entries(routes)) {
+    // In non-EE version, we load all routes without feature checks
+    strapi.admin.config.routes.push(...getFeatureRoutes);
+  }
+};
+
+
+
+
+
+
+
+
+
+
+

package/middlewares/features-routes/routes.js

@@ -0,0 +1,54 @@
+'use strict';
+
+module.exports = {
+  sso: [
+    {
+      method: 'GET',
+      path: '/providers',
+      handler: 'authentication.getProviders',
+    },
+    {
+      method: 'GET',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+    },
+    {
+      method: 'POST',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+    },
+    {
+      method: 'GET',
+      path: '/providers/options',
+      handler: 'authentication.getProviderLoginOptions',
+      config: {
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          ['admin::hasPermissions', ['admin::provider-login.read']],
+        ],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/providers/options',
+      handler: 'authentication.updateProviderLoginOptions',
+      config: {
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          ['admin::hasPermissions', ['admin::provider-login.update']],
+        ],
+      },
+    },
+  ],
+};
+
+
+
+
+
+
+
+
+
+
+

package/package.json

@@ -1,18 +1,11 @@
 {
-  "name": "@punch-in/strapi-admin",
-  "version": "1.0.7",
-  "description": "Strapi Admin",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/lordvee/strapi-admin.git"
+  "author": {
+    "name": "Strapi"
   },
-  "scripts": {
-    "test": "echo \"no tests yet\"",
-    "develop": "webpack-dev-server --config webpack.config.dev.js",
-    "develop:ce": "STRAPI_DISABLE_EE=true webpack-dev-server --config webpack.config.dev.js",
-    "analyze:bundle": "ANALYZE_BUNDLE=true webpack --config webpack.config.dev.js"
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
   },
-  "main": "index.js",
+  "bundleDependencies": false,
   "dependencies": {
     "@babel/core": "^7.14.0",
     "@babel/plugin-proposal-async-generator-functions": "^7.13.15",
@@ -24,12 +17,12 @@
     "@babel/preset-env": "^7.13.15",
     "@babel/preset-react": "^7.13.13",
     "@babel/runtime": "^7.13.17",
-    "@buffetjs/core": "3.3.8",
-    "@buffetjs/custom": "3.3.8",
-    "@buffetjs/hooks": "3.3.8",
-    "@buffetjs/icons": "3.3.8",
-    "@buffetjs/styles": "3.3.8",
-    "@buffetjs/utils": "3.3.8",
+    "@punch-in/buffet-modern-core": "^3.3.8",
+    "@punch-in/buffet-modern-custom": "^3.3.8",
+    "@punch-in/buffet-modern-hooks": "^3.3.8",
+    "@punch-in/buffet-modern-icons": "^3.3.8",
+    "@punch-in/buffet-modern-styles": "^3.3.8",
+    "@punch-in/buffet-modern-utils": "^3.3.8",
     "@casl/ability": "^4.1.5",
     "@fingerprintjs/fingerprintjs": "3.1.1",
     "@fortawesome/fontawesome-free": "^5.15.3",
@@ -115,24 +108,36 @@
     "webpackbar": "^4.0.0",
     "yup": "^0.32.9"
   },
-  "author": "Strapi",
-  "maintainers": [
-    "Strapi"
-  ],
+  "description": "Punch-in Admin",
+  "devDependencies": {
+    "webpack-bundle-analyzer": "4.4.0"
+  },
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "engines": {
     "node": ">=10.16.0 <=14.x.x",
     "npm": ">=6.0.0"
   },
+  "homepage": "https://github.com/strapi/strapi#readme",
   "license": "SEE LICENSE IN LICENSE",
-  "devDependencies": {
-    "webpack-bundle-analyzer": "4.4.0"
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "Strapi"
+    }
+  ],
+  "name": "@punch-in/strapi-admin",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/lordvee/strapi-admin.git"
   },
-  "bugs": {
-    "url": "https://github.com/strapi/strapi/issues"
+  "scripts": {
+    "analyze:bundle": "ANALYZE_BUNDLE=true webpack --config webpack.config.dev.js",
+    "develop": "webpack-dev-server --config webpack.config.dev.js",
+    "develop:ce": "STRAPI_DISABLE_EE=true webpack-dev-server --config webpack.config.dev.js",
+    "test": "echo \"no tests yet\""
   },
-  "homepage": "https://github.com/strapi/strapi#readme",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  }
+  "version": "1.0.9"
 }