proto.io 0.0.150 → 0.0.152

package/dist/index.mjs

@@ -1112,7 +1112,10 @@ const _session = (proto, request) => {
     const cached = sessionMap.get(request);
     if (cached)
         return cached;
-    sessionMap.set(request, { sessionId: randomUUID() });
+    sessionMap.set(request, {
+        sessionId: randomUUID(),
+        createdAt: new Date,
+    });
     const jwtToken = proto[PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
         throw Error('Invalid jwt token');
@@ -1131,8 +1134,9 @@ const _session = (proto, request) => {
     if (!_.isObject(payload))
         return;
     const session = {
-        sessionId: payload.sessionId ?? randomUUID(),
         ...payload,
+        sessionId: payload.sessionId ?? randomUUID(),
+        createdAt: new Date(payload.createdAt),
     };
     sessionMap.set(request, session);
     return session;
@@ -1144,9 +1148,9 @@ const sessionId = (proto, request) => {
 const sessionInfoMap = new WeakMap();
 const fetchSessionInfo = async (proto, userId) => {
     const user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
-    const roles = user instanceof TUser ? _.compact(_.map(await proto.userRoles(user), x => x.name)) : [];
+    const roles = user instanceof TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
     return {
-        roles: roles,
+        _roles: roles,
         user: user instanceof TUser ? user : undefined,
     };
 };
@@ -1176,9 +1180,13 @@ const signUser = async (proto, res, user, options) => {
     if (_.isNil(proto[PVK].options.jwtToken))
         return;
     const session = _session(proto, res.req);
-    const sessionId = sessionMap.get(res.req)?.sessionId ?? session?.sessionId ?? randomUUID();
     const cookieOptions = options?.cookieOptions ?? session?.cookieOptions ?? proto[PVK].options.cookieOptions;
-    const token = proto[PVK].jwtSign({ sessionId, user: user?.objectId, cookieOptions }, options?.jwtSignOptions ?? 'login');
+    const token = proto[PVK].jwtSign({
+        sessionId: session?.sessionId ?? randomUUID(),
+        createdAt: session?.createdAt?.getTime() ?? Date.now(),
+        user: user?.objectId,
+        cookieOptions,
+    }, options?.jwtSignOptions ?? 'login');
     res.cookie(AUTH_COOKIE_KEY, token, cookieOptions);
     sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.objectId) : {});
 };
@@ -1343,9 +1351,13 @@ class ProtoService extends ProtoType {
         const session = await this.sessionInfo();
         return session?.user;
     }
-    async currentRoles() {
+    async _currentRoles() {
         const session = await this.sessionInfo();
-        return session?.roles ?? [];
+        return session?._roles ?? [];
+    }
+    async currentRoles() {
+        const roles = await this._currentRoles();
+        return _.compact(_.map(roles, x => x.name));
     }
     get isMaster() {
         return this.req ? sessionIsMaster(this, this.req) === 'valid' : false;