@steedos/auth 2.6.1-beta.7 → 2.6.2-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/auth-middleware.js +14 -1
- package/lib/auth-middleware.js.map +1 -1
- package/lib/endpoints/authorize.js +64 -0
- package/lib/endpoints/authorize.js.map +1 -0
- package/lib/express-middleware.js +3 -0
- package/lib/express-middleware.js.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/package.json +4 -4
package/lib/auth-middleware.js
CHANGED
|
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
exports.__esModule = true;
|
|
39
|
-
exports.requireAuthentication = void 0;
|
|
39
|
+
exports.authentication = exports.requireAuthentication = void 0;
|
|
40
40
|
var session_1 = require("./session");
|
|
41
41
|
var requireAuthentication = function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
42
|
return __generator(this, function (_a) {
|
|
@@ -56,4 +56,17 @@ var requireAuthentication = function (req, res, next) { return __awaiter(void 0,
|
|
|
56
56
|
});
|
|
57
57
|
}); };
|
|
58
58
|
exports.requireAuthentication = requireAuthentication;
|
|
59
|
+
var authentication = function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
|
|
60
|
+
return __generator(this, function (_a) {
|
|
61
|
+
switch (_a.label) {
|
|
62
|
+
case 0: return [4, (0, session_1.setRequestUser)(req, res, function () {
|
|
63
|
+
next();
|
|
64
|
+
})];
|
|
65
|
+
case 1:
|
|
66
|
+
_a.sent();
|
|
67
|
+
return [2];
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}); };
|
|
71
|
+
exports.authentication = authentication;
|
|
59
72
|
//# sourceMappingURL=auth-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,qCAA2C;AAOpC,IAAM,qBAAqB,GAAG,UAAO,GAAY,EAAE,GAAa,EAAE,IAAgB;;;oBACrF,WAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,EAAE;oBAC3B,IAAI,GAAG,CAAC,IAAI,EAAE;wBACV,IAAI,EAAE,CAAC;qBACV;yBACI;wBACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;qBAC3F;gBACL,CAAC,CAAC,EAAA;;gBAPF,SAOE,CAAC;;;;KAEN,CAAA;AAVY,QAAA,qBAAqB,yBAUjC;AAEM,IAAM,cAAc,GAAG,UAAO,GAAY,EAAE,GAAa,EAAE,IAAgB;;;oBAC9E,WAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,EAAE;oBAC3B,IAAI,EAAE,CAAC;gBACX,CAAC,CAAC,EAAA;;gBAFF,SAEE,CAAC;;;;KACN,CAAA;AAJY,QAAA,cAAc,kBAI1B"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
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;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.__esModule = true;
|
|
39
|
+
exports.authorize = void 0;
|
|
40
|
+
var utils_1 = require("../utils");
|
|
41
|
+
var queryString = require('querystring');
|
|
42
|
+
var authorize = function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
43
|
+
var user, query, redirect_uri;
|
|
44
|
+
return __generator(this, function (_a) {
|
|
45
|
+
user = req.user;
|
|
46
|
+
query = queryString.stringify(req.query);
|
|
47
|
+
redirect_uri = req.query.redirect_uri ? req.query.redirect_uri : '/';
|
|
48
|
+
if (user) {
|
|
49
|
+
if (redirect_uri.indexOf('no_redirect=1') < 0) {
|
|
50
|
+
redirect_uri = redirect_uri.indexOf("?") > 0 ? redirect_uri + '&no_redirect=1' : redirect_uri + '?no_redirect=1';
|
|
51
|
+
res.redirect(redirect_uri);
|
|
52
|
+
}
|
|
53
|
+
res.end();
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
57
|
+
res.redirect(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/accounts/a/#/login?" + query);
|
|
58
|
+
res.end();
|
|
59
|
+
}
|
|
60
|
+
return [2];
|
|
61
|
+
});
|
|
62
|
+
}); };
|
|
63
|
+
exports.authorize = authorize;
|
|
64
|
+
//# sourceMappingURL=authorize.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../src/endpoints/authorize.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kCAA4C;AAC5C,IAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAIpC,IAAM,SAAS,GAAG,UAAO,GAAY,EAAE,GAAa;;;QACjD,IAAI,GAAI,GAAW,CAAC,IAAI,CAAC;QAC3B,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAsB,CAAC,CAAC,CAAC,GAAG,CAAA;QAClF,IAAI,IAAI,EAAE;YACN,IAAI,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;gBAC3C,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAC,CAAC,YAAY,GAAG,gBAAgB,CAAC;gBACjH,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;aAC9B;YACD,GAAG,CAAC,GAAG,EAAE,CAAC;SACb;aAAM;YACH,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC3B,GAAG,CAAC,QAAQ,CAAC,yBAAyB,CAAC,oBAAoB,GAAG,sBAAsB,GAAG,KAAK,CAAC,CAAC;YAC9F,GAAG,CAAC,GAAG,EAAE,CAAC;SACb;;;KACJ,CAAA;AAfY,QAAA,SAAS,aAerB"}
|
|
@@ -5,10 +5,13 @@ var login_1 = require("./endpoints/login");
|
|
|
5
5
|
var logout_1 = require("./endpoints/logout");
|
|
6
6
|
var validate_1 = require("./endpoints/validate");
|
|
7
7
|
var jwt_1 = require("./endpoints/jwt");
|
|
8
|
+
var authorize_1 = require("./endpoints/authorize");
|
|
9
|
+
var auth_middleware_1 = require("./auth-middleware");
|
|
8
10
|
exports.authExpress = require('@steedos/router').staticRouter();
|
|
9
11
|
exports.authExpress.post('/api/v4/users/login', login_1.login);
|
|
10
12
|
exports.authExpress.post('/api/v4/users/logout', logout_1.logout);
|
|
11
13
|
exports.authExpress.post('/api/v4/users/validate', validate_1.validate);
|
|
14
|
+
exports.authExpress.get('/api/v4/users/authorize', auth_middleware_1.authentication, authorize_1.authorize);
|
|
12
15
|
exports.authExpress.post('/api/setup/login', login_1.login);
|
|
13
16
|
exports.authExpress.post('/api/setup/logout', logout_1.logout);
|
|
14
17
|
exports.authExpress.post('/api/setup/validate', validate_1.validate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAC1C,6CAA4C;AAC5C,iDAAgD;AAChD,uCAAyC;
|
|
1
|
+
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAC1C,6CAA4C;AAC5C,iDAAgD;AAChD,uCAAyC;AACzC,mDAAkD;AAClD,qDAAmD;AACtC,QAAA,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC;AAErE,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;AACpD,mBAAW,CAAC,GAAG,CAAC,yBAAyB,EAAE,gCAAc,EAAE,qBAAS,CAAC,CAAA;AAGrE,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
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
exports.__esModule = true;
|
|
17
|
-
exports.requireAuthentication = exports.getAPIKeyAuthHeader = exports.authExpress = exports.removeUserSessionsCacheByUserId = exports.getSessionByUserIdSync = exports.getSessionByUserId = exports.setRequestUser = exports.auth = exports.getSession = void 0;
|
|
17
|
+
exports.authentication = exports.requireAuthentication = exports.getAPIKeyAuthHeader = exports.authExpress = exports.removeUserSessionsCacheByUserId = exports.getSessionByUserIdSync = exports.getSessionByUserId = exports.setRequestUser = exports.auth = exports.getSession = void 0;
|
|
18
18
|
var session_1 = require("./session");
|
|
19
19
|
__createBinding(exports, session_1, "getSession");
|
|
20
20
|
__createBinding(exports, session_1, "auth");
|
|
@@ -32,4 +32,5 @@ var apikey_1 = require("./apikey");
|
|
|
32
32
|
__createBinding(exports, apikey_1, "getAPIKeyAuthHeader");
|
|
33
33
|
var auth_middleware_1 = require("./auth-middleware");
|
|
34
34
|
__createBinding(exports, auth_middleware_1, "requireAuthentication");
|
|
35
|
+
__createBinding(exports, auth_middleware_1, "authentication");
|
|
35
36
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,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,qDAA0E;AAAjE,qEAAqB;AAAE,8DAAc"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/auth",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.6.
|
|
4
|
+
"version": "2.6.2-beta.3",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"watch": "tsc --watch",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@steedos/cachers": "2.6.
|
|
17
|
-
"@steedos/objectql": "2.6.
|
|
16
|
+
"@steedos/cachers": "2.6.2-beta.3",
|
|
17
|
+
"@steedos/objectql": "2.6.2-beta.3",
|
|
18
18
|
"cookies": "^0.8.0",
|
|
19
19
|
"express": "^4.16.4",
|
|
20
20
|
"ismobilejs": "^1.1.1",
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"typescript": "4.6.3"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "7842aa5d3023622c0e140009cfdd081180563bdd"
|
|
29
29
|
}
|