@ssplib/react-components 0.0.291 → 0.0.293

package/components/providers/KeycloakAuthProvider.js

@@ -36,10 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeycloakAuthProvider = exports.cookieName = void 0;
-const keycloak_js_1 = __importDefault(require("keycloak-js"));
 const router_1 = require("next/router");
 const react_1 = __importStar(require("react"));
 const auth_1 = require("../../context/auth");
+const keycloak_js_1 = __importDefault(require("keycloak-js"));
 exports.cookieName = 'nextauth.token';
 const userImgName = 'user-data.img';
 function KeycloakAuthProvider({ url, realm, clientId, children, type = 'ad', resource_name = 'eventos-front', redirectUri = '', }) {
@@ -48,31 +48,6 @@ function KeycloakAuthProvider({ url, realm, clientId, children, type = 'ad', res
     const [kc, setKc] = (0, react_1.useState)(null);
     const router = (0, router_1.useRouter)();
     const isAuth = !!user;
-    const updateUserData = (token) => {
-        var _a, _b;
-        if (!kc)
-            return;
-        const tokenParsed = kc.tokenParsed;
-        const roles = ((_b = ((_a = tokenParsed === null || tokenParsed === void 0 ? void 0 : tokenParsed.resource_access) !== null && _a !== void 0 ? _a : {})[resource_name]) === null || _b === void 0 ? void 0 : _b.roles) || [];
-        setUser(Object.assign(Object.assign({}, tokenParsed), { token,
-            roles }));
-    };
-    const refreshTokens = () => __awaiter(this, void 0, void 0, function* () {
-        if (!kc)
-            return false;
-        try {
-            const refreshed = yield kc.updateToken(5);
-            if (refreshed) {
-                updateUserData(kc.token);
-            }
-            return refreshed;
-        }
-        catch (err) {
-            console.error('Falha ao atualizar token:', err);
-            logout();
-            return false;
-        }
-    });
     (0, react_1.useEffect)(() => {
         const keycloak = new keycloak_js_1.default({
             url: url,
@@ -80,12 +55,26 @@ function KeycloakAuthProvider({ url, realm, clientId, children, type = 'ad', res
             clientId: clientId,
         });
         setKc(keycloak);
+        keycloak.onTokenExpired = () => __awaiter(this, void 0, void 0, function* () {
+            console.log('token expired');
+            try {
+                const refreshed = yield keycloak.updateToken(5);
+                if (refreshed) {
+                    setUser((prevUser) => (Object.assign(Object.assign({}, prevUser), { token: keycloak.token })));
+                }
+                console.log(refreshed ? 'Token was refreshed' : 'Token is still valid');
+            }
+            catch (error) {
+                console.log('Failed to refresh token', error);
+            }
+        });
         keycloak
             .init({
             onLoad: 'check-sso',
             pkceMethod: 'S256',
         })
             .then((auth) => {
+            var _a, _b;
             setUserLoaded(true);
             if (!auth) {
                 console.log('NAO AUTENTICADO');
@@ -94,12 +83,9 @@ function KeycloakAuthProvider({ url, realm, clientId, children, type = 'ad', res
             else {
                 const tokenParsed = keycloak.tokenParsed;
                 console.log('TOKEN-> ', tokenParsed);
-                updateUserData(keycloak.token);
+                const userData = Object.assign(Object.assign({}, tokenParsed), { token: keycloak.token, roles: ((_b = ((_a = tokenParsed === null || tokenParsed === void 0 ? void 0 : tokenParsed.resource_access) !== null && _a !== void 0 ? _a : {})[resource_name]) !== null && _b !== void 0 ? _b : []).roles });
+                setUser(userData);
                 console.info('Authenticated!!!');
-                keycloak.onTokenExpired = () => {
-                    console.log('token expired');
-                    refreshTokens();
-                };
             }
         }, () => {
             console.error('Authenticated Failed');
@@ -127,6 +113,6 @@ function KeycloakAuthProvider({ url, realm, clientId, children, type = 'ad', res
         setUser(null);
         localStorage.removeItem(userImgName);
     }
-    return react_1.default.createElement(auth_1.AuthContext.Provider, { value: { user, isAuth, userLoaded, login, logout, saveUserData: () => { }, type, refreshTokens } }, children);
+    return react_1.default.createElement(auth_1.AuthContext.Provider, { value: { user, isAuth, userLoaded, login, logout, saveUserData: () => { }, type } }, children);
 }
 exports.KeycloakAuthProvider = KeycloakAuthProvider;

package/package.json

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

package/types/auth.d.ts

@@ -69,5 +69,4 @@ export interface AuthReturnData {
     login: () => void;
     saveUserData: (token: AuthReturn) => void;
     logout: () => void;
-    refreshTokens?: () => Promise<boolean>;
 }