cleanup

zitadel · Jan 24, 2024 · 7f8f54b · 7f8f54b
1 parent c73f31e
commit 7f8f54b
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-lib/node_modules
+lib/node_modules
+dist/
+lib/dist/
diff --git a/lib/dist/lib/src/index.d.ts b/lib/dist/lib/src/index.d.ts
diff --git a/lib/dist/lib/src/index.js b/lib/dist/lib/src/index.js
diff --git a/lib/dist/lib/src/zitadelAuth.d.ts b/lib/dist/lib/src/zitadelAuth.d.ts
diff --git a/lib/dist/lib/src/zitadelAuth.js b/lib/dist/lib/src/zitadelAuth.js
diff --git a/lib/dist/src/components/Callback.d.ts b/lib/dist/src/components/Callback.d.ts
diff --git a/lib/dist/src/components/Callback.js b/lib/dist/src/components/Callback.js
diff --git a/lib/dist/src/components/Login.d.ts b/lib/dist/src/components/Login.d.ts
diff --git a/lib/dist/src/components/Login.js b/lib/dist/src/components/Login.js
diff --git a/src/App.css b/src/App.css
@@ -37,6 +37,15 @@ button {
   border: 1px solid #333333;
 }
 
+.user {
+  font-size: 1rem;
+}
+
+.user .description {
+  font-size: 1rem;
+  margin-bottom: 1rem;
+}
+
 @keyframes App-logo-spin {
   from {
     transform: rotate(0deg);

diff --git a/src/App.tsx b/src/App.tsx
@@ -23,7 +23,7 @@ function App() {
     zitadel.signout();
   }
 
-  const [authenticated, setAuthenticated] = useState<boolean>(false);
+  const [authenticated, setAuthenticated] = useState<boolean | null>(null);
   const [userInfo, setUserInfo] = useState(null);
 
   useEffect(() => {

diff --git a/src/components/Callback.tsx b/src/components/Callback.tsx
@@ -2,8 +2,8 @@ import { useEffect } from "react";
 
 type Props = {
   issuer: string;
-  authenticated: boolean;
-  setAuth: (authenticated: boolean) => void;
+  authenticated: boolean | null;
+  setAuth: (authenticated: boolean | null) => void;
   userManager: any;
   userInfo: any;
   setUserInfo: any;
@@ -19,9 +19,8 @@ const Callback = ({
   handleLogout,
 }: Props) => {
   useEffect(() => {
-    if (authenticated === false) {
-      userManager
-        .signinRedirectCallback()
+    if (authenticated === null || userInfo === null) {
+      userManager()
         .then((user: any) => {
           if (user) {
             setAuth(true);
@@ -45,12 +44,11 @@ const Callback = ({
         });
     }
   }, [authenticated, userManager, setAuth]);
-  console.log(authenticated, userInfo);
   if (authenticated === true && userInfo) {
     return (
-      <div>
+      <div className="user">
         <h1>Welcome, {userInfo.name}!</h1>
-        <h2>Your ZITADEL Profile Information</h2>
+        <p className="description">Your ZITADEL Profile Information</p>
         <h3>Name: {userInfo.name}</h3>
         <h3>Email: {userInfo.email}</h3>
         <h3>Email Verified: {userInfo.email_verified ? "Yes" : "No"}</h3>

diff --git a/src/components/Login.tsx b/src/components/Login.tsx
@@ -2,7 +2,7 @@ import { Navigate } from "react-router-dom";
 
 type Props = {
   handleLogin: () => void;
-  authenticated: boolean;
+  authenticated: boolean | null;
 };
 const Login = ({ authenticated, handleLogin }: Props) => {
   return (