metamigo: do nextauth v3 -> v4 upgrades

apps/metamigo-cli/package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@digiresilience/montar": "*",
     "@digiresilience/metamigo-config": "*",
+    "@digiresilience/metamigo-common": "*",
     "@digiresilience/metamigo-db": "*",
     "@digiresilience/metamigo-api": "*",
     "@digiresilience/metamigo-worker": "*",
@@ -32,7 +33,9 @@
     "typescript": "^5.0.4"
   },
   "scripts": {
+    "migrate": "NODE_ENV=development node --unhandled-rejections=strict build/main/index.js db -- migrate",
     "build": "tsc -p tsconfig.json",
+    "dev": "NODE_ENV=development node --unhandled-rejections=strict build/main/index.js api",
     "cli": "NODE_ENV=development node --unhandled-rejections=strict build/main/index.js",
     "fix:lint": "eslint src --ext .ts --fix",
     "fmt": "prettier \"src/**/*.ts\" --write",

apps/metamigo-cli/src/config.ts

@@ -6,7 +6,7 @@ import { IAppConfig, IAppConvict } from "@digiresilience/metamigo-config";
 import { loadConfigRaw } from "@digiresilience/metamigo-config";
 
 export const genConf = async (): Promise<void> => {
-  const c = await loadConfigRaw() as any;
+  const c = (await loadConfigRaw()) as any;
   const generated = generateConfig(c) as any;
   console.log(generated);
 };
@@ -17,6 +17,6 @@ export const genSchema = async (): Promise<void> => {
 };
 
 export const listConfig = async (): Promise<void> => {
-  const c = await loadConfigRaw() as any;
+  const c = (await loadConfigRaw()) as any;
   printConfigOptions(c);
 };

apps/metamigo-cli/src/metamigo-postgraphile.ts

@@ -11,7 +11,7 @@ import pg from "pg";
 import { loadConfig } from "@digiresilience/metamigo-config";
 import { getPostGraphileOptions } from "@digiresilience/metamigo-db";
 
-const {Pool} = pg;
+const { Pool } = pg;
 
 export const exportGraphqlSchema = async (): Promise<void> => {
   const config = await loadConfig();

apps/metamigo-frontend/.env.local

@@ -1 +0,0 @@
-METAMIGO_CONFIG=.metamigo.local.json

apps/metamigo-frontend/lib/nextauth-adapter.ts

@@ -1,8 +1,5 @@
 /* eslint-disable  unicorn/no-null */
-/* eslint-disable  max-params */
-import type { Adapter } from "next-auth/adapters";
-// @ts-expect-error: Missing export
-import type { AppOptions } from "next-auth";
+import type { Adapter, AdapterAccount, AdapterSession, AdapterUser } from "next-auth/adapters";
 import * as Wreck from "@hapi/wreck";
 import * as Boom from "@hapi/boom";
 
@@ -70,7 +67,7 @@ export const MetamigoAdapter = (config: IAppConfig): Adapter => {
     json: "force",
   });
 
-  async function getAdapter(_appOptions: AppOptions) {
+  function getAdapter(): Adapter {
     async function createUser(profile: Profile) {
       try {
         if (!profile.createdBy) profile = { ...profile, createdBy: "nextauth" };
@@ -106,19 +103,17 @@ export const MetamigoAdapter = (config: IAppConfig): Adapter => {
       }
     }
 
-    async function getUserByProviderAccountId(
-      providerId: string,
-      providerAccountId: string
-    ) {
+    async function getUserByAccount({ providerAccountId, provider }: { providerAccountId: string, provider: string }) {
       try {
         const { payload } = await wreck.get(
-          `getUserByProviderAccountId/${providerId}/${providerAccountId}`
+          `getUserByAccount/${provider}/${providerAccountId}`
         );
 
         return payload;
       } catch (error) {
         if (Boom.isBoom(error, 404)) return null;
-        throw new Error("GET_USER_BY_PROVIDER_ACCOUNT_ID");
+        console.log(error)
+        throw new Error("GET_USER_BY_ACCOUNT");
       }
     }
 
@@ -135,51 +130,39 @@ export const MetamigoAdapter = (config: IAppConfig): Adapter => {
     }
 
     async function linkAccount(
-      userId: string,
-      providerId: string,
-      providerType: string,
-      providerAccountId: string,
-      refreshToken: string,
-      accessToken: string,
-      accessTokenExpires: number
+      account: AdapterAccount
     ) {
       try {
-        const payload = {
-          userId,
-          providerId,
-          providerType,
-          providerAccountId: `${providerAccountId}`, // must be a string
-          refreshToken,
-          accessToken,
-          accessTokenExpires,
-        };
-        await wreck.put("linkAccount", {
-          payload,
-        });
-      } catch {
+        await wreck.put("linkAccount", {payload: account} as any );
+      } catch(error) {
+        console.log(error);
         throw new Error("LINK_ACCOUNT_ERROR");
       }
     }
 
     async function createSession(user: User) {
       try {
-        const { payload } = await wreck.post("createSession", {
+        const { payload }: {payload: AdapterSession} = await wreck.post("createSession", {
           payload: user,
         });
-
+        payload.expires = new Date(payload.expires)
         return payload;
-      } catch {
+      } catch(error) {
+        console.log(error)
         throw new Error("CREATE_SESSION_ERROR");
       }
     }
 
-    async function getSession(sessionToken: string) {
+    async function getSessionAndUser(sessionToken: string) {
       try {
-        const { payload } = await wreck.get(`getSession/${sessionToken}`);
-        return payload;
+        const {payload}: {payload: any} = await wreck.get(`getSessionAndUser/${sessionToken}`);
+        const { session, user }: {session: AdapterSession, user: AdapterUser} = payload;
+        session.expires = new Date(session.expires)
+        return {session, user}
       } catch (error) {
+        console.log(error)
         if (Boom.isBoom(error, 404)) return null;
-        throw new Error("GET_SESSION_ERROR");
+        throw new Error("GET_SESSION_AND_USER_ERROR");
       }
     }
 
@@ -213,21 +196,18 @@ export const MetamigoAdapter = (config: IAppConfig): Adapter => {
       createUser,
       getUser,
       getUserByEmail,
-      getUserByProviderAccountId,
+      getUserByAccount,
       updateUser,
       // deleteUser,
       linkAccount,
       // unlinkAccount,
       createSession,
-      getSession,
+      getSessionAndUser,
       updateSession,
       deleteSession,
       // @ts-expect-error: Type error
     } as AdapterInstance<Profile, User, Session, unknown>;
   }
 
-  return {
-    // @ts-expect-error: non-existent property
-    getAdapter,
-  };
+  return getAdapter();
 };

apps/metamigo-frontend/pages/api/auth/[...nextauth].ts

@@ -7,6 +7,7 @@ import Cognito from "next-auth/providers/cognito";
 import { loadConfig, IAppConfig } from "@digiresilience/metamigo-config";
 import { MetamigoAdapter } from "../../../lib/nextauth-adapter";
 import { CloudflareAccessProvider } from "../../../lib/cloudflare";
+import { AdapterSession, AdapterUser } from "next-auth/adapters";
 
 const nextAuthOptions = (config: IAppConfig, req: NextApiRequest) => {
   const { nextAuth, cfaccess } = config;
@@ -72,11 +73,6 @@ const nextAuthOptions = (config: IAppConfig, req: NextApiRequest) => {
     providers,
     adapter,
     callbacks: {
-      async session(session: any, token: any) {
-        // make the user id available in the react client
-        session.user.id = token.userId;
-        return session;
-      },
       async jwt(token: any, user: any) {
         const isSignIn = Boolean(user);
         // Add auth_time to token on signin in