@minimaltech/node-infra 0.5.9-9 → 0.5.9

package/dist/common/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./statuses"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./keys"), exports);
 __exportStar(require("./environments"), exports);
-//# sourceMappingURL=index.js.map

package/dist/common/keys.js

@@ -6,4 +6,3 @@ class BindingKeys {
 exports.BindingKeys = BindingKeys;
 BindingKeys.APPLICATION_ENVIRONMENTS = '@qt/application/environments';
 BindingKeys.APPLICATION_MIDDLEWARE_OPTIONS = '@app/application/middleware_options';
-//# sourceMappingURL=keys.js.map

package/dist/common/statuses.js

@@ -56,4 +56,3 @@ OAuth2TokenStatuses.UNKNOWN = Statuses.UNKNOWN;
 OAuth2TokenStatuses.ACTIVATED = Statuses.ACTIVATED;
 OAuth2TokenStatuses.DEACTIVATED = Statuses.DEACTIVATED;
 OAuth2TokenStatuses.SCHEME_SET = new Set([_b.ACTIVATED, _b.DEACTIVATED]);
-//# sourceMappingURL=statuses.js.map

package/dist/common/types.d.ts

@@ -1,5 +1,5 @@
-import { AbstractTzRepository } from '../base';
-import { BaseEntity, BaseIdEntity, BaseTzEntity } from '../base/models';
+import { BaseEntity, TBaseIdEntity, TBaseTzEntity } from '../base/models';
+import { AbstractTzRepository } from '../base/repositories';
 import { Binding, BindingFromClassOptions, BindingKey, Constructor, ControllerClass } from '@loopback/core';
 import { Count, DataObject, Entity, Filter, JugglerDataSource, Options, Repository, Transaction, Where } from '@loopback/repository';
 import { RequestContext, SequenceHandler } from '@loopback/rest';
@@ -115,7 +115,7 @@ export interface IRepository {
 export type TDBAction = Options & {
     transaction?: Transaction;
 };
-export interface IPersistableRepository<E extends BaseIdEntity> extends IRepository {
+export interface IPersistableRepository<E extends TBaseIdEntity> extends IRepository {
     findOne(filter?: Filter<E>, options?: TDBAction): Promise<E | null>;
     existsWith(where?: Where<any>, options?: TDBAction): Promise<boolean>;
     create(data: DataObject<E>, options?: TDBAction): Promise<E>;
@@ -127,7 +127,7 @@ export interface IPersistableRepository<E extends BaseIdEntity> extends IReposit
     upsertWith(data: DataObject<E>, where: Where<any>, options?: TDBAction): Promise<E | null>;
     replaceById(id: IdType, data: DataObject<E>, options?: TDBAction): Promise<void>;
 }
-export interface ITzRepository<E extends BaseTzEntity> extends IPersistableRepository<E> {
+export interface ITzRepository<E extends TBaseTzEntity> extends IPersistableRepository<E> {
     mixTimestamp(entity: DataObject<E>, options?: {
         newInstance: boolean;
     }): DataObject<E>;
@@ -151,7 +151,7 @@ export interface ICrudMethodOptions {
     requestContext: RequestContext;
     [extra: symbol | string]: any;
 }
-export interface ICrudService<E extends BaseTzEntity> extends IService {
+export interface ICrudService<E extends TBaseTzEntity> extends IService {
     repository: AbstractTzRepository<E, EntityRelationType>;
     find(filter: Filter<E>, options: ICrudMethodOptions): Promise<Array<E & EntityRelationType>>;
     findById(id: IdType, filter: Filter<E>, options: ICrudMethodOptions): Promise<E & EntityRelationType>;

package/dist/common/types.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/components/authenticate/common/constants.js

@@ -20,4 +20,3 @@ exports.AuthenticationTokenTypes = AuthenticationTokenTypes;
 AuthenticationTokenTypes.TYPE_AUTHORIZATION_CODE = '000_AUTHORIZATION_CODE';
 AuthenticationTokenTypes.TYPE_ACCESS_TOKEN = '100_ACCESS_TOKEN';
 AuthenticationTokenTypes.TYPE_REFRESH_TOKEN = '200_REFRESH_TOKEN';
-//# sourceMappingURL=constants.js.map

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

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./keys"), exports);
 __exportStar(require("./types"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/common/keys.js

@@ -11,4 +11,3 @@ AuthenticateKeys.ALWAYS_ALLOW_PATHS = '@app/authenticate/always_allow_paths';
 AuthenticateKeys.GET_TOKEN_EXPIRES_FN = '@app/authenticate/get_token_expires_fn';
 AuthenticateKeys.OAUTH2_HANDLER = '@app/authenticate/oauth2_handler';
 AuthenticateKeys.OAUTH2_OPTIONS = '@app/authenticate/oauth2_options';
-//# sourceMappingURL=keys.js.map

package/dist/components/authenticate/common/types.d.ts

@@ -9,6 +9,7 @@ export interface IJWTTokenPayload extends UserProfile {
         priority: number;
     }[];
     clientId?: string;
+    provider?: string;
 }
 export interface ITokenPayload extends IJWTTokenPayload {
 }

package/dist/components/authenticate/common/types.js

@@ -143,4 +143,3 @@ exports.OAuth2Request = OAuth2Request = __decorate([
         },
     })
 ], OAuth2Request);
-//# sourceMappingURL=types.js.map

package/dist/components/authenticate/component.js

@@ -104,7 +104,6 @@ let AuthenticateComponent = AuthenticateComponent_1 = class AuthenticateComponen
         const oauth2Controller = (0, controllers_1.defineOAuth2Controller)(oauth2Options.restOptions);
         this.application.controller(oauth2Controller);
         this.application.mountExpressRouter((_b = (_a = oauth2Options.restOptions) === null || _a === void 0 ? void 0 : _a.restPath) !== null && _b !== void 0 ? _b : '/oauth2', controllers_1.DefaultOAuth2ExpressServer.getInstance({
-            context: this.application,
             viewFolder,
             authServiceKey: handler.authServiceKey,
             injectionGetter: this.application.getInjectionGetter(),
@@ -144,4 +143,3 @@ exports.AuthenticateComponent = AuthenticateComponent = AuthenticateComponent_1
     __param(0, (0, core_1.inject)(core_1.CoreBindings.APPLICATION_INSTANCE)),
     __metadata("design:paramtypes", [applications_1.BaseApplication])
 ], AuthenticateComponent);
-//# sourceMappingURL=component.js.map

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

@@ -124,4 +124,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

@@ -4,6 +4,8 @@ import { ExpressServerConfig, RequestContext } from '@loopback/rest';
 import { OAuth2Service } from '../services';
 import { AbstractExpressRequestHandler } from '../../../base/controllers';
 import { IAuthenticateOAuth2RestOptions, OAuth2Request } from '../common';
+import { OAuth2Client } from '../models';
+import { OAuth2ClientRepository } from '../repositories';
 interface IOAuth2ControllerOptions {
     config?: ExpressServerConfig | undefined;
     context?: Context;
@@ -40,4 +42,43 @@ export declare const defineOAuth2Controller: (opts?: IAuthenticateOAuth2RestOpti
         defaultLimit: number;
     };
 };
+declare const _OAuth2ClientController: {
+    new (repository: import("../../..").DefaultCrudRepository<OAuth2Client, import("../../../common").EntityRelationType, {}>): {
+        repository: import("../../..").DefaultCrudRepository<OAuth2Client, import("../../../common").EntityRelationType, {}>;
+        defaultLimit: number;
+        find(filter?: import("@loopback/repository").Filter<OAuth2Client> | undefined): Promise<OAuth2Client[]>;
+        findById(id: IdType, filter?: import("@loopback/repository").FilterExcludingWhere<OAuth2Client> | undefined): Promise<OAuth2Client>;
+        findOne(filter?: import("@loopback/repository").Filter<OAuth2Client> | undefined): Promise<OAuth2Client | null>;
+        count(where?: import("@loopback/repository").Where<OAuth2Client> | undefined): Promise<import("@loopback/repository").Count>;
+    };
+} | {
+    new (repository: import("../../..").DefaultCrudRepository<OAuth2Client, import("../../../common").EntityRelationType, {}>, getCurrentUser?: Getter<import("../common").IJWTTokenPayload>): {
+        getCurrentUser?: Getter<import("../common").IJWTTokenPayload>;
+        _getContextUser(): Promise<{
+            userId: IdType;
+            roles: {
+                id: IdType;
+                identifier: string;
+                priority: number;
+            }[];
+        } | null>;
+        create(data: Omit<OAuth2Client, "id">): Promise<OAuth2Client>;
+        updateAll(data: Partial<OAuth2Client>, where?: import("@loopback/repository").Where<OAuth2Client> | undefined): Promise<import("@loopback/repository").Count>;
+        updateById(id: IdType, data: Partial<OAuth2Client>): Promise<OAuth2Client>;
+        replaceById(id: IdType, data: OAuth2Client): Promise<OAuth2Client>;
+        deleteById(id: IdType): Promise<{
+            id: IdType;
+        }>;
+        repository: import("../../..").DefaultCrudRepository<OAuth2Client, import("../../../common").EntityRelationType, {}>;
+        defaultLimit: number;
+        find(filter?: import("@loopback/repository").Filter<OAuth2Client> | undefined): Promise<OAuth2Client[]>;
+        findById(id: IdType, filter?: import("@loopback/repository").FilterExcludingWhere<OAuth2Client> | undefined): Promise<OAuth2Client>;
+        findOne(filter?: import("@loopback/repository").Filter<OAuth2Client> | undefined): Promise<OAuth2Client | null>;
+        count(where?: import("@loopback/repository").Where<OAuth2Client> | undefined): Promise<import("@loopback/repository").Count>;
+    };
+};
+export declare class OAuth2ClientController extends _OAuth2ClientController {
+    protected repository: OAuth2ClientRepository;
+    constructor(repository: OAuth2ClientRepository);
+}
 export {};

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

@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineOAuth2Controller = exports.DefaultOAuth2ExpressServer = void 0;
+exports.OAuth2ClientController = exports.defineOAuth2Controller = exports.DefaultOAuth2ExpressServer = void 0;
 const common_1 = require("../../../common");
 const helpers_1 = require("../../../helpers");
 const utilities_1 = require("../../../utilities");
@@ -29,6 +29,8 @@ 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");
+const models_1 = require("../models");
+const repositories_1 = require("../repositories");
 // --------------------------------------------------------------------------------
 class DefaultOAuth2ExpressServer extends controllers_1.AbstractExpressRequestHandler {
     constructor(opts) {
@@ -94,7 +96,7 @@ class DefaultOAuth2ExpressServer extends controllers_1.AbstractExpressRequestHan
                 });
                 return;
             }
-            const oauth2Service = this.getSync('services.OAuth2Service');
+            const oauth2Service = this.injectionGetter('services.OAuth2Service');
             const decryptedClient = oauth2Service.decryptClientToken({ token });
             oauth2Service
                 .doOAuth2({
@@ -116,12 +118,17 @@ class DefaultOAuth2ExpressServer extends controllers_1.AbstractExpressRequestHan
                     return;
                 }
                 oauth2Service
-                    .doClientCallback({ c: token, oauth2Token: rs.oauth2TokenRs })
+                    .doClientCallback({
+                    c: token,
+                    oauth2Token: rs.oauth2TokenRs,
+                })
                     .then(() => {
+                    var _a, _b;
                     const url = new URL(rs.redirectUrl);
                     url.searchParams.append('c', encodeURIComponent(token));
                     url.searchParams.append('clientId', client.clientId);
                     url.searchParams.append('accessToken', accessToken);
+                    url.searchParams.append('userReference', (_b = (_a = rs.oauth2TokenRs.user) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '-1');
                     response.redirect(url.toString());
                 })
                     .catch(error => {
@@ -219,4 +226,21 @@ const defineOAuth2Controller = (opts) => {
     return BaseOAuth2Controller;
 };
 exports.defineOAuth2Controller = defineOAuth2Controller;
-//# sourceMappingURL=oauth2.controller.js.map
+// --------------------------------------------------------------------------------
+const _OAuth2ClientController = (0, controllers_1.defineCrudController)({
+    entity: models_1.OAuth2Client,
+    repository: { name: repositories_1.OAuth2ClientRepository.name },
+    controller: { basePath: '/oauth2/clients' },
+});
+let OAuth2ClientController = class OAuth2ClientController extends _OAuth2ClientController {
+    constructor(repository) {
+        super(repository);
+        this.repository = repository;
+    }
+};
+exports.OAuth2ClientController = OAuth2ClientController;
+exports.OAuth2ClientController = OAuth2ClientController = __decorate([
+    (0, rest_1.api)({ basePath: '/oauth2/clients' }),
+    __param(0, (0, core_1.inject)('repositories.OAuth2ClientRepository')),
+    __metadata("design:paramtypes", [repositories_1.OAuth2ClientRepository])
+], OAuth2ClientController);

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

@@ -86,4 +86,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.d.ts

@@ -1,6 +1,7 @@
-import { BaseTzEntity } from '../../../base/models';
+import { BaseNumberTzEntity } from '../../../base/models';
 import { NumberIdType } from '../../../common';
-export declare class OAuth2Client extends BaseTzEntity {
+export declare class OAuth2Client extends BaseNumberTzEntity {
+    provider: string;
     identifier: string;
     clientId: string;
     name: string;

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

@@ -12,12 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Client = void 0;
 const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
-let OAuth2Client = class OAuth2Client extends models_1.BaseTzEntity {
+let OAuth2Client = class OAuth2Client extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }
 };
 exports.OAuth2Client = OAuth2Client;
+__decorate([
+    (0, repository_1.property)({
+        type: 'string',
+        postgresql: { columnName: 'provider' },
+    }),
+    __metadata("design:type", String)
+], OAuth2Client.prototype, "provider", void 0);
 __decorate([
     (0, repository_1.property)({
         type: 'string',
@@ -100,4 +107,3 @@ exports.OAuth2Client = OAuth2Client = __decorate([
     }),
     __metadata("design:paramtypes", [Object])
 ], OAuth2Client);
-//# sourceMappingURL=oauth2-client.model.js.map

package/dist/components/authenticate/models/oauth2-scope.model.d.ts

@@ -1,5 +1,5 @@
-import { BaseTzEntity } from '../../../base/models';
-export declare class OAuth2Scope extends BaseTzEntity {
+import { BaseNumberTzEntity } from '../../../base/models';
+export declare class OAuth2Scope extends BaseNumberTzEntity {
     identifier: string;
     name: string;
     description: string;

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Scope = void 0;
 const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
-let OAuth2Scope = class OAuth2Scope extends models_1.BaseTzEntity {
+let OAuth2Scope = class OAuth2Scope extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }
@@ -58,4 +58,3 @@ exports.OAuth2Scope = OAuth2Scope = __decorate([
     }),
     __metadata("design:paramtypes", [Object])
 ], OAuth2Scope);
-//# sourceMappingURL=oauth2-scope.model.js.map

package/dist/components/authenticate/models/oauth2-token.model.d.ts

@@ -1,6 +1,6 @@
-import { BaseTzEntity } from '../../../base/models';
+import { BaseNumberTzEntity } from '../../../base/models';
 import { AnyObject, IdType } from '../../../common';
-export declare class OAuth2Token extends BaseTzEntity {
+export declare class OAuth2Token extends BaseNumberTzEntity {
     token: string;
     type: string;
     status: string;

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

@@ -14,7 +14,7 @@ const models_1 = require("../../../base/models");
 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 {
+let OAuth2Token = class OAuth2Token extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }
@@ -84,4 +84,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

@@ -53,4 +53,3 @@ class OAuth2AuthorizationCodeHandler extends base_1.AbstractOAuth2Authentication
     }
 }
 exports.OAuth2AuthorizationCodeHandler = OAuth2AuthorizationCodeHandler;
-//# sourceMappingURL=authorization-code.handler.js.map

package/dist/components/authenticate/oauth2-handlers/base.d.ts

@@ -1,8 +1,8 @@
-import { BaseTzEntity } from '../../../base/models';
 import { AnyObject, TInjectionGetter } from '../../../common';
 import { ApplicationLogger } from '../../../helpers';
 import { BaseModel, Client, Falsey, RequestAuthenticationModel, Token, User } from '@node-oauth/oauth2-server';
 import { OAuth2Client, OAuth2Token } from '../models';
+import { TBaseTzEntity } from '../../../base/models';
 export interface IOAuth2AuthenticationHandler extends BaseModel, RequestAuthenticationModel {
 }
 export declare abstract class AbstractOAuth2AuthenticationHandler implements IOAuth2AuthenticationHandler {
@@ -30,7 +30,7 @@ export declare abstract class AbstractOAuth2AuthenticationHandler implements IOA
     }): Promise<{
         token: OAuth2Token;
         client: OAuth2Client;
-        user: BaseTzEntity;
+        user: TBaseTzEntity;
     }>;
     getAccessToken(accessToken: string): Promise<Token | Falsey>;
     verifyScope(token: Token, scopes: string[]): Promise<boolean>;

package/dist/components/authenticate/oauth2-handlers/base.js

@@ -37,6 +37,7 @@ class AbstractOAuth2AuthenticationHandler {
                 where: { or: [{ clientId }, { clientId, clientSecret }] },
                 fields: [
                     'id',
+                    'provider',
                     'identifier',
                     'clientId',
                     'name',
@@ -56,6 +57,7 @@ class AbstractOAuth2AuthenticationHandler {
                 }
                 resolve({
                     id: oauth2Client.id.toString(),
+                    provider: oauth2Client.provider,
                     identifier: oauth2Client.identifier,
                     clientId: oauth2Client.clientId,
                     name: oauth2Client.name,
@@ -86,6 +88,7 @@ class AbstractOAuth2AuthenticationHandler {
                     [security_1.securityId]: userId.toString(),
                     userId: (_b = userInformation === null || userInformation === void 0 ? void 0 : userInformation.userId) !== null && _b !== void 0 ? _b : userId.toString(),
                     roles: (_c = userInformation === null || userInformation === void 0 ? void 0 : userInformation.roles) !== null && _c !== void 0 ? _c : [],
+                    provider: client.provider,
                     clientId: client.id,
                     scopes,
                 },
@@ -153,7 +156,7 @@ class AbstractOAuth2AuthenticationHandler {
             const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
             const oauth2Client = yield oauth2ClientRepository.findOne({
                 where: { id: (0, utilities_1.int)(oauth2Token.clientId) },
-                fields: ['id', 'identifier', 'name', 'description', 'userId'],
+                fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
             });
             if (!oauth2Client) {
                 this.logger.error('[_getToken] Not found OAuth2Client | type: %s | token: %s | oauth2Token: %j', type, token, oauth2Token);
@@ -184,8 +187,8 @@ class AbstractOAuth2AuthenticationHandler {
             }
             const oauth2ClientRepository = this.injectionGetter('repositories.OAuth2ClientRepository');
             const oauth2Client = yield oauth2ClientRepository.findOne({
-                where: { identifier: clientId },
-                fields: ['id', 'identifier', 'name', 'description', 'userId'],
+                where: { clientId },
+                fields: ['id', 'provider', 'identifier', 'clientId', 'name', 'description', 'userId'],
             });
             if (!oauth2Client) {
                 throw (0, utilities_1.getError)({
@@ -210,4 +213,3 @@ class AbstractOAuth2AuthenticationHandler {
     }
 }
 exports.AbstractOAuth2AuthenticationHandler = AbstractOAuth2AuthenticationHandler;
-//# sourceMappingURL=base.js.map

package/dist/components/authenticate/oauth2-handlers/client-credential.handler.js

@@ -25,4 +25,3 @@ class OAuth2ClientCredentialHandler extends base_1.AbstractOAuth2AuthenticationH
     }
 }
 exports.OAuth2ClientCredentialHandler = OAuth2ClientCredentialHandler;
-//# sourceMappingURL=client-credential.handler.js.map

package/dist/components/authenticate/oauth2-handlers/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./oauth2"), exports);
 __exportStar(require("./authorization-code.handler"), exports);
 __exportStar(require("./client-credential.handler"), exports);
 __exportStar(require("./password.handler"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/oauth2-handlers/oauth2.js

@@ -33,4 +33,3 @@ class OAuth2Handler extends oauth2_server_1.default {
     }
 }
 exports.OAuth2Handler = OAuth2Handler;
-//# sourceMappingURL=oauth2.js.map

package/dist/components/authenticate/oauth2-handlers/password.handler.js

@@ -19,4 +19,3 @@ class OAuth2PasswordHandler extends base_1.AbstractOAuth2AuthenticationHandler {
     }
 }
 exports.OAuth2PasswordHandler = OAuth2PasswordHandler;
-//# sourceMappingURL=password.handler.js.map

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

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

package/dist/components/authenticate/repositories/oauth2.repository.js

@@ -75,4 +75,3 @@ exports.OAuth2TokenRepository = OAuth2TokenRepository = __decorate([
     __param(1, repository_1.repository.getter('OAuth2ScopeRepository')),
     __metadata("design:paramtypes", [datasources_1.BaseDataSource, Function])
 ], OAuth2TokenRepository);
-//# sourceMappingURL=oauth2.repository.js.map

package/dist/components/authenticate/services/basic-token.service.js

@@ -39,4 +39,3 @@ class BasicTokenService extends services_1.BaseService {
     }
 }
 exports.BasicTokenService = BasicTokenService;
-//# sourceMappingURL=basic-token.service.js.map

package/dist/components/authenticate/services/basic.strategy.js

@@ -61,4 +61,3 @@ exports.BasicAuthenticationStrategy = BasicAuthenticationStrategy = __decorate([
     __param(0, (0, core_1.inject)('services.BasicTokenService')),
     __metadata("design:paramtypes", [basic_token_service_1.BasicTokenService])
 ], BasicAuthenticationStrategy);
-//# sourceMappingURL=basic.strategy.js.map

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

@@ -20,4 +20,3 @@ __exportStar(require("./jwt.strategy"), exports);
 __exportStar(require("./jwt-token.service"), exports);
 __exportStar(require("./oauth2.strategy"), exports);
 __exportStar(require("./oauth2.service"), exports);
-//# sourceMappingURL=index.js.map

package/dist/components/authenticate/services/jwt-token.service.d.ts

@@ -1,5 +1,5 @@
 import { BaseService } from '../../../base/services';
-import { TGetTokenExpiresFn, IJWTTokenPayload } from '../common';
+import { IJWTTokenPayload, TGetTokenExpiresFn } from '../common';
 export declare class JWTTokenService extends BaseService {
     protected applicationSecret: string;
     protected jwtSecret: string;

package/dist/components/authenticate/services/jwt-token.service.js

@@ -27,6 +27,7 @@ var JWTTokenService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JWTTokenService = void 0;
 const services_1 = require("../../../base/services");
+const common_1 = require("../../../common");
 const helpers_1 = require("../../../helpers");
 const utilities_1 = require("../../../utilities");
 const authentication_jwt_1 = require("@loopback/authentication-jwt");
@@ -34,8 +35,7 @@ const core_1 = require("@loopback/core");
 const rest_1 = require("@loopback/rest");
 const security_1 = require("@loopback/security");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const common_1 = require("../common");
-const common_2 = require("../../../common");
+const common_2 = require("../common");
 let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services_1.BaseService {
     constructor(applicationSecret, jwtSecret, jwtExpiresIn, getTokenExpiresFn) {
         super({ scope: JWTTokenService_1.name });
@@ -54,7 +54,7 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
             });
         }
         const authHeaderValue = request.headers.authorization;
-        if (!authHeaderValue.startsWith(common_1.Authentication.TYPE_BEARER)) {
+        if (!authHeaderValue.startsWith(common_2.Authentication.TYPE_BEARER)) {
             throw (0, utilities_1.getError)({
                 statusCode: 401,
                 message: 'Unauthorized user! Invalid schema of request token!',
@@ -68,11 +68,13 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
     }
     // --------------------------------------------------------------------------------------
     encryptPayload(payload) {
+        const providerKey = this.aes.encrypt('provider', this.applicationSecret);
         const userKey = this.aes.encrypt('userId', this.applicationSecret);
         const rolesKey = this.aes.encrypt('roles', this.applicationSecret);
         const clientIdKey = this.aes.encrypt('clientId', this.applicationSecret);
-        const { userId, roles, clientId = 'NA' } = payload;
+        const { provider = 'NA', userId, roles, clientId = 'NA' } = payload;
         return {
+            [providerKey]: this.aes.encrypt(provider, this.applicationSecret),
             [userKey]: this.aes.encrypt(userId.toString(), this.applicationSecret),
             [rolesKey]: this.aes.encrypt(JSON.stringify(roles.map(el => `${el.id}|${el.identifier}|${el.priority}`)), this.applicationSecret),
             [clientIdKey]: this.aes.encrypt(clientId, this.applicationSecret),
@@ -90,6 +92,10 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
             const attr = this.aes.decrypt(encodedAttr, this.applicationSecret);
             const decryptedValue = this.aes.decrypt(decodedToken[encodedAttr], this.applicationSecret);
             switch (attr) {
+                case 'provider': {
+                    rs.provider = decryptedValue;
+                    break;
+                }
                 case 'userId': {
                     rs.userId = parseInt(decryptedValue);
                     rs[security_1.securityId] = rs.userId.toString();
@@ -102,7 +108,7 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
                 case 'roles': {
                     rs.roles = JSON.parse(decryptedValue).map(el => {
                         const [id, identifier, priority] = el.split('|');
-                        return { id, identifier, priority };
+                        return { id, identifier, priority: (0, utilities_1.int)(priority) };
                     });
                     break;
                 }
@@ -148,7 +154,7 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
             }, } = opts;
             if (!payload) {
                 throw (0, utilities_1.getError)({
-                    statusCode: common_2.ResultCodes.RS_4.Unauthorized,
+                    statusCode: common_1.ResultCodes.RS_4.Unauthorized,
                     message: 'Error generating token : userProfile is null',
                 });
             }
@@ -159,7 +165,7 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
             }
             catch (error) {
                 throw (0, utilities_1.getError)({
-                    statusCode: common_2.ResultCodes.RS_4.Unauthorized,
+                    statusCode: common_1.ResultCodes.RS_4.Unauthorized,
                     message: `Error encoding token : ${error}`,
                 });
             }
@@ -170,10 +176,9 @@ let JWTTokenService = JWTTokenService_1 = class JWTTokenService extends services
 exports.JWTTokenService = JWTTokenService;
 exports.JWTTokenService = JWTTokenService = JWTTokenService_1 = __decorate([
     (0, core_1.injectable)({ scope: core_1.BindingScope.SINGLETON }),
-    __param(0, (0, core_1.inject)(common_1.AuthenticateKeys.APPLICATION_SECRET)),
+    __param(0, (0, core_1.inject)(common_2.AuthenticateKeys.APPLICATION_SECRET)),
     __param(1, (0, core_1.inject)(authentication_jwt_1.TokenServiceBindings.TOKEN_SECRET)),
     __param(2, (0, core_1.inject)(authentication_jwt_1.TokenServiceBindings.TOKEN_EXPIRES_IN)),
-    __param(3, (0, core_1.inject)(common_1.AuthenticateKeys.GET_TOKEN_EXPIRES_FN, { optional: true })),
+    __param(3, (0, core_1.inject)(common_2.AuthenticateKeys.GET_TOKEN_EXPIRES_FN, { optional: true })),
     __metadata("design:paramtypes", [String, String, String, Function])
 ], JWTTokenService);
-//# sourceMappingURL=jwt-token.service.js.map

package/dist/components/authenticate/services/jwt.strategy.js

@@ -31,4 +31,3 @@ exports.JWTAuthenticationStrategy = JWTAuthenticationStrategy = __decorate([
     __param(0, (0, core_1.inject)('services.JWTTokenService')),
     __metadata("design:paramtypes", [jwt_token_service_1.JWTTokenService])
 ], JWTAuthenticationStrategy);
-//# sourceMappingURL=jwt.strategy.js.map