diff --git a/out/auth-proxy.js b/out/auth-proxy.js index 0628d43..20b53c8 100644 --- a/out/auth-proxy.js +++ b/out/auth-proxy.js @@ -14,25 +14,18 @@ const _1 = require("."); const node_fetch_1 = require("node-fetch"); const router = (req, res, next) => { 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) { return undefined; } const token = req.header(_1.DefaultConfig.USERINFO_HEADER); - console.log("token", token); const url = _1.DefaultConfig.AUTH_PROXY_USERINFO_URL || _1.DefaultConfig.AUTH_PROXY_URL && _1.urlJoin(_1.DefaultConfig.AUTH_PROXY_URL, "userinfo"); - console.log("url", url); if (token === undefined || url === undefined) { return undefined; } - console.log("fetch"); try { const res = yield node_fetch_1.default(url, { headers: [[_1.DefaultConfig.USERINFO_HEADER, token]] }); - console.log("res"); - const json = yield res.json(); - console.log("json", json); - return json; + return yield res.json(); } catch (e) { _1.Logger.warn(e); diff --git a/out/index.d.ts b/out/index.d.ts index 629e06c..32cf0dd 100644 --- a/out/index.d.ts +++ b/out/index.d.ts @@ -7,5 +7,5 @@ export { urlJoin } from './helpers/urlJoin'; export { AutoReloader } from './auto-reload'; export { Polyfill, PolyfillOptions, PolyfillFeatureList } from './polyfill'; export { Session } from './session'; -export { Permissions } from './permissions'; +export { PermManager } from './permissions'; export { UserInfo } from './helpers/userinfo'; diff --git a/out/index.js b/out/index.js index 9e7d2af..b01cfc6 100644 --- a/out/index.js +++ b/out/index.js @@ -1,6 +1,6 @@ "use strict"; 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"); Object.defineProperty(exports, "DefaultConfig", { enumerable: true, get: function () { return config_1.DefaultConfig; } }); var redis_1 = require("./redis"); @@ -22,4 +22,4 @@ Object.defineProperty(exports, "Polyfill", { enumerable: true, get: function () var session_1 = require("./session"); Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return session_1.Session; } }); 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; } }); diff --git a/out/permissions.d.ts b/out/permissions.d.ts index f6e48fb..43a0cfd 100644 --- a/out/permissions.d.ts +++ b/out/permissions.d.ts @@ -20,5 +20,5 @@ export declare class PermQuery extends Query { execute(action: string): PermQuery; sync(): PermQuery; } -export declare const Permissions: PermissionManager; +export declare const PermManager: PermissionManager; export {}; diff --git a/out/permissions.js b/out/permissions.js index 080bf81..93559a7 100644 --- a/out/permissions.js +++ b/out/permissions.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; 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 Query_1 = require("role-acl/lib/src/core/Query"); // see https://www.npmjs.com/package/role-acl @@ -57,10 +57,8 @@ class PermQuery extends Query_1.Query { }); var _a; return __awaiter(this, void 0, void 0, function* () { - console.log("heee"); if (this.resolveRequest) { const userInfo = yield this.resolveRequest.getUserInfo(); - console.log("huuu", userInfo, typeof userInfo); 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)); this.role(roles); @@ -93,4 +91,4 @@ class PermQuery extends Query_1.Query { } } exports.PermQuery = PermQuery; -exports.Permissions = new PermissionManager(); +exports.PermManager = new PermissionManager();