ar(temp) auth stuff messy

lib/auth/constants.ts

@@ -11,26 +11,37 @@ export const providers = [
 const methods = {
   signIn: () => {},
   signOut: async () => {
-    console.log('start signout');
-    const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/signout`, {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ csrfToken: await methods.getCsrf() }),
-    });
-    return response;
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/signout`, {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ csrfToken: await methods.getCsrf() }),
+      });
+      return response;
+    } catch (e) {
+      console.error(e);
+    }
   },
   getCsrf: async () => {
-    const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`);
-    const csrf = await response.json();
-    return csrf.csrfToken;
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`);
+      const csrf = await response.json();
+      return csrf.csrfToken;
+    } catch (e) {
+      console.error(e);
+    }
   },
   getSession: async () => {
-    const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`);
-    const session = await response.json();
-    return session;
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`);
+      const session = await response.json();
+      return session;
+    } catch (e) {
+      console.error(e);
+    }
   },
 };
 

lib/model/decorators/hypnos-public-decorator.ts

@@ -1,11 +1,10 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0, @typescript-eslint/no-unused-vars:0 */
 // hypnos-public-decorator.ts input: hypnos meta; output: decorated hypnos meta;
 'use server';
-import type { UserSchema } from '@types';
 import type { ICard } from '@dreampipcom/oneiros';
 
 /* private */
-const decorateListing = (listing: Record<string, any>, uMeta: UserSchema): ICard => {
+const decorateListing = (listing: Record<string, any>, uMeta: any): ICard => {
   const decd: ICard = {
     id: `list__card--${listing?.title?.es}`,
     className: '',
@@ -29,6 +28,6 @@ const decorateListing = (listing: Record<string, any>, uMeta: UserSchema): ICard
 /* public */
 export const decorateHypnosPublicListings = async (listings: Record<string, any>[], uid: string): Promise<ICard[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: ICard[] = listings?.map((card) => decorateListing(card, { email: uid } as UserSchema));
+  const decd: ICard[] = listings?.map((card) => decorateListing(card, { email: uid }));
   return decd;
 };

lib/model/decorators/rm-decorator.ts

@@ -1,10 +1,10 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0 */
 // rm-decorator.ts input: rm meta; output: decorated rm meta;
 'use server';
-import type { IDCharacter, INCharacter, UserSchema } from '@types';
+import type { IDCharacter, INCharacter } from '@types';
 
 /* private */
-const decorateCharacter = (character: INCharacter, uMeta: UserSchema): IDCharacter => {
+const decorateCharacter = (character: INCharacter, uMeta: any): IDCharacter => {
   const decd: IDCharacter = { ...character };
   decd.favorite = undefined;
   if (uMeta?.rickmorty?.favorites?.characters?.includes(character?.id)) decd.favorite = true;
@@ -15,6 +15,6 @@ const decorateCharacter = (character: INCharacter, uMeta: UserSchema): IDCharact
 /* public */
 export const decorateRMCharacters = async (characters: INCharacter[], uid: string): Promise<IDCharacter[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: IDCharacter[] = characters.map((char) => decorateCharacter(char, { email: uid } as UserSchema));
+  const decd: IDCharacter[] = characters.map((char) => decorateCharacter(char, { email: uid }));
   return decd;
 };

src/app/components/client/blocks/topnav-view.tsx

@@ -15,8 +15,7 @@ interface IAuthProvider {
 }
 
 interface VTopNavProps {
-  providers: IAuthProvider[];
-  user?: UserSchema;
+  user?: any;
 }
 
 export const VTopNav = ({ user }: VTopNavProps) => {

src/app/components/client/elements/signin-view.tsx

@@ -3,9 +3,8 @@
 import { useContext, useEffect, useRef } from 'react';
 import { signOut } from '@auth';
 import { AuthContext, GlobalContext } from '@state';
-import { ALogIn, ALogOut } from '@actions';
+import { ALogOut } from '@actions';
 import { navigate } from '@gateway';
-import { UserSchema } from '@types';
 import { Button as DPButton } from '@dreampipcom/oneiros';
 
 interface IAuthProvider {
@@ -15,46 +14,30 @@ interface IAuthProvider {
 
 interface VSignInProps {
   className?: string;
-  providers: IAuthProvider[];
-  user?: UserSchema;
+  user?: any;
 }
 
 async function doSignOut() {
   await signOut();
   location.reload()
 }
 
-export const VSignIn = ({ providers, user }: VSignInProps) => {
+export const VSignIn = ({ user }: VSignInProps) => {
   const authContext = useContext(AuthContext);
   const { authd, name } = authContext;
 
   const globalContext = useContext(GlobalContext);
   const { theme } = globalContext;
 
-  const [isUserLoaded, loadUser] = ALogIn({});
   const [, unloadUser] = ALogOut({});
   const initd = useRef(false);
 
 
-  useEffect(() => {
-    if (!isUserLoaded && user && !initd.current) {
-      loadUser({
-        authd: true,
-        name: user.name,
-        avatar: user.image,
-        email: user.email,
-      });
-      initd.current = true;
-    }
-  }, [isUserLoaded, loadUser]);
-
   const handleSignOut = async () => {
     unloadUser();
     await doSignOut();
   };
 
-  // if (!providers) return;
-
   if (user || authd)
     return (
       <div>

src/app/components/client/elements/signup-view.tsx

@@ -1,14 +1,12 @@
 // signup-view.ts
 'use client';
-import { signIn, signOut, getCsrf } from "@auth";
+import { clsx } from "clsx";
 import { useContext, useEffect, useRef, useState } from 'react';
+import { signIn, signOut, getCsrf } from "@auth";
 import { AuthContext } from '@state';
 import { ALogIn, ALogOut } from '@actions';
 import { navigate } from '@gateway';
-import { UserSchema } from '@types';
-import { Button, TextInput } from "@dreampipcom/oneiros";
-import { clsx } from "clsx";
-import { Logo, Typography } from '@dreampipcom/oneiros';
+import { Button, TextInput, Logo, Typography  } from "@dreampipcom/oneiros";
 
 interface IAuthProvider {
   id?: string;
@@ -19,7 +17,7 @@ interface IAuthProvider {
 
 interface VSignUpProps {
   providers: IAuthProvider[];
-  user?: UserSchema;
+  user?: any;
   csrf?: string;
 }
 
@@ -28,8 +26,8 @@ async function doSignOut() {
   location.reload();
 }
 
-async function doSignIn(id?: string, value?: SignInOptions) {
-  await signIn(id, value);
+async function doSignIn() {
+  await signIn();
 }
 
 
@@ -68,7 +66,7 @@ export const VSignUp = ({ providers, user }: VSignUpProps) => {
     }
   }, [isUserLoaded, loadUser]);
 
-  const handleSignIn = async (id?: string, value?: SignInOptions) => {
+  const handleSignIn = async () => {
     // location.reload()
   };
 

src/app/components/server/navbar-controller.tsx

@@ -1,11 +1,11 @@
 // navbar-controller.tsx
 'use server';
-import type { IFeature, UserSchema } from '@types';
+import type { IFeature } from '@types';
 import { getUser } from '@gateway';
 import { VNavBar } from '@components/client';
 
 interface INavBarData {
-  user: UserSchema;
+  user: any;
 }
 
 async function getEnabledFeatures(): Promise<INavBarData> {

src/app/components/server/signup-controller.tsx

@@ -22,16 +22,7 @@ interface IAuthProviders {
   name?: string;
 }
 
-async function getProvidersData(): Promise<ISignInData> {
-  const providers = (await getProviders()) as unknown as IAuthProviders[];
-  return { providers: providers ?? [] };
-}
-
 export const CSignUp = async ({ user }: ISignInProps) => {
 	const csrf = await getCsrf();
-  const props: ISignInData = await getProvidersData()
-  const providers: IAuthProviders[] = props?.providers || []
-
-
   return <VSignUp providers={providers} csrf={csrf} />
 }

src/app/components/server/usersettings-controller.tsx

@@ -5,7 +5,7 @@ import { getUser } from '@gateway';
 import { VUserSettings } from '@components/client';
 
 interface INavBarData {
-  user: UserSchema;
+  user: any;
 }
 
 async function getEnabledFeatures(): Promise<INavBarData> {

src/app/gateway/client/actions.ts

@@ -3,6 +3,5 @@
 import { redirect } from 'next/navigation';
 
 export async function navigate(url: string) {
-  console.log('redirecting');
   redirect(url);
 }

src/app/gateway/server/actions.ts

@@ -1,7 +1,7 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0 */
 // actions.ts
 'use server';
-import type { UserSchema } from '@types';
+// import type { UserSchema } from '@types';
 import { getRMCharacters } from '@controller';
 import { decorateRMCharacters } from '@model';
 import { getSession } from '@auth';
@@ -38,7 +38,7 @@ export async function getUser() {
   // const email = session?.user?.email || '';
   // const user = await getUserMeta(email);
 
-  return { user: { email: 'lorem' } as UserSchema };
+  return { user: { email: 'lorem' } };
   // we might need to decorate users in the future,
   // reference decorateRMCharactes()
 }

src/app/gateway/server/hypnos/public/actions.ts

@@ -1,7 +1,7 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0 */
 // hypnos/public/actions.ts
 'use server';
-import type { UserSchema } from '@types';
+// import type { UserSchema } from '@types';
 import { getHypnosPublicListings } from '@controller';
 import { decorateHypnosPublicListings } from '@model';
 import { getSession } from '@auth';
@@ -37,7 +37,7 @@ export async function getUser() {
   // const email = session?.user?.email || '';
   // const user = await getUserMeta(email);
 
-  return { user: { email: 'lorem' } as UserSchema };
+  return { user: { email: 'lorem' } as any };
   // we might need to decorate users in the future,
   // reference decorateRMCharactes()
 }