@mondart/nestjs-common-module 2.6.8 → 2.7.0

package/dist/lib/keycloak/index.d.ts

@@ -1,3 +1,7 @@
 export * from './keycloak.module';
-export * from './keycloak.service';
+export * from './services/keycloak.service';
 export * from './interfaces';
+export * from '@keycloak/keycloak-admin-client/lib';
+import type { Users, UserQuery } from '@keycloak/keycloak-admin-client/lib/resources/users';
+import type RealmRepresentation from '@keycloak/keycloak-admin-client/lib/defs/realmRepresentation';
+export { RealmRepresentation, UserQuery, Users };

package/dist/lib/keycloak/index.js

@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./keycloak.module"), exports);
-__exportStar(require("./keycloak.service"), exports);
+__exportStar(require("./services/keycloak.service"), exports);
 __exportStar(require("./interfaces"), exports);
+__exportStar(require("@keycloak/keycloak-admin-client/lib"), exports);

package/dist/lib/keycloak/keycloak.module.d.ts

@@ -1,12 +1,7 @@
-import { DynamicModule, OnModuleInit } from '@nestjs/common';
-import { KeycloakService } from './keycloak.service';
+import { DynamicModule } from '@nestjs/common';
 import { KeycloakModuleAsyncOptions, KeycloakModuleOptions } from './interfaces';
-export declare class KeycloakModule implements OnModuleInit {
-    private readonly service;
-    constructor(service: KeycloakService);
-    onModuleInit(): Promise<void>;
+export declare class KeycloakModule {
     static register(options: KeycloakModuleOptions): DynamicModule;
     static registerAsync(options: KeycloakModuleAsyncOptions): DynamicModule;
-    private static createAsyncOptionsProvider;
     private static createAsyncProviders;
 }

package/dist/lib/keycloak/keycloak.module.js

@@ -5,26 +5,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var KeycloakModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeycloakModule = void 0;
 const common_1 = require("@nestjs/common");
-const keycloak_service_1 = require("./keycloak.service");
+const keycloak_service_1 = require("./services/keycloak.service");
 const interfaces_1 = require("./interfaces");
 let KeycloakModule = KeycloakModule_1 = class KeycloakModule {
-    constructor(service) {
-        this.service = service;
-    }
-    async onModuleInit() {
-        await this.service.init();
-    }
     static register(options) {
         return {
             module: KeycloakModule_1,
-            imports: [],
             providers: [
                 {
                     provide: interfaces_1.KEYCLOAK_MODULE_OPTIONS,
@@ -32,26 +22,16 @@ let KeycloakModule = KeycloakModule_1 = class KeycloakModule {
                 },
                 keycloak_service_1.KeycloakService,
             ],
-            exports: [keycloak_service_1.KeycloakService, KeycloakModule_1],
+            exports: [keycloak_service_1.KeycloakService],
         };
     }
     static registerAsync(options) {
-        const asyncOptionsProvider = this.createAsyncOptionsProvider(options);
-        return {
-            module: KeycloakModule_1,
-            imports: [...(options.imports || []), asyncOptionsProvider],
-            providers: [
-                keycloak_service_1.KeycloakService,
-            ],
-            exports: [keycloak_service_1.KeycloakService, KeycloakModule_1],
-        };
-    }
-    static createAsyncOptionsProvider(options) {
-        const providers = this.createAsyncProviders(options);
+        const asyncProviders = this.createAsyncProviders(options);
         return {
             module: KeycloakModule_1,
-            providers,
-            exports: [interfaces_1.KEYCLOAK_MODULE_OPTIONS],
+            imports: options.imports || [],
+            providers: [...asyncProviders, keycloak_service_1.KeycloakService],
+            exports: [keycloak_service_1.KeycloakService],
         };
     }
     static createAsyncProviders(options) {
@@ -69,17 +49,10 @@ let KeycloakModule = KeycloakModule_1 = class KeycloakModule {
             return [
                 {
                     provide: interfaces_1.KEYCLOAK_MODULE_OPTIONS,
-                    useFactory: async (optionsFactory) => await optionsFactory.createModuleOptions(),
-                    inject: [options.useExisting || options.useClass],
+                    useFactory: async (factory) => factory.createModuleOptions(),
+                    inject: [useClass],
                 },
-                ...(options.useClass
-                    ? [
-                        {
-                            provide: options.useClass,
-                            useClass: options.useClass,
-                        },
-                    ]
-                    : []),
+                ...(options.useClass ? [{ provide: useClass, useClass }] : []),
             ];
         }
         throw new Error('Invalid KeycloakModuleAsyncOptions');
@@ -88,8 +61,5 @@ let KeycloakModule = KeycloakModule_1 = class KeycloakModule {
 exports.KeycloakModule = KeycloakModule;
 exports.KeycloakModule = KeycloakModule = KeycloakModule_1 = __decorate([
     (0, common_1.Global)(),
-    (0, common_1.Module)({
-        providers: [],
-    }),
-    __metadata("design:paramtypes", [keycloak_service_1.KeycloakService])
+    (0, common_1.Module)({})
 ], KeycloakModule);

package/dist/lib/keycloak/services/keycloak.service.d.ts

@@ -0,0 +1,12 @@
+import { OnModuleInit } from '@nestjs/common';
+import { KeycloakAdminClient } from '@keycloak/keycloak-admin-client/lib/client';
+import { KeycloakModuleOptions } from '../interfaces';
+export declare class KeycloakService extends KeycloakAdminClient implements OnModuleInit {
+    private readonly options;
+    private readonly logger;
+    constructor(options: KeycloakModuleOptions);
+    onModuleInit(): Promise<void>;
+    private handleToken;
+    private getAccessTokenWithPassword;
+    private getAccessTokenWithRefreshToken;
+}

package/dist/lib/keycloak/services/keycloak.service.js

@@ -0,0 +1,79 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var KeycloakService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeycloakService = void 0;
+const common_1 = require("@nestjs/common");
+const client_1 = require("@keycloak/keycloak-admin-client/lib/client");
+const interfaces_1 = require("../interfaces");
+const jwt_util_1 = require("../utils/jwt.util");
+let KeycloakService = KeycloakService_1 = class KeycloakService extends client_1.KeycloakAdminClient {
+    constructor(options) {
+        super({
+            baseUrl: options.baseUrl,
+            realmName: options.realmName,
+        });
+        this.options = options;
+        this.logger = new common_1.Logger(KeycloakService_1.name);
+    }
+    async onModuleInit() {
+        this.logger.debug('Initializing Keycloak client');
+        await this.getAccessTokenWithPassword();
+        super.registerTokenProvider({
+            getAccessToken: async () => {
+                await this.handleToken();
+                return this.accessToken;
+            },
+        });
+    }
+    async handleToken() {
+        const refreshTokenExpireIn = jwt_util_1.JwtUtils.getTokenExpiry(this.refreshToken);
+        const expireIn = refreshTokenExpireIn > 15 ? refreshTokenExpireIn - 15 : 0;
+        if (expireIn <= 0) {
+            await this.getAccessTokenWithPassword();
+        }
+        else {
+            try {
+                await this.getAccessTokenWithRefreshToken();
+            }
+            catch (err) {
+                this.logger.error(err);
+                await this.getAccessTokenWithPassword();
+            }
+        }
+    }
+    async getAccessTokenWithPassword() {
+        await this.auth({
+            clientId: this.options.clientId,
+            clientSecret: this.options.clientSecret,
+            grantType: 'password',
+            username: this.options.username,
+            password: this.options.password,
+        });
+    }
+    async getAccessTokenWithRefreshToken() {
+        await this.auth({
+            clientId: this.options.clientId,
+            clientSecret: this.options.clientSecret,
+            grantType: 'refresh_token',
+            refreshToken: this.refreshToken,
+        });
+    }
+};
+exports.KeycloakService = KeycloakService;
+exports.KeycloakService = KeycloakService = KeycloakService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(interfaces_1.KEYCLOAK_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [Object])
+], KeycloakService);

package/dist/lib/keycloak/utils/jwt.util.js

@@ -4,6 +4,8 @@ exports.JwtUtils = void 0;
 class JwtUtils {
     static getTokenExpiry(token) {
         try {
+            if (!token)
+                return null;
             const payload = token.split('.')[1];
             if (!payload)
                 throw new Error('Invalid JWT structure');