proto.io 0.0.220 → 0.0.222

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { Server } from '@o2ter/server-js';
 import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-DX2nXeQo.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { prototypes, asyncStream, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-CZ5fKgiJ.mjs';
-export { b as ProtoClient, c as classExtends } from './internals/index-CZ5fKgiJ.mjs';
+import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-CsclRNTO.mjs';
+export { b as ProtoClient, c as classExtends } from './internals/index-CsclRNTO.mjs';
 import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-gWcE22mf.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -13,7 +13,7 @@ import { g as generateId } from './internals/random-CYjWDvex.mjs';
 import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
-import { P as PROTO_NOTY_MSG, a as PROTO_LIVEQUERY_MSG, M as MASTER_USER_HEADER_NAME, b as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/const-Dkp7Nsv5.mjs';
+import { P as PROTO_NOTY_MSG, a as PROTO_LIVEQUERY_MSG, M as MASTER_USER_HEADER_NAME, b as MASTER_PASS_HEADER_NAME, A as AUTH_ALT_COOKIE_KEY, c as AUTH_COOKIE_KEY, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/const-DqPhhmor.mjs';
 import queryType from 'query-types';
 import busboy from 'busboy';
 export { Decimal } from 'decimal.js';
@@ -1304,14 +1304,15 @@ const _session = (proto, request) => {
     const jwtToken = proto[PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
         throw Error('Invalid jwt token');
+    const cookieKey = _.last(_.castArray(request.headers[AUTH_ALT_COOKIE_KEY] || [])) || AUTH_COOKIE_KEY;
     let authorization = '';
     if (request.headers.authorization) {
         const parts = request.headers.authorization.split(' ');
         if (parts.length === 2 && parts[0] === 'Bearer')
             authorization = parts[1];
     }
-    else if (request.cookies[AUTH_COOKIE_KEY]) {
-        authorization = request.cookies[AUTH_COOKIE_KEY];
+    else if (request.cookies[cookieKey]) {
+        authorization = request.cookies[cookieKey];
     }
     if (_.isEmpty(authorization))
         return;
@@ -1390,7 +1391,8 @@ const signUser = async (proto, res, user, options) => {
         user: user?.id,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');
-    res.cookie(AUTH_COOKIE_KEY, token, cookieOptions);
+    const cookieKey = _.last(_.castArray(res.req.headers[AUTH_ALT_COOKIE_KEY] || [])) || AUTH_COOKIE_KEY;
+    res.cookie(cookieKey, token, cookieOptions);
     sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.id) : {});
 };