Login/logout updates

apps/link/app/(login)/login/_components/Login.tsx

@@ -27,8 +27,11 @@ type LoginProps = {
 };
 
 export const Login: FC<LoginProps> = ({ session, baseURL }) => {
-  const origin = baseURL;
-  const callbackUrl = `${origin}/setup`;
+  let origin = null;
+  if (typeof window !== "undefined") {
+    origin = window.location.origin;
+  }
+  const callbackUrl = `${origin}/link`;
   const [provider, setProvider] = useState(undefined);
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
@@ -188,7 +191,7 @@ export const Login: FC<LoginProps> = ({ session, baseURL }) => {
                         sx={buttonStyles}
                         onClick={() =>
                           signIn("azure-ad", {
-                            callbackUrl: `${origin}`,
+                            callbackUrl,
                           })
                         }
                       >
@@ -225,13 +228,13 @@ export const Login: FC<LoginProps> = ({ session, baseURL }) => {
                       <Grid item sx={{ width: "100%" }}>
                         <IconButton
                           sx={buttonStyles}
-                          onClick={() =>
+                          onClick={() => {
                             signIn("credentials", {
                               email,
                               password,
                               callbackUrl,
-                            })
-                          }
+                            });
+                          }}
                         >
                           <KeyIcon sx={{ mr: 1 }} />
                           Sign in with Zammad credentials

apps/link/app/(main)/_components/Sidebar.tsx

@@ -207,10 +207,6 @@ export const Sidebar: FC<SidebarProps> = ({
     return () => clearInterval(interval);
   }, []);
 
-  const logout = () => {
-    signOut({ callbackUrl: "/login" });
-  };
-
   return (
     <Drawer
       sx={{ width: open ? openWidth : closedWidth, flexShrink: 0 }}
@@ -627,7 +623,6 @@ export const Sidebar: FC<SidebarProps> = ({
               Icon={LogoutIcon}
               iconSize={20}
               open={open}
-              onClick={logout}
             />
           </List>
         </Grid>

apps/link/app/(main)/logout/page.tsx

@@ -11,7 +11,7 @@ export default function Page() {
         headers: { "Content-Type": "application/json" },
         credentials: "same-origin",
       });
-      signOut({ callbackUrl: "/login" });
+      signOut({ callbackUrl: "/link/login" });
     };
     multistepSignOut();
   }, []);