miolo 3.0.0-beta.176 → 3.0.0-beta.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "3.0.0-beta.176",
+  "version": "3.0.0-beta.178",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [

package/src/middleware/auth/passport/index.mjs

@@ -24,21 +24,18 @@ import { init_session_middleware } from "./session/index.mjs"
 //   google_url_logout_redirect: '/'
 // }
 
-const def_get_user_id = (user, done, _ctx) => done(null, user.id)
+const def_get_user_id = async (user, _ctx) => user?.id
 
-const def_find_user_by_id = (_id, done, _ctx) => {
-  const err = Error("You need to define auth.passport.find_user_by_id")
-  done(err, null)
+const def_find_user_by_id = async (_id, ctx) => {
+  throw new Error("You need to define auth.passport.find_user_by_id")
 }
 
-const def_local_auth_user = (_username, _password, done, _ctx) => {
-  const err = Error("You need to define auth.passport.local_auth_user")
-  done(err, null)
+const def_local_auth_user = async (_username, _password, _ctx) => {
+  throw new Error("You need to define auth.passport.local_auth_user")
 }
 
-const def_google_auth_user = (_accessToken, _refreshToken, _profile, done, _ctx) => {
-  const err = Error("You need to define auth.passport.google_auth_user")
-  done(err, null)
+const def_google_auth_user = async (_accessToken, _refreshToken, _profile, _ctx) => {
+  throw new Error("You need to define auth.passport.google_auth_user")
 }
 
 const init_passport_auth_middleware = (app, options, sessionConfig, cacheConfig) => {
@@ -82,10 +79,13 @@ const init_passport_auth_middleware = (app, options, sessionConfig, cacheConfig)
         ctx.sessionId = ctx.session?.externalKey
           ? ctx.getSessionStoreKey(ctx.session?.externalKey)
           : undefined
-        return get_user_id_f(user, done, ctx)
+        get_user_id_f(user, ctx).then((uid) => {
+          return done(null, uid || false)
+        })
       } catch (error) {
-        ctx.miolo.logger.error(`[auth][passport] Error serializing user: ${error}`)
-        return done(error, undefined)
+        const msg = `Error serializing user: ${error}`
+        ctx.miolo.logger.error(`[auth][passport] ${msg}`)
+        return done(null, false, { message: msg })
       }
     })
   }
@@ -97,10 +97,13 @@ const init_passport_auth_middleware = (app, options, sessionConfig, cacheConfig)
         ctx.sessionId = ctx.session?.externalKey
           ? ctx.getSessionStoreKey(ctx.session?.externalKey)
           : undefined
-        return find_user_by_id_f(id, done, ctx)
+        find_user_by_id_f(id, ctx).then((user) => {
+          return done(null, user || false)
+        })
       } catch (error) {
-        ctx.miolo.logger.error(`[auth][passport] Error deserializing user: ${error}`)
-        return done(error, undefined)
+        const msg = `Error deserializing user: ${error}`
+        ctx.miolo.logger.error(`[auth][passport] ${msg}`)
+        return done(null, false, { message: msg })
       }
     })
   }
@@ -110,7 +113,15 @@ const init_passport_auth_middleware = (app, options, sessionConfig, cacheConfig)
       ctx.sessionId = ctx.session?.externalKey
         ? ctx.getSessionStoreKey(ctx.session?.externalKey)
         : undefined
-      return local_auth_user_f(username, password, done, ctx)
+      try {
+        local_auth_user_f(username, password, ctx).then(([user, msg]) => {
+          return done(null, user || false, { message: msg || "" })
+        })
+      } catch (error) {
+        const msg = `Error local auth user: ${error}`
+        ctx.miolo.logger.error(`[auth][passport] ${msg}`)
+        return done(null, false, { message: msg })
+      }
     })
 
   let google_strategy
@@ -128,7 +139,15 @@ const init_passport_auth_middleware = (app, options, sessionConfig, cacheConfig)
           ctx.sessionId = ctx.session?.externalKey
             ? ctx.getSessionStoreKey(ctx.session?.externalKey)
             : undefined
-          return google_auth_user_f(accessToken, refreshToken, profile, done, ctx)
+          try {
+            google_auth_user_f(accessToken, refreshToken, profile, ctx).then(([user, msg]) => {
+              return done(null, user || false, { message: msg || "" })
+            })
+          } catch (error) {
+            const msg = `Error google auth user: ${error}`
+            ctx.miolo.logger.error(`[auth][passport] ${msg}`)
+            return done(null, false, { message: msg })
+          }
         }
       )
   }

package/template/.env

@@ -32,6 +32,7 @@ MIOLO_AUTH_GOOGLE_CALLBACK_URL=/auth/google/callback
 # Session
 #
 
+MIOLO_SESSION_KEY='miolo-sample.sess'
 MIOLO_SESSION_SALT=00000000-0000-0000-0000-000000000000
 MIOLO_SESSION_SECRET=00000000-0000-0000-0000-000000000000
 MIOLO_SESSION_MAX_AGE=864000000

package/template/package.json

@@ -44,9 +44,9 @@
     "intre": "^3.0.0-beta.4",
     "joi": "^18.1.2",
     "lucide-react": "^1.8.0",
-    "miolo-cli": "^3.0.0-beta.176",
+    "miolo-cli": "^3.0.0-beta.178",
     "miolo-model": "file:../miolo-model",
-    "miolo-react": "^3.0.0-beta.176",
+    "miolo-react": "^3.0.0-beta.178",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "^19.2.5",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.12",
-    "miolo": "^3.0.0-beta.176",
+    "miolo": "^3.0.0-beta.178",
     "sass-embedded": "^1.99.0"
   },
   "overrides": {

package/template/src/server/miolo/auth/passport.mjs

@@ -4,56 +4,31 @@ import {
   db_user_find_or_create_from_google
 } from "#server/db/io/users/auth.mjs"
 
-const get_user_id = (user, done, ctx) => {
+const get_user_id = async (user, ctx) => {
   ctx.miolo.logger.debug(
     `[auth][local] get_user_id() - name ${user?.name} - sessionId ${ctx.sessionId}`
   )
-  const uid = user?.id
-  if (uid !== undefined) {
-    return done(undefined, uid)
-  } else {
-    const err = new Error("User object is missing an ID for serialization")
-    return done(err, undefined)
-  }
+  return user?.id
 }
 
-const find_user_by_id = (id, done, ctx) => {
+const find_user_by_id = async (id, ctx) => {
   ctx.miolo.logger.debug(
     `[auth][local] find_user_by_id() - Searching user id ${id} - sessionId ${ctx.sessionId}`
   )
-  db_find_user_by_id(ctx.miolo, id).then((user) => {
-    if (user === undefined || user === null) {
-      ctx.miolo.logger.debug("[auth][local] find_user_by_id() - User not found")
-      const err = new Error("User not found")
-      return done(err, undefined)
-    } else {
-      ctx.miolo.logger.debug("[auth][local] find_user_by_id() - User found", JSON.stringify(user))
-      return done(undefined, user)
-    }
-  })
+  const user = await db_find_user_by_id(ctx.miolo, id)
+  return user
 }
 
-const local_auth_user = (username, password, done, ctx) => {
+const local_auth_user = async (username, password, ctx) => {
   ctx.miolo.logger.debug(
     `[auth][local] local_auth_user() - checking credentials for ${username} - sessionId ${ctx.sessionId}`
   )
 
-  db_auth_user(ctx.miolo, username, password).then(([user, msg]) => {
-    if (user === undefined || user === null) {
-      ctx.miolo.logger.debug(`[auth][local] local_auth_user() - User not logged in: ${msg}`)
-
-      const err = new Error(msg)
-      return done(err, undefined)
-    } else {
-      ctx.miolo.logger.debug(
-        `[auth][local] local_auth_user() - User logged in! Id: ${user?.id} Email ${user?.email}`
-      )
-      return done(undefined, user)
-    }
-  })
+  const [user, msg] = await db_auth_user(ctx.miolo, username, password)
+  return [user, msg]
 }
 
-const google_auth_user = async (_accessToken, _refreshToken, profile, done, ctx) => {
+const google_auth_user = async (_accessToken, _refreshToken, profile, ctx) => {
   try {
     // Extract Google profile info
     const google_id = profile.id
@@ -66,27 +41,17 @@ const google_auth_user = async (_accessToken, _refreshToken, profile, done, ctx)
       `[auth][google] google_auth_user() - upsaving db user for ${email} - sessionId ${ctx.sessionId}`
     )
 
-    return db_user_find_or_create_from_google(
+    const [user, msg] = await db_user_find_or_create_from_google(
       ctx.miolo,
       email,
       name,
       google_id,
       google_picture
-    ).then(([user, msg]) => {
-      if (user === undefined || user === null) {
-        ctx.miolo.logger.debug(`[auth][google] google_auth_user() - Db user not found: ${msg}`)
-        const err = new Error(msg)
-        return done(err, undefined)
-      } else {
-        ctx.miolo.logger.debug(
-          `[auth][google] google_auth_user() - Db user found! Id: ${user?.id} Email ${user?.email}`
-        )
-        return done(undefined, user)
-      }
-    })
+    )
+    return [user, msg]
   } catch (error) {
     ctx.miolo.logger.error(`[auth][google] Error preparing db user: ${error}`)
-    return done(error, undefined)
+    return [undefined, error]
   }
 }