proto.io 0.0.153 → 0.0.154

package/dist/index.mjs

@@ -1106,7 +1106,12 @@ const _sessionWithToken = (proto, token) => {
     const payload = proto[PVK].jwtVarify(token, 'login');
     if (!_.isObject(payload))
         return;
-    return payload;
+    return {
+        ...payload,
+        sessionId: payload.sessionId ?? randomUUID(),
+        createdAt: payload.createdAt && _.isSafeInteger(payload.createdAt) ? new Date(payload.createdAt) : new Date,
+        loginedAt: payload.loginedAt && _.isSafeInteger(payload.loginedAt) ? new Date(payload.loginedAt) : new Date,
+    };
 };
 const _session = (proto, request) => {
     const cached = sessionMap.get(request);
@@ -1115,6 +1120,7 @@ const _session = (proto, request) => {
     sessionMap.set(request, {
         sessionId: randomUUID(),
         createdAt: new Date,
+        loginedAt: new Date,
     });
     const jwtToken = proto[PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
@@ -1130,14 +1136,9 @@ const _session = (proto, request) => {
     }
     if (_.isEmpty(authorization))
         return;
-    const payload = proto[PVK].jwtVarify(authorization, 'login');
-    if (!_.isObject(payload))
+    const session = _sessionWithToken(proto, authorization);
+    if (!_.isObject(session))
         return;
-    const session = {
-        ...payload,
-        sessionId: payload.sessionId ?? randomUUID(),
-        createdAt: payload.createdAt && _.isSafeInteger(payload.createdAt) ? new Date(payload.createdAt) : new Date,
-    };
     sessionMap.set(request, session);
     return session;
 };
@@ -1156,18 +1157,29 @@ const fetchSessionInfo = async (proto, userId) => {
 };
 const sessionWithToken = async (proto, token) => {
     const session = _sessionWithToken(proto, token);
-    const sessionId = session?.sessionId;
     const info = await fetchSessionInfo(proto, session?.user);
-    return { sessionId, ...info };
+    return {
+        ...session ?? {},
+        ...info,
+        loginedAt: info?.user ? session?.loginedAt : undefined,
+    };
 };
 const session = async (proto, request) => {
     const session = _session(proto, request);
     const cached = sessionInfoMap.get(request);
     if (cached)
-        return { ...session ?? {}, ...cached };
+        return {
+            ...session ?? {},
+            ...cached,
+            loginedAt: cached?.user ? session?.loginedAt : undefined,
+        };
     const info = await fetchSessionInfo(proto, session?.user);
     sessionInfoMap.set(request, info);
-    return { ...session ?? {}, ...info };
+    return {
+        ...session ?? {},
+        ...info,
+        loginedAt: info?.user ? session?.loginedAt : undefined,
+    };
 };
 const sessionIsMaster = (proto, request) => {
     const user = request.header(MASTER_USER_HEADER_NAME);
@@ -1184,6 +1196,7 @@ const signUser = async (proto, res, user, options) => {
     const token = proto[PVK].jwtSign({
         sessionId: session?.sessionId ?? randomUUID(),
         createdAt: session?.createdAt?.getTime() ?? Date.now(),
+        loginedAt: user ? session?.loginedAt?.getTime() ?? Date.now() : undefined,
         user: user?.objectId,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');