Rebase/20240720

lib/auth/constants.ts

@@ -1,5 +1,4 @@
 // constants.ts TS-Doc?
-
 export const providers = [
   { id: 'email', name: 'Email', type: 'email' },
   { id: 'github', name: 'GitHub', type: 'oauth' },
@@ -27,17 +26,25 @@ const methods = {
   },
   getCsrf: async () => {
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`);
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`, { credentials: 'include' });
       const csrf = await response.json();
       return csrf.csrfToken;
     } catch (e) {
       console.error(e);
     }
   },
-  getSession: async () => {
+  getSession: async (params = { cookies: '' }) => {
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`);
-      const session = await response.json();
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`, {
+        method: 'GET',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          Cookie: params?.cookies,
+        },
+        credentials: 'include',
+      });
+      const session = await response?.json();
       return session;
     } catch (e) {
       console.error(e);

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

@@ -6,7 +6,7 @@ import type { ICard } from '@dreampipcom/oneiros';
 /* private */
 const decorateListing = (listing: Record<string, any>, uMeta: any): ICard => {
   const decd: ICard = {
-    id: `list__card--${listing?.title?.es}`,
+    id: `${listing.id}`,
     className: '',
     title: `${listing?.title?.es}`,
     where: `${listing?.location?.name}`,
@@ -16,18 +16,17 @@ const decorateListing = (listing: Record<string, any>, uMeta: any): ICard => {
     link: 'https://www.dreampip.com',
     badgeLink: 'https://www.dreampip.com',
     rating: '3/5',
-    selected: false,
+    selected: uMeta?.favorites?.includes(listing.id),
   } as Record<string, any> as ICard;
   // decd.favorite = undefined;
   // if (uMeta?.rickmorty?.favorites?.characters?.includes(character?.id)) decd.favorite = true;
   // else decd.favorite = false;
-
   return decd;
 };
 
 /* public */
-export const decorateHypnosPublicListings = async (listings: Record<string, any>[], uid: string): Promise<ICard[]> => {
+export const decorateHypnosPublicListings = async (listings: Record<string, any>[], uMeta: any): Promise<ICard[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: ICard[] = listings?.map((card) => decorateListing(card, { email: uid }));
+  const decd: ICard[] = listings?.map((card) => decorateListing(card, uMeta));
   return decd;
 };

lib/model/decorators/rm-decorator.ts

@@ -1,20 +1,33 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0 */
 // rm-decorator.ts input: rm meta; output: decorated rm meta;
 'use server';
-import type { IDCharacter, INCharacter } from '@types';
+import type { ICard } from '@dreampipcom/oneiros';
+import type { INCharacter } from '@types';
 
 /* private */
-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;
-  else decd.favorite = false;
+const decorateCharacter = (character: INCharacter, uMeta: any): ICard => {
+  const decd: ICard = {
+    id: `list__char--${character?.name}`,
+    className: '',
+    // onLike: () => {},
+    title: `${character?.name}`,
+    where: `${character?.location?.name}`,
+    when: `${character?.status}`,
+    image: `${character?.image}`,
+    price: '299€',
+    link: 'https://www.dreampip.com',
+    badgeLink: 'https://www.dreampip.com',
+    rating: '3/5',
+    selected: uMeta?.favorites?.includes(character.id),
+  } as Record<string, any> as ICard;
+
   return decd;
 };
 
 /* public */
-export const decorateRMCharacters = async (characters: INCharacter[], uid: string): Promise<IDCharacter[]> => {
+export const decorateRMCharacters = async (characters: INCharacter[], uMeta: any): Promise<ICard[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: IDCharacter[] = characters.map((char) => decorateCharacter(char, { email: uid }));
+  const decd: ICard[] = characters.map((char) => decorateCharacter(char, uMeta));
+  console.log({ characters, uMeta, decd });
   return decd;
 };

lib/model/interfaces/index.ts

@@ -11,3 +11,4 @@ export { DATABASE_STRING, DATABASE_USERS_STRING, DATABASE_ORGS_STRING } from './
 export { getCharacters as getRMCharacters } from './services/rickmorty/rm-connector';
 
 export { getPublicListings as getHypnosPublicListings } from './services/hypnos/public/hypnos-public-connector';
+export { updateUserFavoriteListings } from './services/hypnos/private/hypnos-private-user-connector';

lib/model/interfaces/services/hypnos/private/hypnos-private-user-connector.ts

@@ -0,0 +1,55 @@
+// hypnos-private-user-like-listing.ts
+// rm-connector.ts
+// to-do: use prisma for graph type
+import type { ICard } from '@dreampipcom/oneiros';
+
+import { cookies } from 'next/headers';
+// const CHARS = `
+// query {
+//   characters() {
+//     info {
+//       count
+//     }
+//     results {
+//       id
+//       name
+//       status
+//       origin {
+//         name
+//       }
+//       location {
+//         name
+//       }
+//       image
+//     }
+//   }
+// }
+// `;
+
+async function fetchREPL({ paramsStr, method, listings }: any) {
+  // to-do: might be worth hardcoding the api in case too many middleware requests are billed
+  try {
+    const cookieStore = cookies();
+    const cookieString = cookieStore.toString();
+    const payload = JSON.stringify({ listings });
+    const req = await fetch(`${process.env.API_HOST}/api/v1/user${paramsStr}`, {
+      method,
+      headers: {
+        'Content-Type': 'application/json',
+        cookies: cookieString,
+      },
+      body: payload,
+      credentials: 'include',
+    });
+    const json = await req.json();
+    return json;
+  } catch (e) {
+    return { ok: false, status: 500, message: JSON.stringify(e), data: [] };
+  }
+}
+
+export const updateUserFavoriteListings: ({ paramsStr }: any) => Promise<ICard[]> = async ({ listings }) => {
+  const entries = await fetchREPL({ paramsStr: '', method: 'PATCH', listings });
+  const response = entries?.data;
+  return response;
+};

lib/model/interfaces/services/hypnos/private/index.ts

@@ -0,0 +1,2 @@
+// index.ts
+export { updateUserFavoriteListings } from './hypnos-private-user-connector';

lib/model/interfaces/services/index.ts

@@ -1,10 +1,12 @@
 // index.ts
 import * as rickmorty from './rickmorty';
 import * as hypnosPublic from './hypnos/public';
+import * as hypnosPrivate from './hypnos/private';
 
 const services = {
   rickmorty,
   hypnosPublic,
+  hypnosPrivate,
 };
 
 export default services;

lib/state/context-auth.ts

@@ -6,6 +6,7 @@ import { createContext } from 'react';
 export const AuthContext = createContext<IAuthContext>({
   authd: false,
   name: '',
+  user: {},
   setter: undefined,
   history: [],
 });

lib/types/contexts.d.ts

@@ -9,7 +9,7 @@ export interface History {
 }
 
 export interface INCharacter {
-  id: number;
+  id: string;
   name: string;
   status: string;
   image: string;
@@ -31,7 +31,7 @@ export interface IAuthContext extends History {
   authd?: boolean;
   name?: string;
   email?: string;
-  meta?: UserSchema;
+  user?: UserSchema;
 }
 
 export interface IGlobalContext extends History {

lib/types/users.d.ts

@@ -9,10 +9,10 @@ export interface UserDecoration {
   /* temp optional */
   username?: string;
   bio?: string;
-  organizations: DUserOrgAmbiRelation[];
-  rickmorty: {
-    favorites: {
-      characters: INCharacter['id'][];
+  organizations?: DUserOrgAmbiRelation[];
+  rickmorty?: {
+    favorites?: {
+      characters?: INCharacter['id'][];
     };
   };
 }

package.json

@@ -18,7 +18,7 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@dreampipcom/oneiros": "0.0.5",
+    "@dreampipcom/oneiros": "0.0.6",
     "@sentry/nextjs": "7.118.0",
     "next": "14.2.4",
     "react": "18",

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

@@ -43,9 +43,10 @@ export const VTopNav = ({ user }: VTopNavProps) => {
     if (!isUserLoaded && _user && !initd.current) {
       loadUser({
         authd: true,
-        name: user?.name || user?.email,
-        avatar: user?.image,
-        email: user?.email,
+        name: _user?.name || _user?.email,
+        avatar: _user?.image,
+        email: _user?.email,
+        user: _user,
       });
       initd.current = true;
     }

src/app/components/client/elements/hypnos-list-view.tsx

@@ -22,7 +22,7 @@ type VHPNPListingProps = VListingListProps;
 export const VHPNPList = ({ listings }: VHPNPListingProps) => {
   const hypnosPublicContext = useContext(HypnosPublicContext);
 
-  const { authd, email } = useContext(AuthContext);
+  const { authd, email, user } = useContext(AuthContext);
 
   const globalContext = useContext(GlobalContext);
   const { theme } = globalContext;
@@ -37,9 +37,9 @@ export const VHPNPList = ({ listings }: VHPNPListingProps) => {
 
   const dispatchAddToFavorites = async (cid?: number) => {
     const func = async (payload: IDPayload) => {
-      await addToFavorites();
+      await addToFavorites({ listings: [cid] });
       const op_2 = await loadHypnosPublicListings();
-      loadListings({ characters: op_2 });
+      loadListings({ listings: op_2 });
     };
     favListing({ email, cid }, func);
   };
@@ -77,7 +77,7 @@ export const VHPNPList = ({ listings }: VHPNPListingProps) => {
   if (authd) {
     return (
       <article>
-        <DPCardGrid cards={currentListings} theme={theme} />
+        <DPCardGrid cards={currentListings} theme={theme} onLikeCard={dispatchAddToFavorites} />
       </article>
     );
   }

src/app/components/client/elements/rm-list-view.tsx

@@ -1,5 +1,6 @@
 // list-view.tsx
 'use client';
+import type { ICard } from '@dreampipcom/oneiros';
 import type { INCharacter, IDPayload } from '@types';
 
 import { useContext, useEffect, useRef, useMemo } from 'react';
@@ -13,7 +14,7 @@ import { CardGrid as DPCardGrid } from "@dreampipcom/oneiros";
 
 // to-do: character type annotations
 interface VCharactersListProps {
-  characters: INCharacter[];
+  characters: ICard[];
 }
 
 type VRMListProps = VCharactersListProps;
@@ -35,9 +36,9 @@ export const VRMList = ({ characters }: VRMListProps) => {
 
   const dispatchAddToFavorites = async (cid?: number) => {
     const func = async (payload: IDPayload) => {
-      await addToFavorites();
+      await addToFavorites({ listings: [cid] });
       const op_2 = await getChars();
-      loadChars({ characters: op_2 });
+      loadChars({ listings: op_2 });
     };
     favChar({ email, cid }, func);
   };
@@ -69,20 +70,12 @@ export const VRMList = ({ characters }: VRMListProps) => {
   }, []);
 
   const adaptedCharsToCards = useMemo(() => {
-    return chars?.map((char) => ({
-      id: `list__char--${char?.name}`,
-      className: '',
+    const res = chars?.map((char) => ({
+      ...char,
       onLike: () => {},
-      title: `${char?.name}`,
-      where: `${char?.location?.name}`,
-      when: `${char?.status}`,
-      image: `${char?.image}`,
-      price: '299€',
-      link: 'https://www.dreampip.com',
-      badgeLink: 'https://www.dreampip.com',
-      rating: '3/5',
-      selected: false,
     }))
+    console.log({ chars, res })
+    return res
   }, [chars]);
 
   if (!authd || !characters) return;

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

@@ -61,6 +61,7 @@ export const VSignUp = ({ providers, user }: VSignUpProps) => {
         name: user?.name || user?.email,
         avatar: user?.image,
         email: user?.email,
+        user,
       });
       initd.current = true;
     }

src/app/components/server/blocks/hypnos-public-list.tsx

@@ -2,7 +2,7 @@
 'use server';
 import type { ICard } from '@dreampipcom/oneiros';
 import { VHPNPList } from '@elements/client';
-import { loadHypnosPublicListings } from '@gateway';
+import { loadHypnosPublicListings, addToFavorites } from '@gateway';
 import { HypnosPublicProvider } from '@state';
 
 export const CHPNPList = async () => {

src/app/components/server/blocks/rm-list.tsx

@@ -1,12 +1,12 @@
 // list-controller.tsx
 'use server';
-import type { INCharacter } from '@types';
+import type { ICard } from '@dreampipcom/oneiros';
 import { VRMList } from '@elements/client';
 import { loadChars } from '@gateway';
 import { RickMortyProvider } from '@state';
 
 export const CRMList = async () => {
-  const characters: INCharacter[] = await loadChars();
+  const characters: ICard[] = await loadChars();
 
   return (
     <RickMortyProvider>