@ttoss/react-auth 1.2.6 → 1.2.8

package/dist/esm/index.js

@@ -14,24 +14,33 @@ var AuthContext = React.createContext({
   tokens: null
 });
 var AuthProvider = ({ children }) => {
-  const [user, setUser] = React.useState(null);
-  const [tokens, setTokens] = React.useState(null);
+  const [{ user, tokens, isAuthenticated }, setAuthState] = React.useState({
+    user: null,
+    tokens: null,
+    isAuthenticated: void 0
+  });
   React.useEffect(() => {
     const updateUser = () => {
       Auth.currentAuthenticatedUser().then(({ attributes, signInUserSession }) => {
-        setUser({
-          id: attributes.sub,
-          email: attributes.email,
-          emailVerified: attributes["email_verified"]
-        });
-        setTokens({
-          idToken: signInUserSession.idToken.jwtToken,
-          accessToken: signInUserSession.accessToken.jwtToken,
-          refreshToken: signInUserSession.refreshToken.token
+        setAuthState({
+          user: {
+            id: attributes.sub,
+            email: attributes.email,
+            emailVerified: attributes["email_verified"]
+          },
+          tokens: {
+            idToken: signInUserSession.idToken.jwtToken,
+            accessToken: signInUserSession.accessToken.jwtToken,
+            refreshToken: signInUserSession.refreshToken.token
+          },
+          isAuthenticated: true
         });
       }).catch(() => {
-        setUser(null);
-        setTokens(null);
+        setAuthState({
+          user: null,
+          tokens: null,
+          isAuthenticated: false
+        });
       });
     };
     const updateUserListener = Hub.listen("auth", updateUser);
@@ -40,13 +49,14 @@ var AuthProvider = ({ children }) => {
       updateUserListener();
     };
   }, []);
-  const isAuthenticated = !!user;
+  if (isAuthenticated === void 0) {
+    return null;
+  }
   return /* @__PURE__ */ jsx(AuthContext.Provider, { value: { signOut, isAuthenticated, user, tokens }, children });
 };
 var useAuth = () => {
   return React.useContext(AuthContext);
 };
-var AuthProvider_default = AuthProvider;
 
 // src/Auth.tsx
 import * as React3 from "react";
@@ -206,9 +216,10 @@ var createAuthTemplate = ({
   autoVerifiedAttributes = ["email"],
   identityPool = true,
   roles,
-  schema
+  schema,
+  usernameAttributes = ["email"]
 } = {}) => {
-  const AutoVerifiedAttributes = Array.isArray(autoVerifiedAttributes) && autoVerifiedAttributes.length > 0 ? autoVerifiedAttributes : void 0;
+  const AutoVerifiedAttributes = Array.isArray(autoVerifiedAttributes) && autoVerifiedAttributes.length > 0 ? autoVerifiedAttributes : [];
   const template = {
     AWSTemplateFormatVersion: "2010-09-09",
     Resources: {
@@ -227,7 +238,7 @@ var createAuthTemplate = ({
             }
           },
           Schema: schema,
-          UsernameAttributes: ["email"],
+          UsernameAttributes: usernameAttributes,
           UsernameConfiguration: {
             CaseSensitive: false
           },
@@ -658,6 +669,6 @@ var Auth2 = ({ logo, fullScreen = true }) => {
 };
 export {
   Auth2 as Auth,
-  AuthProvider_default as AuthProvider,
+  AuthProvider,
   useAuth
 };

package/dist/index.d.ts

@@ -12,7 +12,7 @@ type Tokens = {
 } | null;
 declare const AuthProvider: ({ children }: {
     children: React.ReactNode;
-}) => JSX.Element;
+}) => JSX.Element | null;
 declare const useAuth: () => {
     signOut: () => Promise<any>;
     isAuthenticated: boolean;

package/dist/index.js

@@ -28,7 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   Auth: () => Auth2,
-  AuthProvider: () => AuthProvider_default,
+  AuthProvider: () => AuthProvider,
   useAuth: () => useAuth
 });
 module.exports = __toCommonJS(src_exports);
@@ -47,24 +47,33 @@ var AuthContext = React.createContext({
   tokens: null
 });
 var AuthProvider = ({ children }) => {
-  const [user, setUser] = React.useState(null);
-  const [tokens, setTokens] = React.useState(null);
+  const [{ user, tokens, isAuthenticated }, setAuthState] = React.useState({
+    user: null,
+    tokens: null,
+    isAuthenticated: void 0
+  });
   React.useEffect(() => {
     const updateUser = () => {
       import_aws_amplify.Auth.currentAuthenticatedUser().then(({ attributes, signInUserSession }) => {
-        setUser({
-          id: attributes.sub,
-          email: attributes.email,
-          emailVerified: attributes["email_verified"]
-        });
-        setTokens({
-          idToken: signInUserSession.idToken.jwtToken,
-          accessToken: signInUserSession.accessToken.jwtToken,
-          refreshToken: signInUserSession.refreshToken.token
+        setAuthState({
+          user: {
+            id: attributes.sub,
+            email: attributes.email,
+            emailVerified: attributes["email_verified"]
+          },
+          tokens: {
+            idToken: signInUserSession.idToken.jwtToken,
+            accessToken: signInUserSession.accessToken.jwtToken,
+            refreshToken: signInUserSession.refreshToken.token
+          },
+          isAuthenticated: true
         });
       }).catch(() => {
-        setUser(null);
-        setTokens(null);
+        setAuthState({
+          user: null,
+          tokens: null,
+          isAuthenticated: false
+        });
       });
     };
     const updateUserListener = import_aws_amplify.Hub.listen("auth", updateUser);
@@ -73,13 +82,14 @@ var AuthProvider = ({ children }) => {
       updateUserListener();
     };
   }, []);
-  const isAuthenticated = !!user;
+  if (isAuthenticated === void 0) {
+    return null;
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthContext.Provider, { value: { signOut, isAuthenticated, user, tokens }, children });
 };
 var useAuth = () => {
   return React.useContext(AuthContext);
 };
-var AuthProvider_default = AuthProvider;
 
 // src/Auth.tsx
 var React3 = __toESM(require("react"));
@@ -239,9 +249,10 @@ var createAuthTemplate = ({
   autoVerifiedAttributes = ["email"],
   identityPool = true,
   roles,
-  schema
+  schema,
+  usernameAttributes = ["email"]
 } = {}) => {
-  const AutoVerifiedAttributes = Array.isArray(autoVerifiedAttributes) && autoVerifiedAttributes.length > 0 ? autoVerifiedAttributes : void 0;
+  const AutoVerifiedAttributes = Array.isArray(autoVerifiedAttributes) && autoVerifiedAttributes.length > 0 ? autoVerifiedAttributes : [];
   const template = {
     AWSTemplateFormatVersion: "2010-09-09",
     Resources: {
@@ -260,7 +271,7 @@ var createAuthTemplate = ({
             }
           },
           Schema: schema,
-          UsernameAttributes: ["email"],
+          UsernameAttributes: usernameAttributes,
           UsernameConfiguration: {
             CaseSensitive: false
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/react-auth",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "ttoss authentication module for React apps.",
   "license": "UNLICENSED",
   "author": "ttoss",
@@ -34,7 +34,7 @@
     "react": ">=16.8.0"
   },
   "devDependencies": {
-    "@ttoss/cloud-auth": "^0.4.0",
+    "@ttoss/cloud-auth": "^0.5.0",
     "@ttoss/config": "^1.27.0",
     "@ttoss/i18n-cli": "^0.3.1",
     "@ttoss/react-i18n": "^1.18.4",
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2bf304efc726a34b95859bb9b6fe8749c1a16844"
+  "gitHead": "6c5898425e2847fed46511ae1e573ff8dc3eb1d4"
 }

package/src/AuthProvider.tsx

@@ -29,30 +29,41 @@ const AuthContext = React.createContext<{
   tokens: null,
 });
 
-const AuthProvider = ({ children }: { children: React.ReactNode }) => {
-  const [user, setUser] = React.useState<User>(null);
-
-  const [tokens, setTokens] = React.useState<Tokens>(null);
+export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
+  const [{ user, tokens, isAuthenticated }, setAuthState] = React.useState<{
+    user: User;
+    tokens: Tokens;
+    isAuthenticated: boolean | undefined;
+  }>({
+    user: null,
+    tokens: null,
+    isAuthenticated: undefined,
+  });
 
   React.useEffect(() => {
     const updateUser = () => {
       Auth.currentAuthenticatedUser()
         .then(({ attributes, signInUserSession }) => {
-          setUser({
-            id: attributes.sub,
-            email: attributes.email,
-            emailVerified: attributes['email_verified'],
-          });
-
-          setTokens({
-            idToken: signInUserSession.idToken.jwtToken,
-            accessToken: signInUserSession.accessToken.jwtToken,
-            refreshToken: signInUserSession.refreshToken.token,
+          setAuthState({
+            user: {
+              id: attributes.sub,
+              email: attributes.email,
+              emailVerified: attributes['email_verified'],
+            },
+            tokens: {
+              idToken: signInUserSession.idToken.jwtToken,
+              accessToken: signInUserSession.accessToken.jwtToken,
+              refreshToken: signInUserSession.refreshToken.token,
+            },
+            isAuthenticated: true,
           });
         })
         .catch(() => {
-          setUser(null);
-          setTokens(null);
+          setAuthState({
+            user: null,
+            tokens: null,
+            isAuthenticated: false,
+          });
         });
     };
 
@@ -68,7 +79,9 @@ const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
   }, []);
 
-  const isAuthenticated = !!user;
+  if (isAuthenticated === undefined) {
+    return null;
+  }
 
   return (
     <AuthContext.Provider value={{ signOut, isAuthenticated, user, tokens }}>
@@ -80,5 +93,3 @@ const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 export const useAuth = () => {
   return React.useContext(AuthContext);
 };
-
-export default AuthProvider;

package/src/index.ts

@@ -1,3 +1,3 @@
-export { default as AuthProvider, useAuth } from './AuthProvider';
+export { AuthProvider, useAuth } from './AuthProvider';
 export { Auth } from './Auth';
 export * from './types';