acsi-core 0.1.25 → 0.1.26

package/README.md

@@ -1,46 +1,46 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

package/dist/index.d.ts

@@ -15,8 +15,9 @@ import CustomPagination from "./components/Paginations/CustomPagination";
 import useGoogleSignOut from "./utils/hooks/useGoogleSignOut";
 import { CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput } from "./components";
 import { getErrorMessage } from "./utils/getErrorMessage";
+import { GoogleOAuthProvider } from '@react-oauth/google';
 import CustomSelect from "./components/Selects/CustomSelect";
 import CustomAsyncSelect from "./components/Selects/CustomAsyncSelect";
 import CustomCreatable from "./components/Selects/CustomCreatable";
 import CustomSelectOption from "./components/Selects/CustomSelectOption";
-export { setLoading, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, Login, store, historyCore, setAlert, setUser, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, getErrorMessage, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption };
+export { setLoading, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, Login, store, historyCore, setAlert, setUser, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, getErrorMessage, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider };

package/dist/index.js

@@ -5,13 +5,12 @@ var toolkit = require('@reduxjs/toolkit');
 var React = require('react');
 var React__default = _interopDefault(React);
 var reactstrap = require('reactstrap');
-var GoogleLogin = require('@leecheuk/react-google-login');
-var GoogleLogin__default = _interopDefault(GoogleLogin);
 var axios = _interopDefault(require('axios'));
 var moment = _interopDefault(require('moment'));
 var reactRouterDom = require('react-router-dom');
 var reactRedux = require('react-redux');
-var gapiScript = require('gapi-script');
+var google = require('@react-oauth/google');
+var reactGoogleLogin = require('@leecheuk/react-google-login');
 var material = require('@mui/material');
 var reactToastify = require('react-toastify');
 var ReactSelect = require('react-select');
@@ -141,50 +140,58 @@ var BlockLogin = function BlockLogin(_ref) {
   var onNavigate = _ref.onNavigate,
     role = _ref.role;
   var dispatch = reactRedux.useDispatch();
-  var onSuccessGoogle = function onSuccessGoogle(res) {
-    try {
-      return Promise.resolve(function () {
-        if (!!(res !== null && res !== void 0 && res.accessToken)) {
-          var _res$profileObj = res.profileObj,
-            email = _res$profileObj.email,
-            imageUrl = _res$profileObj.imageUrl,
-            familyName = _res$profileObj.familyName,
-            givenName = _res$profileObj.givenName,
-            name = _res$profileObj.name;
-          var accessToken = res.tokenObj.id_token;
-          var googleId = res.googleId;
-          var infoLogin = {
-            imageUrl: imageUrl,
-            fullName: name,
-            firstName: familyName,
-            lastName: givenName,
-            email: email,
-            token: accessToken,
-            googleId: googleId,
-            role: role
-          };
-          dispatch(setLoading(true));
-          return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (res1) {
-            var _res1$data;
-            if (((_res1$data = res1.data) === null || _res1$data === void 0 ? void 0 : _res1$data.id) == null) {
-              dispatch(setLoading(false));
-              alert("Please contact admin.");
-              return;
+  var googleLogin = google.useGoogleLogin({
+    onSuccess: function (tokenResponse) {
+      try {
+        return Promise.resolve(axios.get("https://www.googleapis.com/oauth2/v3/userinfo", {
+          headers: {
+            Authorization: "Bearer " + tokenResponse.access_token
+          }
+        })).then(function (userInfo) {
+          return function () {
+            if (userInfo && userInfo.data) {
+              var _userInfo$data = userInfo.data,
+                email = _userInfo$data.email,
+                picture = _userInfo$data.picture,
+                family_name = _userInfo$data.family_name,
+                given_name = _userInfo$data.given_name,
+                name = _userInfo$data.name,
+                sub = _userInfo$data.sub;
+              var accessToken = tokenResponse.access_token;
+              var infoLogin = {
+                imageUrl: picture,
+                fullName: name,
+                firstName: family_name,
+                lastName: given_name,
+                email: email,
+                token: accessToken,
+                googleId: sub,
+                role: role
+              };
+              dispatch(setLoading(true));
+              return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (res1) {
+                var _res1$data;
+                if (((_res1$data = res1.data) === null || _res1$data === void 0 ? void 0 : _res1$data.id) == null) {
+                  dispatch(setLoading(false));
+                  alert("Please contact admin.");
+                  return;
+                }
+                var tokenJWT = res1.data.token;
+                localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+                onNavigate("/dashboard");
+                dispatch(setLoading(false));
+              });
             }
-            var tokenJWT = res1.data.token;
-            localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-            onNavigate("/dashboard");
-            dispatch(setLoading(false));
-          });
-        }
-      }());
-    } catch (e) {
-      return Promise.reject(e);
+          }();
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    },
+    onError: function onError(errorResponse) {
+      return console.log(errorResponse);
     }
-  };
-  var onFailureGoogle = function onFailureGoogle() {
-    onNavigate("/login");
-  };
+  });
   return React__default.createElement(reactstrap.Row, {
     style: {
       height: "100%"
@@ -217,25 +224,18 @@ var BlockLogin = function BlockLogin(_ref) {
       color: "#00A0DA"
     },
     className: "text-decoration-none"
-  }, "Sign up"))), React__default.createElement(GoogleLogin__default, {
-    clientId: GOOGLE_CLIENT_ID,
-    render: function render(renderProps) {
-      return React__default.createElement("div", {
-        className: "" + styleGlobal["google_button"]
-      }, React__default.createElement("button", {
-        onClick: renderProps.onClick,
-        disabled: renderProps.disabled
-      }, React__default.createElement("img", {
-        width: 24,
-        height: 24,
-        alt: "Google sign-in",
-        src: "/images/icons/Google__G__logo.png"
-      }), "Sign in with Google"));
-    },
-    onSuccess: onSuccessGoogle,
-    onFailure: onFailureGoogle,
-    cookiePolicy: "single_host_origin"
-  }), role != "Admin" && React__default.createElement(React__default.Fragment, null, React__default.createElement("span", {
+  }, "Sign up"))), React__default.createElement("div", {
+    className: "" + styleGlobal["google_button"]
+  }, React__default.createElement("button", {
+    onClick: function onClick() {
+      return googleLogin();
+    }
+  }, React__default.createElement("img", {
+    width: 24,
+    height: 24,
+    alt: "Google sign-in",
+    src: "/images/icons/Google__G__logo.png"
+  }), "Sign in with Google")), role != "Admin" && React__default.createElement(React__default.Fragment, null, React__default.createElement("span", {
     className: "" + styleGlobal["box-field"]
   }, "OR"), React__default.createElement(reactstrap.Form, null, React__default.createElement("div", {
     className: "" + styleGlobal["box-input"]
@@ -327,15 +327,6 @@ var useLogin = function useLogin() {
   var _useState3 = React.useState(false),
     isShowPassword = _useState3[0],
     setIsShowPassword = _useState3[1];
-  React.useEffect(function () {
-    var start = function start() {
-      gapiScript.gapi.client.init({
-        clientId: GOOGLE_CLIENT_ID,
-        scope: 'email'
-      });
-    };
-    gapiScript.gapi.load('client:auth2', start);
-  }, []);
   return {
     defaultInfo: defaultInfo,
     openLogin: openLogin,
@@ -739,7 +730,7 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   var handleLogoutFailure = function handleLogoutFailure() {
     onFailure === null || onFailure === void 0 ? void 0 : onFailure();
   };
-  var _useGoogleLogout = GoogleLogin.useGoogleLogout({
+  var _useGoogleLogout = reactGoogleLogin.useGoogleLogout({
       clientId: GOOGLE_CLIENT_ID,
       onLogoutSuccess: handleLogoutSuccess,
       onFailure: handleLogoutFailure
@@ -2081,6 +2072,12 @@ var CustomSelectOption = function CustomSelectOption(_ref) {
 
 var historyCore = history.createBrowserHistory();
 
+Object.defineProperty(exports, 'GoogleOAuthProvider', {
+    enumerable: true,
+    get: function () {
+        return google.GoogleOAuthProvider;
+    }
+});
 Object.defineProperty(exports, 'ToastContainer', {
     enumerable: true,
     get: function () {