@steedos/auth 2.2.52-beta.7 → 2.2.53-beta.3

package/lib/endpoints/logout.js

@@ -1,10 +1,48 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logout = void 0;
-const utils_1 = require("../utils");
-const logout = async (req, res) => {
-    (0, utils_1.clearAuthCookies)(req, res);
-    return res.end();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
 };
+exports.__esModule = true;
+exports.logout = void 0;
+var utils_1 = require("../utils");
+var logout = function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        (0, utils_1.clearAuthCookies)(req, res);
+        return [2 /*return*/, res.end()];
+    });
+}); };
 exports.logout = logout;
 //# sourceMappingURL=logout.js.map

package/lib/endpoints/logout.js.map

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":";;;AAEA,oCAA4C;AAErC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACxE,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC,CAAA;AAHY,QAAA,MAAM,UAGlB"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kCAA4C;AAErC,IAAM,MAAM,GAAG,UAAO,GAAY,EAAE,GAAa;;QACpD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3B,sBAAO,GAAG,CAAC,GAAG,EAAE,EAAC;;KACpB,CAAA;AAHY,QAAA,MAAM,UAGlB"}

package/lib/endpoints/validate.js

@@ -1,37 +1,86 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.validate = void 0;
-const session_1 = require("../session");
-const utils_1 = require("../utils");
-const objectql_1 = require("@steedos/objectql");
-const validate = async (req, res) => {
-    let utcOffset = req.body.utcOffset;
-    let userSession = await (0, session_1.auth)(req, res);
-    let spaceUser = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] });
-    if (userSession.userId) {
-        if (spaceUser.length > 0) {
-            let user = await (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] });
-            if (user.lockout) {
+var session_1 = require("../session");
+var utils_1 = require("../utils");
+var objectql_1 = require("@steedos/objectql");
+var validate = function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
+    var utcOffset, userSession, spaceUser, user;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                utcOffset = req.body.utcOffset;
+                return [4 /*yield*/, (0, session_1.auth)(req, res)];
+            case 1:
+                userSession = _a.sent();
+                return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] })];
+            case 2:
+                spaceUser = _a.sent();
+                if (!userSession.userId) return [3 /*break*/, 9];
+                if (!(spaceUser.length > 0)) return [3 /*break*/, 8];
+                return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] })];
+            case 3:
+                user = _a.sent();
+                if (!user.lockout) return [3 /*break*/, 4];
                 (0, utils_1.clearAuthCookies)(req, res);
-            }
-            else {
+                return [3 /*break*/, 7];
+            case 4:
                 (0, utils_1.setAuthCookies)(req, res, userSession.userId, userSession.authToken, userSession.spaceId);
-                if (!user.hasOwnProperty('utcOffset')) {
-                    await (0, objectql_1.getSteedosSchema)().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset });
-                }
-                return res.send(Object.assign({}, userSession, { password_expired: user.password_expired }));
-            }
-        }
-        else {
-            (0, utils_1.clearAuthCookies)(req, res);
+                if (!!user.hasOwnProperty('utcOffset')) return [3 /*break*/, 6];
+                return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset })];
+            case 5:
+                _a.sent();
+                _a.label = 6;
+            case 6: return [2 /*return*/, res.send(Object.assign({}, userSession, { password_expired: user.password_expired }))];
+            case 7: return [3 /*break*/, 9];
+            case 8:
+                (0, utils_1.clearAuthCookies)(req, res);
+                _a.label = 9;
+            case 9:
+                (0, utils_1.clearAuthCookies)(req, res);
+                return [2 /*return*/, res.status(401).send({
+                        "error": "Validate Request -- Missing X-Auth-Token",
+                        "instance": "1329598861",
+                        "success": false
+                    })];
         }
-    }
-    (0, utils_1.clearAuthCookies)(req, res);
-    return res.status(401).send({
-        "error": "Validate Request -- Missing X-Auth-Token",
-        "instance": "1329598861",
-        "success": false
     });
-};
+}); };
 exports.validate = validate;
 //# sourceMappingURL=validate.js.map

package/lib/endpoints/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":";;;AAEA,wCAAkC;AAClC,oCAA4D;AAC5D,gDAAqD;AAE9C,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IAC1E,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;IACnC,IAAI,WAAW,GAAG,MAAM,IAAA,cAAI,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,SAAS,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAC,CAAC,CAAC;IAC1L,IAAI,WAAW,CAAC,MAAM,EAAE;QACpB,IAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAC;YACpB,IAAI,IAAI,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAC,kBAAkB,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC3I,IAAG,IAAI,CAAC,OAAO,EAAC;gBACZ,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;aAC7B;iBAAI;gBACD,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBACzF,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;oBACnC,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;iBACrG;gBACD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC,CAAC,CAAC,CAAC;aAC9F;SACJ;aAAI;YACD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAC7B;KACJ;IACD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACxB,OAAO,EAAE,0CAA0C;QACnD,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,KAAK;KACnB,CAAC,CAAA;AACN,CAAC,CAAA;AA1BY,QAAA,QAAQ,YA0BpB"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sCAAkC;AAClC,kCAA4D;AAC5D,8CAAqD;AAE9C,IAAM,QAAQ,GAAG,UAAO,GAAY,EAAE,GAAa;;;;;gBAClD,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;gBACjB,qBAAM,IAAA,cAAI,EAAC,GAAG,EAAE,GAAG,CAAC,EAAA;;gBAAlC,WAAW,GAAG,SAAoB;gBACtB,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAC,CAAC,EAAA;;gBAArL,SAAS,GAAG,SAAyK;qBACrL,WAAW,CAAC,MAAM,EAAlB,wBAAkB;qBACf,CAAA,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA,EAApB,wBAAoB;gBACR,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAC,kBAAkB,EAAC,SAAS,CAAC,EAAE,CAAC,EAAA;;gBAAtI,IAAI,GAAG,SAA+H;qBACvI,IAAI,CAAC,OAAO,EAAZ,wBAAY;gBACX,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;;;gBAE1B,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;qBACrF,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAjC,wBAAiC;gBACjC,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,EAAA;;gBAAlG,SAAkG,CAAA;;oBAEtG,sBAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC,CAAC,CAAC,EAAC;;;gBAG/F,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;;;gBAGlC,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC3B,sBAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,OAAO,EAAE,0CAA0C;wBACnD,UAAU,EAAE,YAAY;wBACxB,SAAS,EAAE,KAAK;qBACnB,CAAC,EAAA;;;KACL,CAAA;AA1BY,QAAA,QAAQ,YA0BpB"}

package/lib/express-middleware.js

@@ -1,11 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.authExpress = void 0;
-const express = require('express');
-const login_1 = require("./endpoints/login");
-const logout_1 = require("./endpoints/logout");
-const validate_1 = require("./endpoints/validate");
-const jwt_1 = require("./endpoints/jwt");
+var express = require('express');
+var login_1 = require("./endpoints/login");
+var logout_1 = require("./endpoints/logout");
+var validate_1 = require("./endpoints/validate");
+var jwt_1 = require("./endpoints/jwt");
 exports.authExpress = express.Router();
 exports.authExpress.post('/api/v4/users/login', login_1.login);
 exports.authExpress.post('/api/v4/users/logout', logout_1.logout);

package/lib/express-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,6CAA0C;AAC1C,+CAA4C;AAC5C,mDAAgD;AAChD,yCAAyC;AAE5B,QAAA,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAE5C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAK,CAAC,CAAC;AAC/C,mBAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,eAAM,CAAC,CAAC;AACjD,mBAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,mBAAQ,CAAC,CAAA;AAEpD,YAAY;AACZ,mBAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAK,CAAC,CAAC;AAC5C,mBAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,eAAM,CAAC,CAAA;AAC7C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,mBAAQ,CAAC,CAAA;AAEjD,mBAAW,CAAC,GAAG,CAAC,UAAU,EAAE,YAAM,CAAC,CAAC"}
+{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,2CAA0C;AAC1C,6CAA4C;AAC5C,iDAAgD;AAChD,uCAAyC;AAE5B,QAAA,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAE5C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAK,CAAC,CAAC;AAC/C,mBAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,eAAM,CAAC,CAAC;AACjD,mBAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,mBAAQ,CAAC,CAAA;AAEpD,YAAY;AACZ,mBAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAK,CAAC,CAAC;AAC5C,mBAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,eAAM,CAAC,CAAA;AAC7C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,mBAAQ,CAAC,CAAA;AAEjD,mBAAW,CAAC,GAAG,CAAC,UAAU,EAAE,YAAM,CAAC,CAAC"}

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -9,23 +13,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.requireAuthentication = exports.getAPIKeyAuthHeader = exports.authExpress = exports.removeUserSessionsCacheByUserId = exports.getSessionByUserIdSync = exports.getSessionByUserId = exports.setRequestUser = exports.auth = exports.getSession = void 0;
 var session_1 = require("./session");
-Object.defineProperty(exports, "getSession", { enumerable: true, get: function () { return session_1.getSession; } });
-Object.defineProperty(exports, "auth", { enumerable: true, get: function () { return session_1.auth; } });
-Object.defineProperty(exports, "setRequestUser", { enumerable: true, get: function () { return session_1.setRequestUser; } });
-Object.defineProperty(exports, "getSessionByUserId", { enumerable: true, get: function () { return session_1.getSessionByUserId; } });
-Object.defineProperty(exports, "getSessionByUserIdSync", { enumerable: true, get: function () { return session_1.getSessionByUserIdSync; } });
-Object.defineProperty(exports, "removeUserSessionsCacheByUserId", { enumerable: true, get: function () { return session_1.removeUserSessionsCacheByUserId; } });
+__createBinding(exports, session_1, "getSession");
+__createBinding(exports, session_1, "auth");
+__createBinding(exports, session_1, "setRequestUser");
+__createBinding(exports, session_1, "getSessionByUserId");
+__createBinding(exports, session_1, "getSessionByUserIdSync");
+__createBinding(exports, session_1, "removeUserSessionsCacheByUserId");
 __exportStar(require("./utils"), exports);
 __exportStar(require("./tokenMap"), exports);
 __exportStar(require("./userSession"), exports);
 __exportStar(require("./spaceUserSession"), exports);
 var express_middleware_1 = require("./express-middleware");
-Object.defineProperty(exports, "authExpress", { enumerable: true, get: function () { return express_middleware_1.authExpress; } });
+__createBinding(exports, express_middleware_1, "authExpress");
 var apikey_1 = require("./apikey");
-Object.defineProperty(exports, "getAPIKeyAuthHeader", { enumerable: true, get: function () { return apikey_1.getAPIKeyAuthHeader; } });
+__createBinding(exports, apikey_1, "getAPIKeyAuthHeader");
 var auth_middleware_1 = require("./auth-middleware");
-Object.defineProperty(exports, "requireAuthentication", { enumerable: true, get: function () { return auth_middleware_1.requireAuthentication; } });
+__createBinding(exports, auth_middleware_1, "requireAuthentication");
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAA0I;AAAjI,qGAAA,UAAU,OAAA;AAAE,+FAAA,IAAI,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,iHAAA,sBAAsB,OAAA;AAAE,0HAAA,+BAA+B,OAAA;AACtH,0CAAwB;AACxB,6CAA2B;AAC3B,gDAA8B;AAC9B,qDAAmC;AACnC,2DAAmD;AAA1C,iHAAA,WAAW,OAAA;AACpB,mCAA+C;AAAtC,6GAAA,mBAAmB,OAAA;AAC5B,qDAA0D;AAAjD,wHAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAA0I;AAAjI,kDAAU;AAAE,4CAAI;AAAE,sDAAc;AAAE,0DAAkB;AAAE,8DAAsB;AAAE,uEAA+B;AACtH,0CAAwB;AACxB,6CAA2B;AAC3B,gDAA8B;AAC9B,qDAAmC;AACnC,2DAAmD;AAA1C,8DAAW;AACpB,mCAA+C;AAAtC,0DAAmB;AAC5B,qDAA0D;AAAjD,qEAAqB"}

package/lib/session.js

@@ -1,15 +1,51 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeUserSessionsCacheByUserId = exports.setRequestUser = exports.auth = exports.getLoginDevice = exports.getUserAgent = exports.getSession = exports.getSessionByUserIdSync = exports.getSessionByUserId = void 0;
-const objectql_1 = require("@steedos/objectql");
-const tokenMap_1 = require("./tokenMap");
-const userSession_1 = require("./userSession");
-const spaceUserSession_1 = require("./spaceUserSession");
-const apikey_1 = require("./apikey");
-const ismobilejs_1 = require("ismobilejs");
-const Cookies = require("cookies");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.isPropValueChanged = exports.removeUserSessionsCacheByUserId = exports.setRequestUser = exports.auth = exports.getLoginDevice = exports.getUserAgent = exports.getSession = exports.getSessionByUserIdSync = exports.getSessionByUserId = void 0;
+var objectql_1 = require("@steedos/objectql");
+var tokenMap_1 = require("./tokenMap");
+var userSession_1 = require("./userSession");
+var spaceUserSession_1 = require("./spaceUserSession");
+var apikey_1 = require("./apikey");
+var ismobilejs_1 = require("ismobilejs");
+var Cookies = require("cookies");
 function assignSession(spaceId, userSession, spaceSession) {
-    let result = Object.assign({ spaceId: spaceId }, userSession, spaceSession);
+    var result = Object.assign({ spaceId: spaceId }, userSession, spaceSession);
     return reviseSession(result);
 }
 function reviseSession(session) {
@@ -19,56 +55,84 @@ function reviseSession(session) {
     }
     return session;
 }
-async function getSessionByUserId(userId, spaceId) {
-    if (!userId) {
-        return;
-    }
-    let userSession = await (0, userSession_1.getUserSession)(userId);
-    if (!userSession) {
-        return;
-    }
-    let spaceUserSession = {};
-    if (spaceId) {
-        spaceUserSession = await (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId);
-    }
-    return assignSession(spaceId, userSession, spaceUserSession);
+function getSessionByUserId(userId, spaceId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var userSession, spaceUserSession;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!userId) {
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, (0, userSession_1.getUserSession)(userId)];
+                case 1:
+                    userSession = _a.sent();
+                    if (!userSession) {
+                        return [2 /*return*/];
+                    }
+                    spaceUserSession = {};
+                    if (!spaceId) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
+                case 2:
+                    spaceUserSession = _a.sent();
+                    _a.label = 3;
+                case 3: return [2 /*return*/, assignSession(spaceId, userSession, spaceUserSession)];
+            }
+        });
+    });
 }
 exports.getSessionByUserId = getSessionByUserId;
 function getSessionByUserIdSync(userId, spaceId) {
-    let getSessionFn = function () {
+    var getSessionFn = function () {
         return getSessionByUserId(userId, spaceId);
     };
     return (0, objectql_1.wrapAsync)(getSessionFn, {});
 }
 exports.getSessionByUserIdSync = getSessionByUserIdSync;
-async function getSession(token, spaceId, clientInfos) {
-    if (!token) {
-        return;
-    }
-    let userId = null;
-    if ((0, apikey_1.isAPIKey)(token)) {
-        const apiKeyInfo = await (0, apikey_1.verifyAPIKey)(token);
-        if (apiKeyInfo) {
-            userId = apiKeyInfo.userId;
-            spaceId = apiKeyInfo.spaceId;
-        }
-    }
-    else {
-        userId = await (0, tokenMap_1.getUserIdByToken)(token, clientInfos);
-    }
-    if (!userId) {
-        return;
-    }
-    let userSession = await (0, userSession_1.getUserSession)(userId);
-    if (!userSession) {
-        return;
-    }
-    let spaceUserSession = await (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId);
-    return assignSession(spaceId, userSession, spaceUserSession);
+function getSession(token, spaceId, clientInfos) {
+    return __awaiter(this, void 0, void 0, function () {
+        var userId, apiKeyInfo, userSession, spaceUserSession;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!token) {
+                        return [2 /*return*/];
+                    }
+                    userId = null;
+                    if (!(0, apikey_1.isAPIKey)(token)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, (0, apikey_1.verifyAPIKey)(token)];
+                case 1:
+                    apiKeyInfo = _a.sent();
+                    if (apiKeyInfo) {
+                        userId = apiKeyInfo.userId;
+                        spaceId = apiKeyInfo.spaceId;
+                    }
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, (0, tokenMap_1.getUserIdByToken)(token, clientInfos)];
+                case 3:
+                    userId = _a.sent();
+                    _a.label = 4;
+                case 4:
+                    if (!userId) {
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, (0, userSession_1.getUserSession)(userId)];
+                case 5:
+                    userSession = _a.sent();
+                    if (!userSession) {
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
+                case 6:
+                    spaceUserSession = _a.sent();
+                    return [2 /*return*/, assignSession(spaceId, userSession, spaceUserSession)];
+            }
+        });
+    });
 }
 exports.getSession = getSession;
 function getUserAgent(req) {
-    let userAgent = req.headers["user-agent"] || "";
+    var userAgent = req.headers["user-agent"] || "";
     if (req.headers["x-ucbrowser-ua"]) {
         // special case of UC Browser
         userAgent = req.headers["x-ucbrowser-ua"];
@@ -77,74 +141,111 @@ function getUserAgent(req) {
 }
 exports.getUserAgent = getUserAgent;
 function getLoginDevice(userAgent) {
-    let is_phone = false;
-    let is_tablet = false;
+    var is_phone = false;
+    var is_tablet = false;
     if (userAgent) {
         try {
-            const { phone, tablet } = (0, ismobilejs_1.default)(userAgent);
+            var _a = (0, ismobilejs_1["default"])(userAgent), phone = _a.phone, tablet = _a.tablet;
             is_phone = phone;
             is_tablet = tablet;
         }
         catch (Exception) {
-            console.log(`Exception`, Exception);
+            console.log("Exception", Exception);
         }
     }
-    return { is_phone, is_tablet };
+    return { is_phone: is_phone, is_tablet: is_tablet };
 }
 exports.getLoginDevice = getLoginDevice;
 // 解析Request对象，返回SteedosUserSession类型
-async function auth(request, response) {
-    let cookies = new Cookies(request, response);
-    let authToken = request.headers["x-auth-token"] || (cookies.get("X-Auth-Token") || "").replace(/"/g, "");
-    let spaceToken = (cookies.get("X-Space-Token") || "").replace(/"/g, "");
-    let authorization = request.headers.authorization;
-    let spaceId = (request.params ? request.params.spaceId : null) ||
-        (request.query ? request.query.space_id : null) ||
-        request.headers["x-space-id"];
-    if (authorization && authorization.split(" ")[0] == "Bearer") {
-        let spaceAuthToken = authorization.split(" ")[1];
-        if ((0, apikey_1.isAPIKey)(spaceAuthToken)) {
-            authToken = spaceAuthToken;
-        }
-        else {
-            if (!spaceId) {
-                spaceId = spaceAuthToken.split(",")[0];
+function auth(request, response) {
+    return __awaiter(this, void 0, void 0, function () {
+        var cookies, authToken, spaceToken, authorization, spaceId, spaceAuthToken, userAgent, loginDevice, user;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    cookies = new Cookies(request, response);
+                    authToken = request.headers["x-auth-token"] || (cookies.get("X-Auth-Token") || "").replace(/"/g, "");
+                    spaceToken = (cookies.get("X-Space-Token") || "").replace(/"/g, "");
+                    authorization = request.headers.authorization;
+                    spaceId = (request.params ? request.params.spaceId : null) ||
+                        (request.query ? request.query.space_id : null) ||
+                        request.headers["x-space-id"];
+                    if (authorization && authorization.split(" ")[0] == "Bearer") {
+                        spaceAuthToken = authorization.split(" ")[1];
+                        if ((0, apikey_1.isAPIKey)(spaceAuthToken)) {
+                            authToken = spaceAuthToken;
+                        }
+                        else {
+                            if (!spaceId) {
+                                spaceId = spaceAuthToken.split(",")[0];
+                            }
+                            authToken = spaceAuthToken.split(",")[1];
+                        }
+                    }
+                    if (spaceToken) {
+                        if (!spaceId) {
+                            spaceId = spaceToken.split(",")[0];
+                        }
+                        if (!authToken) {
+                            authToken = spaceToken.split(",")[1];
+                        }
+                    }
+                    userAgent = getUserAgent(request) || "";
+                    loginDevice = getLoginDevice(userAgent);
+                    return [4 /*yield*/, getSession(authToken, spaceId, loginDevice)];
+                case 1:
+                    user = _a.sent();
+                    if ((0, objectql_1.isTemplateSpace)(spaceId)) {
+                        return [2 /*return*/, Object.assign({ authToken: authToken }, user, loginDevice, {
+                                spaceId: spaceId
+                            })];
+                    }
+                    else {
+                        return [2 /*return*/, Object.assign({ authToken: authToken }, user, loginDevice)];
+                    }
+                    return [2 /*return*/];
             }
-            authToken = spaceAuthToken.split(",")[1];
-        }
-    }
-    if (spaceToken) {
-        if (!spaceId) {
-            spaceId = spaceToken.split(",")[0];
-        }
-        if (!authToken) {
-            authToken = spaceToken.split(",")[1];
-        }
-    }
-    let userAgent = getUserAgent(request) || "";
-    const loginDevice = getLoginDevice(userAgent);
-    let user = await getSession(authToken, spaceId, loginDevice);
-    if ((0, objectql_1.isTemplateSpace)(spaceId)) {
-        return Object.assign({ authToken: authToken }, user, loginDevice, {
-            spaceId: spaceId,
         });
-    }
-    else {
-        return Object.assign({ authToken: authToken }, user, loginDevice);
-    }
+    });
 }
 exports.auth = auth;
 // 给Request对象添加user属性，值为SteedosUserSession类型
-async function setRequestUser(request, response, next) {
-    let user = await auth(request, response);
-    if (user.userId) {
-        request.user = user;
-    }
-    next();
+function setRequestUser(request, response, next) {
+    return __awaiter(this, void 0, void 0, function () {
+        var user;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, auth(request, response)];
+                case 1:
+                    user = _a.sent();
+                    if (user.userId) {
+                        request.user = user;
+                    }
+                    next();
+                    return [2 /*return*/];
+            }
+        });
+    });
 }
 exports.setRequestUser = setRequestUser;
 function removeUserSessionsCacheByUserId(userId, is_phone) {
     return (0, tokenMap_1.removeUserTokens)(userId, is_phone);
 }
 exports.removeUserSessionsCacheByUserId = removeUserSessionsCacheByUserId;
+/**
+ * 判断属性值是否已变更，转字符串比对
+ * @param newDoc
+ * @param oldDoc
+ * @returns true/false
+ */
+function isPropValueChanged(newDoc, oldDoc, props) {
+    for (var _i = 0, props_1 = props; _i < props_1.length; _i++) {
+        var key = props_1[_i];
+        if ((newDoc[key] + '') !== (oldDoc[key] + '')) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.isPropValueChanged = isPropValueChanged;
 //# sourceMappingURL=session.js.map