@minimaltech/node-infra 0.5.9-2 → 0.5.9-21

package/dist/components/authenticate/controllers/auth.controller.js

@@ -21,29 +21,27 @@ const rest_1 = require("@loopback/rest");
 const security_1 = require("@loopback/security");
 const common_1 = require("../common");
 const defineAuthController = (opts) => {
-    var _a, _b, _c;
     var BaseAuthController_1;
     const { restPath = '/auth', requireAuthenticatedSignUp = false, serviceKey = 'services.UserService', } = opts;
     let BaseAuthController = BaseAuthController_1 = class BaseAuthController extends controllers_1.BaseController {
+        requestContext;
+        service;
+        getCurrentUser;
         constructor(requestContext, authService, getCurrentUser) {
             super({ scope: BaseAuthController_1.name });
             this.service = authService;
             this.getCurrentUser = getCurrentUser;
             this.requestContext = requestContext;
         }
-        // ------------------------------------------------------------------------------
         whoami() {
             return this.getCurrentUser();
         }
-        // ------------------------------------------------------------------------------
         signIn(payload) {
-            return this.service.signIn(Object.assign(Object.assign({}, payload), { requestContext: this.requestContext }));
+            return this.service.signIn({ ...payload, requestContext: this.requestContext });
         }
-        // ------------------------------------------------------------------------------
         signUp(payload) {
-            return this.service.signUp(Object.assign(Object.assign({}, payload), { requestContext: this.requestContext }));
+            return this.service.signUp({ ...payload, requestContext: this.requestContext });
         }
-        //-------------------------------------------------------------------------------
         changePassword(payload) {
             return new Promise((resolve, reject) => {
                 this.getCurrentUser()
@@ -56,7 +54,11 @@ const defineAuthController = (opts) => {
                         return;
                     }
                     this.service
-                        .changePassword(Object.assign(Object.assign({}, payload), { userId: currentUser.userId, requestContext: this.requestContext }))
+                        .changePassword({
+                        ...payload,
+                        userId: currentUser.userId,
+                        requestContext: this.requestContext,
+                    })
                         .then(resolve)
                         .catch(reject);
                 })
@@ -77,7 +79,7 @@ const defineAuthController = (opts) => {
             required: true,
             content: {
                 'application/json': {
-                    schema: (0, utilities_1.getSchemaObject)((_a = opts === null || opts === void 0 ? void 0 : opts.signInRequest) !== null && _a !== void 0 ? _a : common_1.SignInRequest),
+                    schema: (0, utilities_1.getSchemaObject)(opts?.signInRequest ?? common_1.SignInRequest),
                 },
             },
         })),
@@ -91,7 +93,7 @@ const defineAuthController = (opts) => {
         __param(0, (0, rest_1.requestBody)({
             content: {
                 'application/json': {
-                    schema: (0, utilities_1.getSchemaObject)((_b = opts === null || opts === void 0 ? void 0 : opts.signUpRequest) !== null && _b !== void 0 ? _b : common_1.SignUpRequest),
+                    schema: (0, utilities_1.getSchemaObject)(opts?.signUpRequest ?? common_1.SignUpRequest),
                 },
             },
         })),
@@ -106,7 +108,7 @@ const defineAuthController = (opts) => {
             required: true,
             content: {
                 'application/json': {
-                    schema: (0, utilities_1.getSchemaObject)((_c = opts === null || opts === void 0 ? void 0 : opts.changePasswordRequest) !== null && _c !== void 0 ? _c : common_1.ChangePasswordRequest),
+                    schema: (0, utilities_1.getSchemaObject)(opts?.changePasswordRequest ?? common_1.ChangePasswordRequest),
                 },
             },
         })),
@@ -124,4 +126,3 @@ const defineAuthController = (opts) => {
     return BaseAuthController;
 };
 exports.defineAuthController = defineAuthController;
-//# sourceMappingURL=auth.controller.js.map

package/dist/components/authenticate/controllers/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth.controller"), exports);
 __exportStar(require("./oauth2.controller"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/controllers/oauth2.controller.d.ts

@@ -1,25 +1,22 @@
 import { IdType, TInjectionGetter } from '../../../common';
-import { ApplicationLogger } from '../../../helpers';
 import { Context, Getter } from '@loopback/core';
-import { ExpressRequestHandler, ExpressServer, ExpressServerConfig, RequestContext } from '@loopback/rest';
+import { ExpressServerConfig, RequestContext } from '@loopback/rest';
 import { OAuth2Service } from '../services';
+import { AbstractExpressRequestHandler } from '../../../base/controllers';
 import { IAuthenticateOAuth2RestOptions, OAuth2Request } from '../common';
 interface IOAuth2ControllerOptions {
     config?: ExpressServerConfig | undefined;
-    parent?: Context;
-    authServiceKey: string;
+    context?: Context;
     injectionGetter: TInjectionGetter;
+    authServiceKey: string;
     viewFolder?: string;
 }
-export declare class DefaultOAuth2ExpressServer extends ExpressServer {
+export declare class DefaultOAuth2ExpressServer extends AbstractExpressRequestHandler {
     private static instance;
     private authServiceKey;
-    private injectionGetter;
     private viewFolder?;
-    private logger;
     constructor(opts: IOAuth2ControllerOptions);
     static getInstance(opts: IOAuth2ControllerOptions): DefaultOAuth2ExpressServer;
-    getApplicationHandler(): ExpressRequestHandler;
     binding(): void;
 }
 export declare const defineOAuth2Controller: (opts?: IAuthenticateOAuth2RestOptions) => {
@@ -39,7 +36,7 @@ export declare const defineOAuth2Controller: (opts?: IAuthenticateOAuth2RestOpti
         getOAuth2RequestPath(payload: OAuth2Request): Promise<{
             requestPath: string;
         }>;
-        logger: ApplicationLogger;
+        logger: import("../../../helpers").ApplicationLogger;
         defaultLimit: number;
     };
 };

package/dist/components/authenticate/controllers/oauth2.controller.js

@@ -29,14 +29,17 @@ const controllers_1 = require("../../../base/controllers");
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const node_path_1 = require("node:path");
 const common_2 = require("../common");
-// --------------------------------------------------------------------------------
-class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
+class DefaultOAuth2ExpressServer extends controllers_1.AbstractExpressRequestHandler {
+    static instance;
+    authServiceKey;
+    viewFolder;
     constructor(opts) {
-        super(opts.config, opts.parent);
+        super({
+            ...opts,
+            scope: DefaultOAuth2ExpressServer.name,
+        });
         this.authServiceKey = opts.authServiceKey;
-        this.injectionGetter = opts.injectionGetter;
         this.viewFolder = opts.viewFolder;
-        this.logger = helpers_1.LoggerFactory.getLogger([DefaultOAuth2ExpressServer.name]);
         this.binding();
     }
     static getInstance(opts) {
@@ -46,21 +49,17 @@ class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
         }
         return this.instance;
     }
-    getApplicationHandler() {
-        return this.expressApp;
-    }
     binding() {
-        var _a, _b, _c;
         this.expressApp.set('view engine', 'ejs');
-        const oauth2ViewFolder = (_b = (_a = this.viewFolder) !== null && _a !== void 0 ? _a : helpers_1.applicationEnvironment.get(common_1.EnvironmentKeys.APP_ENV_OAUTH2_VIEW_FOLDER)) !== null && _b !== void 0 ? _b : (0, node_path_1.join)(__dirname, '../', 'views');
+        const oauth2ViewFolder = this.viewFolder ??
+            helpers_1.applicationEnvironment.get(common_1.EnvironmentKeys.APP_ENV_OAUTH2_VIEW_FOLDER) ??
+            (0, node_path_1.join)(__dirname, '../', 'views');
         this.expressApp.set('views', oauth2ViewFolder);
         this.logger.info('[binding] View folder: %s', oauth2ViewFolder);
-        const basePath = (_c = helpers_1.applicationEnvironment.get(common_1.EnvironmentKeys.APP_ENV_SERVER_BASE_PATH)) !== null && _c !== void 0 ? _c : '';
+        const basePath = helpers_1.applicationEnvironment.get(common_1.EnvironmentKeys.APP_ENV_SERVER_BASE_PATH) ?? '';
         const authAction = `${basePath}/oauth2/auth`;
         this.logger.info('[binding] Auth action path: %s', authAction);
-        // -----------------------------------------------------------------------------------------------------------------
         this.expressApp.get('/auth', (request, response) => {
-            var _a;
             const { c, r } = request.query;
             if (!c) {
                 response.render('pages/auth', {
@@ -73,14 +72,13 @@ class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
                 title: `${helpers_1.applicationEnvironment.get(common_1.EnvironmentKeys.APP_ENV_APPLICATION_NAME)} OAuth`,
                 action: authAction,
                 c: decodeURIComponent(c.toString()),
-                r: decodeURIComponent((_a = r === null || r === void 0 ? void 0 : r.toString()) !== null && _a !== void 0 ? _a : ''),
+                r: decodeURIComponent(r?.toString() ?? ''),
             };
             response.render('pages/auth', {
                 message: 'Please fill out your credential!',
                 payload,
             });
         });
-        // -----------------------------------------------------------------------------------------------------------------
         this.expressApp.post('/auth', (request, response) => {
             const { username, password, token, redirectUrl } = request.body;
             const requiredProps = [
@@ -90,7 +88,7 @@ class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
                 { key: 'redirectUrl', value: username },
             ];
             for (const prop of requiredProps) {
-                if ((prop === null || prop === void 0 ? void 0 : prop.value) && !(0, isEmpty_1.default)(prop === null || prop === void 0 ? void 0 : prop.value)) {
+                if (prop?.value && !(0, isEmpty_1.default)(prop?.value)) {
                     continue;
                 }
                 this.logger.error('[oauth2][post] Missing prop: %s | key: %s | value: %s', prop.key, prop.key, prop.value);
@@ -99,7 +97,7 @@ class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
                 });
                 return;
             }
-            const oauth2Service = this.injectionGetter('services.OAuth2Service');
+            const oauth2Service = this.getSync('services.OAuth2Service');
             const decryptedClient = oauth2Service.decryptClientToken({ token });
             oauth2Service
                 .doOAuth2({
@@ -134,33 +132,30 @@ class DefaultOAuth2ExpressServer extends rest_1.ExpressServer {
                 });
             })
                 .catch(error => {
-                var _a;
                 response.render('pages/error', {
-                    message: `${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : 'Failed to authenticate'} | Please try to request again!`,
+                    message: `${error?.message ?? 'Failed to authenticate'} | Please try to request again!`,
                 });
             });
         });
     }
 }
 exports.DefaultOAuth2ExpressServer = DefaultOAuth2ExpressServer;
-// --------------------------------------------------------------------------------
 const defineOAuth2Controller = (opts) => {
     var BaseOAuth2Controller_1;
-    const { restPath = '/oauth2', tokenPath = '/token', authorizePath = '/authorize', oauth2ServiceKey = 'services.OAuth2Service',
-    // authStrategy = { name: `${applicationEnvironment.get<string>(EnvironmentKeys.APP_ENV_APPLICATION_NAME)}_oauth2` },
-     } = opts !== null && opts !== void 0 ? opts : {};
+    const { restPath = '/oauth2', tokenPath = '/token', authorizePath = '/authorize', oauth2ServiceKey = 'services.OAuth2Service', } = opts ?? {};
     let BaseOAuth2Controller = BaseOAuth2Controller_1 = class BaseOAuth2Controller extends controllers_1.BaseController {
+        service;
+        getCurrentUser;
+        httpContext;
         constructor(authService, getCurrentUser, httpContext) {
             super({ scope: BaseOAuth2Controller_1.name });
             this.service = authService;
             this.getCurrentUser = getCurrentUser;
             this.httpContext = httpContext;
         }
-        // ------------------------------------------------------------------------------
         whoami() {
             return this.getCurrentUser();
         }
-        // ------------------------------------------------------------------------------
         generateToken() {
             const { request, response } = this.httpContext;
             return this.service.generateToken({
@@ -168,7 +163,6 @@ const defineOAuth2Controller = (opts) => {
                 response: new oauth2_server_1.Response(response),
             });
         }
-        // ------------------------------------------------------------------------------
         authorize() {
             const { request, response } = this.httpContext;
             return this.service.authorize({
@@ -176,7 +170,6 @@ const defineOAuth2Controller = (opts) => {
                 response: new oauth2_server_1.Response(response),
             });
         }
-        // ------------------------------------------------------------------------------
         getOAuth2RequestPath(payload) {
             return this.service.getOAuth2RequestPath(payload);
         }
@@ -224,4 +217,3 @@ const defineOAuth2Controller = (opts) => {
     return BaseOAuth2Controller;
 };
 exports.defineOAuth2Controller = defineOAuth2Controller;
-//# sourceMappingURL=oauth2.controller.js.map

package/dist/components/authenticate/index.js

@@ -21,4 +21,3 @@ __exportStar(require("./middleware"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./oauth2-handlers"), exports);
 __exportStar(require("./services"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/middleware.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 AuthenticationMiddleware_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthenticationMiddleware = void 0;
@@ -29,50 +20,49 @@ const core_1 = require("@loopback/core");
 const rest_1 = require("@loopback/rest");
 const common_1 = require("./common");
 let AuthenticationMiddleware = AuthenticationMiddleware_1 = class AuthenticationMiddleware extends base_provider_1.BaseProvider {
+    authenticateFn;
+    alwaysAllowPathGetter;
     constructor(authenticateFn, alwaysAllowPathGetter) {
         super({ scope: AuthenticationMiddleware_1.name });
         this.authenticateFn = authenticateFn;
         this.alwaysAllowPathGetter = alwaysAllowPathGetter;
     }
-    authenticate(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                const { url = '' } = request;
-                this.logger.debug('[authenticate] Authenticating request | Url: %s', (_a = decodeURIComponent(url)) === null || _a === void 0 ? void 0 : _a.replace(/(?:\r\n|\r|\n)/g, ''));
-                yield this.authenticateFn(request);
-            }
-            catch (error) {
-                const { code } = error || {};
-                switch (code) {
-                    case authentication_1.AUTHENTICATION_STRATEGY_NOT_FOUND:
-                    case authentication_1.USER_PROFILE_NOT_FOUND: {
-                        Object.assign(error, { statusCode: 401 });
-                        break;
-                    }
-                    default: {
-                        this.logger.error('[authenticate] User request failed to authenticate | %s', error);
-                        break;
-                    }
+    async authenticate(request) {
+        try {
+            const { url = '' } = request;
+            this.logger.debug('[authenticate] Authenticating request | Url: %s', decodeURIComponent(url)?.replace(/(?:\r\n|\r|\n)/g, ''));
+            await this.authenticateFn(request);
+        }
+        catch (error) {
+            const { code } = error || {};
+            switch (code) {
+                case authentication_1.AUTHENTICATION_STRATEGY_NOT_FOUND:
+                case authentication_1.USER_PROFILE_NOT_FOUND: {
+                    Object.assign(error, { statusCode: 401 });
+                    break;
+                }
+                default: {
+                    this.logger.error('[authenticate] User request failed to authenticate | %s', error);
+                    break;
                 }
-                throw error;
             }
-        });
+            throw error;
+        }
     }
     value() {
-        return (context, next) => __awaiter(this, void 0, void 0, function* () {
+        return async (context, next) => {
             const t = new Date().getTime();
             const { request } = context;
             const { url } = request;
             const requestUrl = decodeURIComponent(url);
             const requestPath = requestUrl.slice(0, requestUrl.indexOf('?'));
-            const alwaysAllowPaths = yield this.alwaysAllowPathGetter();
+            const alwaysAllowPaths = await this.alwaysAllowPathGetter();
             if (!alwaysAllowPaths.includes(requestPath)) {
-                yield this.authenticate(request);
+                await this.authenticate(request);
             }
             this.logger.debug('[handle] Authenticated request... | Took: %d(ms)', new Date().getTime() - t);
             return next();
-        });
+        };
     }
 };
 exports.AuthenticationMiddleware = AuthenticationMiddleware;
@@ -86,4 +76,3 @@ exports.AuthenticationMiddleware = AuthenticationMiddleware = AuthenticationMidd
     __param(1, core_1.inject.getter(common_1.AuthenticateKeys.ALWAYS_ALLOW_PATHS)),
     __metadata("design:paramtypes", [Function, Function])
 ], AuthenticationMiddleware);
-//# sourceMappingURL=middleware.js.map

package/dist/components/authenticate/models/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./oauth2-client.model"), exports);
 __exportStar(require("./oauth2-scope.model"), exports);
 __exportStar(require("./oauth2-token.model"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/models/oauth2-client.model.js

@@ -13,6 +13,14 @@ exports.OAuth2Client = void 0;
 const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
 let OAuth2Client = class OAuth2Client extends models_1.BaseTzEntity {
+    identifier;
+    clientId;
+    name;
+    description;
+    clientSecret;
+    grants;
+    endpoints;
+    userId;
     constructor(data) {
         super(data);
     }
@@ -58,9 +66,6 @@ __decorate([
         type: 'array',
         itemType: 'string',
         default: [],
-        /* jsonSchema: {
-          enum: ['authorization_code'],
-        }, */
         postgresql: { columnName: 'grants', dataType: 'jsonb' },
     }),
     __metadata("design:type", Array)
@@ -100,4 +105,3 @@ exports.OAuth2Client = OAuth2Client = __decorate([
     }),
     __metadata("design:paramtypes", [Object])
 ], OAuth2Client);
-//# sourceMappingURL=oauth2-client.model.js.map

package/dist/components/authenticate/models/oauth2-scope.model.js

@@ -13,6 +13,10 @@ exports.OAuth2Scope = void 0;
 const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
 let OAuth2Scope = class OAuth2Scope extends models_1.BaseTzEntity {
+    identifier;
+    name;
+    description;
+    protocol;
     constructor(data) {
         super(data);
     }
@@ -58,4 +62,3 @@ exports.OAuth2Scope = OAuth2Scope = __decorate([
     }),
     __metadata("design:paramtypes", [Object])
 ], OAuth2Scope);
-//# sourceMappingURL=oauth2-scope.model.js.map

package/dist/components/authenticate/models/oauth2-token.model.js

@@ -15,6 +15,13 @@ const common_1 = require("../../../common");
 const repository_1 = require("@loopback/repository");
 const oauth2_client_model_1 = require("./oauth2-client.model");
 let OAuth2Token = class OAuth2Token extends models_1.BaseTzEntity {
+    token;
+    type;
+    status;
+    scopes;
+    clientId;
+    userId;
+    details;
     constructor(data) {
         super(data);
     }
@@ -84,4 +91,3 @@ exports.OAuth2Token = OAuth2Token = __decorate([
     }),
     __metadata("design:paramtypes", [Object])
 ], OAuth2Token);
-//# sourceMappingURL=oauth2-token.model.js.map

package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js

@@ -18,14 +18,13 @@ class OAuth2AuthorizationCodeHandler extends base_1.AbstractOAuth2Authentication
                 token: authorizationCode,
             })
                 .then(rs => {
-                var _a, _b;
                 const { token: oauth2Token, client, user } = rs;
                 resolve({
                     authorizationCode: oauth2Token.token,
-                    expiresAt: new Date((_a = oauth2Token.details) === null || _a === void 0 ? void 0 : _a.expiresAt),
-                    redirectUri: (_b = oauth2Token.details) === null || _b === void 0 ? void 0 : _b.redirectUri,
+                    expiresAt: new Date(oauth2Token.details?.expiresAt),
+                    redirectUri: oauth2Token.details?.redirectUri,
                     scope: oauth2Token.scopes,
-                    client: Object.assign(Object.assign({}, client), { id: client.id.toString() }),
+                    client: { ...client, id: client.id.toString() },
                     user,
                 });
             })
@@ -42,7 +41,7 @@ class OAuth2AuthorizationCodeHandler extends base_1.AbstractOAuth2Authentication
                 details: code,
             })
                 .then(() => {
-                resolve(Object.assign(Object.assign({}, code), { client, user }));
+                resolve({ ...code, client, user });
             })
                 .catch(reject);
         });
@@ -53,4 +52,3 @@ class OAuth2AuthorizationCodeHandler extends base_1.AbstractOAuth2Authentication
     }
 }
 exports.OAuth2AuthorizationCodeHandler = OAuth2AuthorizationCodeHandler;
-//# sourceMappingURL=authorization-code.handler.js.map