sebse/node-pkg-express-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed Permissions #2

Browse Source
This commit is contained in:
Sebastian Seedorf
2020-11-16 16:07:44 +01:00
parent a35205fb14
commit 51c80b7be5
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
out/auth-proxy.js
View File

@@ -14,25 +14,18 @@ const _1 = require(".");
const node_fetch_1 = require("node-fetch"); const node_fetch_1 = require("node-fetch");
const router = (req, res, next) => { const router = (req, res, next) => {
const resolvable = new _1.Resolvable(() => __awaiter(void 0, void 0, void 0, function* () { const resolvable = new _1.Resolvable(() => __awaiter(void 0, void 0, void 0, function* () {
console.log("header", _1.DefaultConfig.USERINFO_HEADER);
if (!_1.DefaultConfig.USERINFO_HEADER) { if (!_1.DefaultConfig.USERINFO_HEADER) {
return undefined; return undefined;
} }
const token = req.header(_1.DefaultConfig.USERINFO_HEADER); const token = req.header(_1.DefaultConfig.USERINFO_HEADER);
console.log("token", token);
const url = _1.DefaultConfig.AUTH_PROXY_USERINFO_URL || const url = _1.DefaultConfig.AUTH_PROXY_USERINFO_URL ||
_1.DefaultConfig.AUTH_PROXY_URL && _1.urlJoin(_1.DefaultConfig.AUTH_PROXY_URL, "userinfo"); _1.DefaultConfig.AUTH_PROXY_URL && _1.urlJoin(_1.DefaultConfig.AUTH_PROXY_URL, "userinfo");
console.log("url", url);
if (token === undefined || url === undefined) { if (token === undefined || url === undefined) {
return undefined; return undefined;
} }
console.log("fetch");
try { try {
const res = yield node_fetch_1.default(url, { headers: [[_1.DefaultConfig.USERINFO_HEADER, token]] }); const res = yield node_fetch_1.default(url, { headers: [[_1.DefaultConfig.USERINFO_HEADER, token]] });
console.log("res"); return yield res.json();
const json = yield res.json();
console.log("json", json);
return json;
} }
catch (e) { catch (e) {
_1.Logger.warn(e); _1.Logger.warn(e);

2
out/index.d.ts vendored
View File

@@ -7,5 +7,5 @@ export { urlJoin } from './helpers/urlJoin';
export { AutoReloader } from './auto-reload'; export { AutoReloader } from './auto-reload';
export { Polyfill, PolyfillOptions, PolyfillFeatureList } from './polyfill'; export { Polyfill, PolyfillOptions, PolyfillFeatureList } from './polyfill';
export { Session } from './session'; export { Session } from './session';
export { Permissions } from './permissions'; export { PermManager } from './permissions';
export { UserInfo } from './helpers/userinfo'; export { UserInfo } from './helpers/userinfo';

4
out/index.js
View File

@@ -1,6 +1,6 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.Permissions = exports.Session = exports.Polyfill = exports.AutoReloader = exports.urlJoin = exports.WaitForSync = exports.Resolvable = exports.AuthProxy = exports.HttpLogger = exports.Logger = exports.Redis = exports.DefaultConfig = void 0; exports.PermManager = exports.Session = exports.Polyfill = exports.AutoReloader = exports.urlJoin = exports.WaitForSync = exports.Resolvable = exports.AuthProxy = exports.HttpLogger = exports.Logger = exports.Redis = exports.DefaultConfig = void 0;
var config_1 = require("./config"); var config_1 = require("./config");
Object.defineProperty(exports, "DefaultConfig", { enumerable: true, get: function () { return config_1.DefaultConfig; } }); Object.defineProperty(exports, "DefaultConfig", { enumerable: true, get: function () { return config_1.DefaultConfig; } });
var redis_1 = require("./redis"); var redis_1 = require("./redis");
@@ -22,4 +22,4 @@ Object.defineProperty(exports, "Polyfill", { enumerable: true, get: function ()
var session_1 = require("./session"); var session_1 = require("./session");
Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return session_1.Session; } }); Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return session_1.Session; } });
var permissions_1 = require("./permissions"); var permissions_1 = require("./permissions");
Object.defineProperty(exports, "Permissions", { enumerable: true, get: function () { return permissions_1.Permissions; } }); Object.defineProperty(exports, "PermManager", { enumerable: true, get: function () { return permissions_1.PermManager; } });

2
out/permissions.d.ts vendored
View File

@@ -20,5 +20,5 @@ export declare class PermQuery extends Query {
execute(action: string): PermQuery; execute(action: string): PermQuery;
sync(): PermQuery; sync(): PermQuery;
} }
export declare const Permissions: PermissionManager; export declare const PermManager: PermissionManager;
export {}; export {};

6
out/permissions.js
View File

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
}); });
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.Permissions = exports.PermQuery = void 0; exports.PermManager = exports.PermQuery = void 0;
const role_acl_1 = require("role-acl"); const role_acl_1 = require("role-acl");
const Query_1 = require("role-acl/lib/src/core/Query"); const Query_1 = require("role-acl/lib/src/core/Query");
// see https://www.npmjs.com/package/role-acl // see https://www.npmjs.com/package/role-acl
@@ -57,10 +57,8 @@ class PermQuery extends Query_1.Query {
}); });
var _a; var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
console.log("heee");
if (this.resolveRequest) { if (this.resolveRequest) {
const userInfo = yield this.resolveRequest.getUserInfo(); const userInfo = yield this.resolveRequest.getUserInfo();
console.log("huuu", userInfo, typeof userInfo);
const availableRoles = Object.keys(this._grants); const availableRoles = Object.keys(this._grants);
const roles = ((_a = userInfo === null || userInfo === void 0 ? void 0 : userInfo.groups) !== null && _a !== void 0 ? _a : []).filter(x => availableRoles.includes(x)); const roles = ((_a = userInfo === null || userInfo === void 0 ? void 0 : userInfo.groups) !== null && _a !== void 0 ? _a : []).filter(x => availableRoles.includes(x));
this.role(roles); this.role(roles);
@@ -93,4 +91,4 @@ class PermQuery extends Query_1.Query {
} }
} }
exports.PermQuery = PermQuery; exports.PermQuery = PermQuery;
exports.Permissions = new PermissionManager(); exports.PermManager = new PermissionManager();