@ssplib/react-components 0.0.82 → 0.0.84

package/components/navbar/NavBar.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-export default function NavBar({ links, title, img, pos, next, el, menuItems, }: {
+export default function NavBar({ links, title, img, pos, next, el, menuItems, logoutMsg, logoutURL, }: {
     links: {
         name: string;
         path: string;
@@ -9,5 +9,7 @@ export default function NavBar({ links, title, img, pos, next, el, menuItems, }:
     menuItems: JSX.Element | JSX.Element[];
     next?: boolean;
     el?: JSX.Element;
+    logoutMsg?: string;
+    logoutURL?: string;
     pos?: 'fixed' | 'inherit';
 }): JSX.Element;

package/components/navbar/NavBar.js

@@ -37,7 +37,7 @@ const link_1 = __importDefault(require("next/link"));
 const router_1 = require("next/router");
 const react_1 = __importStar(require("react"));
 const auth_1 = require("../../context/auth");
-function NavBar({ links, title, img, pos = 'fixed', next = true, el, menuItems, }) {
+function NavBar({ links, title, img, pos = 'fixed', next = true, el, menuItems, logoutMsg = 'Sair', logoutURL = '/', }) {
     let router = undefined;
     if (next)
         router = (0, router_1.useRouter)();
@@ -107,11 +107,11 @@ function NavBar({ links, title, img, pos = 'fixed', next = true, el, menuItems,
                                         menuItems,
                                         react_1.default.createElement(material_1.MenuItem, { onClick: (e) => {
                                                 setAvatarAnchor(null);
-                                                logout();
+                                                logout(logoutURL);
                                             } },
                                             react_1.default.createElement(material_1.Stack, { direction: 'row', spacing: 1 },
                                                 react_1.default.createElement(LogoutOutlined_1.default, { sx: { fill: '#545454' } }),
-                                                react_1.default.createElement(material_1.Typography, { textTransform: 'capitalize' }, "Sair"))))),
+                                                react_1.default.createElement(material_1.Typography, { textTransform: 'capitalize' }, logoutMsg))))),
                                 react_1.default.createElement(material_1.Stack, { direction: 'row', spacing: 0.4, alignItems: 'center', onClick: (e) => setAvatarAnchor(e.currentTarget), sx: { userSelect: 'none' } },
                                     react_1.default.createElement(material_1.Typography, null, "Ol\u00E1,"),
                                     react_1.default.createElement(material_1.Typography, { fontWeight: 600 }, user.name),

package/components/page/Login.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
-export declare function Login({ imgURL, name, children, loginURL }: {
+export declare function Login({ imgURL, name, children, loginURL, captchaSiteKey, }: {
     imgURL?: string;
     loginURL: string;
     children: JSX.Element | JSX.Element[];
     name?: string;
+    captchaSiteKey?: string;
 }): JSX.Element;

package/components/page/Login.js

@@ -36,12 +36,16 @@ const React = __importStar(require("react"));
 const react_1 = require("react");
 const auth_1 = require("../../context/auth");
 const FormProvider_1 = __importDefault(require("../providers/FormProvider"));
-function Login({ imgURL = '', name = 'Login', children, loginURL }) {
+const react_google_recaptcha_1 = __importDefault(require("react-google-recaptcha"));
+function Login({ imgURL = '', name = 'Login', children, loginURL, captchaSiteKey, }) {
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(false);
+    const [captchaSolved, setCaptchaSolved] = (0, react_1.useState)(false);
+    const [captchaToken, setCaptchaToken] = (0, react_1.useState)('');
+    const captcha = (0, react_1.useRef)(null);
     const { adLogin } = (0, react_1.useContext)(auth_1.AuthContext);
     function onLogin(data) {
-        adLogin(loginURL, data, setLoading, setError);
+        adLogin(loginURL, data, setLoading, setError, captchaToken);
     }
     return (React.createElement(FormProvider_1.default, { onSubmit: onLogin },
         React.createElement(Container_1.default, { component: 'main', maxWidth: 'xs' },
@@ -55,7 +59,10 @@ function Login({ imgURL = '', name = 'Login', children, loginURL }) {
                 React.createElement(Typography_1.default, { component: 'h1', variant: 'h5', paddingY: 3 }, name),
                 React.createElement(material_1.Stack, { spacing: 3, width: 300 },
                     React.createElement(material_1.Stack, { spacing: 1 }, children),
-                    React.createElement(lab_1.LoadingButton, { type: 'submit', fullWidth: true, variant: 'contained', loading: loading }, "Login"),
+                    captchaSiteKey && (React.createElement(react_google_recaptcha_1.default, { ref: captcha, hl: 'pt', sitekey: captchaSiteKey, onExpired: () => setCaptchaSolved(false), onChange: (e) => {
+                            setCaptchaToken(e), e && setCaptchaSolved(true);
+                        } })),
+                    React.createElement(lab_1.LoadingButton, { type: 'submit', fullWidth: true, variant: 'contained', loading: loading, disabled: !captchaSolved }, "Login"),
                     error && (React.createElement(Box_1.default, { bgcolor: '#ce4257', padding: 2, borderRadius: 2, color: 'white' },
                         React.createElement(Typography_1.default, null, "Dados incorretos. Tente novamente!"))))))));
 }

package/components/providers/LoginProvider.js

@@ -72,11 +72,11 @@ function LoginProvider({ children, AUTH_URL, redirectURL = '/', validateTokenRou
             }
         });
     }, []);
-    function adLogin(loginURL, data, setLoading, setError) {
+    function adLogin(loginURL, data, setLoading, setError, captchaToken) {
         setLoading(true);
         fetch(loginURL, {
             method: 'POST',
-            body: JSON.stringify(Object.assign(Object.assign({}, data), { cpf: data.cpf.replaceAll(/[.-]/g, '') })),
+            body: JSON.stringify(Object.assign(Object.assign({}, data), { cpf: data.cpf.replaceAll(/[.-]/g, ''), captchaToken })),
             headers: {
                 'Content-Type': 'application/json',
             },

package/components/providers/OAuthProvider.js

@@ -62,7 +62,7 @@ function OAuthProvider({ children, AUTH_URL, oidcConfig, redirectURL, validateTo
             },
         }).then((res) => {
             if (!res.ok) {
-                logout();
+                logout('/');
                 return;
             }
             else {
@@ -124,12 +124,12 @@ function OAuthProvider({ children, AUTH_URL, oidcConfig, redirectURL, validateTo
             router.replace(redirectURL).finally(() => setUserLoaded(true));
         });
     }
-    function logout() {
+    function logout(url) {
         setUserLoaded(false);
         setUser(null);
         (0, cookies_next_1.deleteCookie)(exports.cookieName);
         localStorage.removeItem(userImgName);
-        router.replace(redirectURL).finally(() => setUserLoaded(true));
+        router.replace(url).finally(() => setUserLoaded(true));
     }
     return react_1.default.createElement(auth_1.AuthContext.Provider, { value: { user, isAuth, userLoaded, login, adLogin: () => { }, logout, saveUserData, type: 'govbr' } }, children);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ssplib/react-components",
-    "version": "0.0.82",
+    "version": "0.0.84",
     "description": "SSP React Components",
     "main": "index.js",
     "author": "Pedro Henrique <sr.hudrick@gmail.com>",

package/types/auth.d.ts

@@ -67,7 +67,7 @@ export interface AuthReturnData {
     user: User | null | undefined;
     userLoaded: boolean;
     login: () => void;
-    adLogin: (loginURL: string, data: any, setLoading: React.Dispatch<React.SetStateAction<boolean>>, setError: React.Dispatch<React.SetStateAction<boolean>>) => void;
+    adLogin: (loginURL: string, data: any, setLoading: React.Dispatch<React.SetStateAction<boolean>>, setError: React.Dispatch<React.SetStateAction<boolean>>, captchaToken: string) => void;
     saveUserData: (token: AuthReturn) => void;
-    logout: () => void;
+    logout: (url: string) => void;
 }