@tsed/oidc-provider 8.0.0-alpha.9 → 8.0.0-beta.2

package/lib/esm/OidcModule.js

@@ -1,11 +1,17 @@
-import { __decorate, __metadata } from "tslib";
-import { Inject, InjectorService, PlatformApplication } from "@tsed/common";
-import { Constant, Module } from "@tsed/di";
+import { __decorate } from "tslib";
+import { PlatformApplication } from "@tsed/common";
+import { constant, inject, injector, Module } from "@tsed/di";
 import koaMount from "koa-mount";
 import { OidcAdapters } from "./services/OidcAdapters.js";
 import { OidcJwks } from "./services/OidcJwks.js";
 import { OidcProvider } from "./services/OidcProvider.js";
 let OidcModule = class OidcModule {
+    constructor() {
+        this.app = inject(PlatformApplication);
+        this.platformName = constant("PLATFORM_NAME");
+        this.basePath = constant("oidc.path", "/oidc");
+        this.oidcProvider = inject(OidcProvider);
+    }
     async $onInit() {
         if (this.oidcProvider.hasConfiguration()) {
             await this.oidcProvider.create();
@@ -31,12 +37,12 @@ let OidcModule = class OidcModule {
         }
     }
     $onReady() {
-        if (this.oidcProvider.hasConfiguration() && "getBestHost" in this.injector.settings) {
-            const { injector } = this;
+        const inj = injector();
+        if (this.oidcProvider.hasConfiguration() && "getBestHost" in inj.settings) {
             // @ts-ignore
-            const host = injector.settings.getBestHost();
+            const host = inj.settings.getBestHost();
             const url = host.toString();
-            injector.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);
+            inj.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);
         }
     }
     async getRewriteMiddleware() {
@@ -52,26 +58,6 @@ let OidcModule = class OidcModule {
         }
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", PlatformApplication)
-], OidcModule.prototype, "app", void 0);
-__decorate([
-    Constant("PLATFORM_NAME"),
-    __metadata("design:type", String)
-], OidcModule.prototype, "platformName", void 0);
-__decorate([
-    Constant("oidc.path", "/oidc"),
-    __metadata("design:type", String)
-], OidcModule.prototype, "basePath", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcProvider)
-], OidcModule.prototype, "oidcProvider", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], OidcModule.prototype, "injector", void 0);
 OidcModule = __decorate([
     Module({
         imports: [OidcProvider, OidcAdapters, OidcJwks]

package/lib/esm/OidcModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":"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"}

package/lib/esm/decorators/oidcSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidcSession.js","sourceRoot":"","sources":["../../../src/decorators/oidcSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAIzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,UAAmB;IAC7C,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7F,CAAC"}
+{"version":3,"file":"oidcSession.js","sourceRoot":"","sources":["../../../src/decorators/oidcSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAGzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,UAAmB;IAC7C,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7F,CAAC"}

package/lib/esm/decorators/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/decorators/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAIzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAE7D,MAAM,UAAU,MAAM;IACpB,OAAO,aAAa,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/decorators/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAGzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAE7D,MAAM,UAAU,MAAM;IACpB,OAAO,aAAa,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AACpD,CAAC"}

package/lib/esm/index.js

@@ -29,7 +29,6 @@ export * from "./services/OidcInteractions.js";
 export * from "./services/OidcJwks.js";
 export * from "./services/OidcPolicy.js";
 export * from "./services/OidcProvider.js";
-export * from "./services/OidcProviderNodeModule.js";
 export * from "./utils/debug.js";
 export * from "./utils/events.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0BAA0B,CAAC;AACzC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0BAA0B,CAAC;AACzC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC"}

package/lib/esm/services/OidcAdapters.js

@@ -1,11 +1,14 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Adapters } from "@tsed/adapters";
-import { Configuration, Inject, Injectable } from "@tsed/di";
+import { constant, inject, Injectable } from "@tsed/di";
 let OidcAdapters = class OidcAdapters {
+    constructor() {
+        this.adapters = inject(Adapters);
+    }
     createAdapterClass() {
         const self = this;
-        const adapterBase = this.settings.get("oidc.Adapter", this.settings.get("adapters.Adapter"));
-        const connectionName = this.settings.get("oidc.connectionName", "default");
+        const adapterBase = constant("oidc.Adapter", constant("adapters.Adapter"));
+        const connectionName = constant("oidc.connectionName", "default");
         return class CustomAdapter {
             constructor(name) {
                 this.adapter = self.adapters.invokeAdapter({
@@ -67,14 +70,6 @@ let OidcAdapters = class OidcAdapters {
         };
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", Adapters)
-], OidcAdapters.prototype, "adapters", void 0);
-__decorate([
-    Configuration(),
-    __metadata("design:type", Object)
-], OidcAdapters.prototype, "settings", void 0);
 OidcAdapters = __decorate([
     Injectable()
 ], OidcAdapters);

package/lib/esm/services/OidcAdapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":"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"}

package/lib/esm/services/OidcInteractionContext.js

@@ -1,7 +1,6 @@
-import { __decorate, __metadata } from "tslib";
-import { Constant, InjectContext, PlatformContext } from "@tsed/common";
+import { __decorate } from "tslib";
 import { Env } from "@tsed/core";
-import { Inject, Injectable } from "@tsed/di";
+import { constant, context, inject, Injectable } from "@tsed/di";
 import { Unauthorized } from "@tsed/exceptions";
 import omit from "lodash/omit.js";
 import { INTERACTION_CONTEXT, INTERACTION_DETAILS, INTERACTION_GRANT_ID, INTERACTION_PARAMS, INTERACTION_PROMPT, INTERACTION_SESSION, INTERACTION_UID } from "../constants/constants.js";
@@ -10,6 +9,14 @@ import { debug } from "../utils/debug.js";
 import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcProvider } from "./OidcProvider.js";
 let OidcInteractionContext = class OidcInteractionContext {
+    constructor() {
+        this.env = constant("env");
+        this.oidcProvider = inject(OidcProvider);
+        this.oidcInteractions = inject(OidcInteractions);
+    }
+    get $ctx() {
+        return context();
+    }
     get raw() {
         return this.$ctx.get(INTERACTION_DETAILS);
     }
@@ -60,8 +67,9 @@ let OidcInteractionContext = class OidcInteractionContext {
     }
     async interactionPrompt({ client, ...options }) {
         client = client || (await this.findClient());
+        const omitClientProps = constant("oidc.render.omitClientProps", []);
         return {
-            client: omit(client, ["clientSecret", ...this.omitClientProps]),
+            client: omit(client, ["clientSecret", ...omitClientProps]),
             uid: this.uid,
             grantId: this.grantId,
             details: this.prompt.details,
@@ -135,26 +143,6 @@ let OidcInteractionContext = class OidcInteractionContext {
         };
     }
 };
-__decorate([
-    Constant("env"),
-    __metadata("design:type", String)
-], OidcInteractionContext.prototype, "env", void 0);
-__decorate([
-    Constant("oidc.render.omitClientProps", []),
-    __metadata("design:type", Array)
-], OidcInteractionContext.prototype, "omitClientProps", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcProvider)
-], OidcInteractionContext.prototype, "oidcProvider", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcInteractions)
-], OidcInteractionContext.prototype, "oidcInteractions", void 0);
-__decorate([
-    InjectContext(),
-    __metadata("design:type", PlatformContext)
-], OidcInteractionContext.prototype, "$ctx", void 0);
 OidcInteractionContext = __decorate([
     Injectable()
 ], OidcInteractionContext);

package/lib/esm/services/OidcInteractionContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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"}

package/lib/esm/services/OidcInteractions.js

@@ -1,10 +1,12 @@
-import { __decorate, __metadata } from "tslib";
-import { Constant, EndpointMetadata, PlatformHandler } from "@tsed/common";
-import { Env } from "@tsed/core";
-import { Inject, Injectable, InjectorService } from "@tsed/di";
+import { __decorate } from "tslib";
+import { PlatformHandler } from "@tsed/common";
+import { constant, Injectable, injector } from "@tsed/di";
+import { EndpointMetadata } from "@tsed/schema";
 import { INTERACTION, INTERACTION_OPTIONS, INTERACTIONS } from "../constants/constants.js";
 let OidcInteractions = class OidcInteractions {
     constructor() {
+        this.injector = injector();
+        this.env = constant("env");
         this.interactions = new Map();
     }
     $onInit() {
@@ -42,18 +44,6 @@ let OidcInteractions = class OidcInteractions {
         }
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], OidcInteractions.prototype, "injector", void 0);
-__decorate([
-    Constant("env"),
-    __metadata("design:type", String)
-], OidcInteractions.prototype, "env", void 0);
-__decorate([
-    Constant("oidc"),
-    __metadata("design:type", Object)
-], OidcInteractions.prototype, "oidcSettings", void 0);
 OidcInteractions = __decorate([
     Injectable()
 ], OidcInteractions);

package/lib/esm/services/OidcInteractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAmB,eAAe,EAA0B,MAAM,cAAc,CAAC;AACnH,OAAO,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAKlF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAUK,iBAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IA4C5D,CAAC;IA1CC,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;QAE7E,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE;YACpD,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAyB,mBAAmB,CAAC,CAAC;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;gBAC/C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,oBAAoB,CAAC,QAAQ;aACjC,GAAG,CAAC,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAE,CAAC;aAChE,MAAM,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,sBAAsB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvE,OAAO,CAAC,GAAoB,EAAE,EAAE;gBAC9B,uCAAuC;gBACvC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACxB,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AApDW;IADT,MAAM,EAAE;8BACW,eAAe;kDAAC;AAG1B;IADT,QAAQ,CAAC,KAAK,CAAC;;6CACG;AAGT;IADT,QAAQ,CAAC,MAAM,CAAC;;sDACoB;AAR1B,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAsD5B"}
+{"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,eAAe,EAAC,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAA0B,MAAM,UAAU,CAAC;AACjF,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAIlF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACK,aAAQ,GAAG,QAAQ,EAAE,CAAC;QACtB,QAAG,GAAG,QAAQ,CAAM,KAAK,CAAC,CAAC;QAC3B,iBAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IA4C5D,CAAC;IA1CC,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;QAE7E,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE;YACpD,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAyB,mBAAmB,CAAC,CAAC;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;gBAC/C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,oBAAoB,CAAC,QAAQ;aACjC,GAAG,CAAC,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAE,CAAC;aAChE,MAAM,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,sBAAsB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvE,OAAO,CAAC,GAAoB,EAAE,EAAE;gBAC9B,uCAAuC;gBACvC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACxB,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA/CY,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CA+C5B"}

package/lib/esm/services/OidcJwks.js

@@ -1,8 +1,12 @@
-import { __decorate, __metadata } from "tslib";
-import { Constant, Injectable } from "@tsed/di";
+import { __decorate } from "tslib";
+import { constant, Injectable } from "@tsed/di";
 import { getJwks } from "@tsed/jwks";
 import { join } from "path";
 let OidcJwks = class OidcJwks {
+    constructor() {
+        this.jwksPath = constant("oidc.jwksPath", join(process.cwd(), "keys", "jwks.json"));
+        this.certificates = constant("oidc.certificates");
+    }
     $onInit() {
         return this.getJwks();
     }
@@ -13,14 +17,6 @@ let OidcJwks = class OidcJwks {
         });
     }
 };
-__decorate([
-    Constant("oidc.jwksPath", join(process.cwd(), "keys", "jwks.json")),
-    __metadata("design:type", String)
-], OidcJwks.prototype, "jwksPath", void 0);
-__decorate([
-    Constant("oidc.certificates"),
-    __metadata("design:type", Array)
-], OidcJwks.prototype, "certificates", void 0);
 OidcJwks = __decorate([
     Injectable()
 ], OidcJwks);

package/lib/esm/services/OidcJwks.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAoB,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAGnB,IAAM,QAAQ,GAAd,MAAM,QAAQ;IASnB,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;;0CACnD;AAGjB;IADC,QAAQ,CAAC,mBAAmB,CAAC;;8CACK;AALxB,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAmBpB"}
+{"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAoB,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAGnB,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAAd;QACE,aAAQ,GAAW,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QACvF,iBAAY,GAAyB,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAa5E,CAAC;IAVC,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAfY,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAepB"}

package/lib/esm/services/OidcPolicy.js

@@ -1,13 +1,14 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { Inject, Injectable, InjectorService } from "@tsed/di";
+import { __decorate } from "tslib";
+import { inject, Injectable, injector } from "@tsed/di";
+import { interactionPolicy } from "oidc-provider";
 import { OidcInteractions } from "./OidcInteractions.js";
-import { OIDC_PROVIDER_NODE_MODULE } from "./OidcProviderNodeModule.js";
 let OidcPolicy = class OidcPolicy {
-    constructor(module) {
-        this.module = module;
+    constructor() {
+        this.injector = injector();
+        this.oidcInteractions = inject(OidcInteractions);
     }
     getPolicy() {
-        let policy = this.module.interactionPolicy.base();
+        let policy = interactionPolicy.base();
         const { usePriority, interactions } = this.getInteractions();
         if (interactions.size) {
             for (const { name, instance, options } of interactions.values()) {
@@ -33,7 +34,7 @@ let OidcPolicy = class OidcPolicy {
     createPrompt(instance, options) {
         const { checks: originalChecks = [], details, ...promptOptions } = options;
         const checks = [...(instance.checks ? instance.checks() : originalChecks)].filter(Boolean);
-        return new this.module.interactionPolicy.Prompt(promptOptions, instance.details ? instance.details.bind(instance) : details, ...checks);
+        return new interactionPolicy.Prompt(promptOptions, instance.details ? instance.details.bind(instance) : details, ...checks);
     }
     getInteractions() {
         let usePriority = false;
@@ -58,18 +59,8 @@ let OidcPolicy = class OidcPolicy {
         };
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], OidcPolicy.prototype, "injector", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcInteractions)
-], OidcPolicy.prototype, "oidcInteractions", void 0);
 OidcPolicy = __decorate([
-    Injectable(),
-    __param(0, Inject(OIDC_PROVIDER_NODE_MODULE)),
-    __metadata("design:paramtypes", [Object])
+    Injectable()
 ], OidcPolicy);
 export { OidcPolicy };
 //# sourceMappingURL=OidcPolicy.js.map

package/lib/esm/services/OidcPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcPolicy.js","sourceRoot":"","sources":["../../../src/services/OidcPolicy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OidcPolicy.js","sourceRoot":"","sources":["../../../src/services/OidcPolicy.ts"],"names":[],"mappings":"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"}

package/lib/esm/services/OidcProvider.js

@@ -1,14 +1,13 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { InjectContext, PlatformApplication, PlatformContext } from "@tsed/common";
+import { __decorate } from "tslib";
+import { PlatformApplication } from "@tsed/common";
 import { Env, setValue } from "@tsed/core";
-import { Constant, Inject, Injectable, InjectorService } from "@tsed/di";
+import { constant, context, inject, Injectable, InjectorService } from "@tsed/di";
+import Provider from "oidc-provider";
 import { INTERACTIONS } from "../constants/constants.js";
 import { OIDC_ERROR_EVENTS } from "../utils/events.js";
 import { OidcAdapters } from "./OidcAdapters.js";
-import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcJwks } from "./OidcJwks.js";
 import { OidcPolicy } from "./OidcPolicy.js";
-import { OIDC_PROVIDER_NODE_MODULE } from "./OidcProviderNodeModule.js";
 function mapError(error) {
     return Object.getOwnPropertyNames(error).reduce((obj, key) => {
         return {
@@ -18,11 +17,24 @@ function mapError(error) {
     }, {});
 }
 let OidcProvider = class OidcProvider {
-    constructor(module) {
-        this.module = module;
+    constructor() {
+        this.env = constant("env");
+        this.httpPort = constant("httpPort");
+        this.httpsPort = constant("httpsPort");
+        this.issuer = constant("oidc.issuer", "");
+        this.oidc = constant("oidc");
+        this.platformName = constant("PLATFORM_NAME");
+        this.oidcJwks = inject(OidcJwks);
+        this.oidcPolicy = inject(OidcPolicy);
+        this.adapters = inject(OidcAdapters);
+        this.injector = inject(InjectorService);
+        this.app = inject(PlatformApplication);
     }
     get logger() {
-        return this.$ctx?.logger || this.injector.logger;
+        return this.$ctx.logger;
+    }
+    get $ctx() {
+        return context();
     }
     hasConfiguration() {
         return !!this.oidc;
@@ -76,7 +88,7 @@ let OidcProvider = class OidcProvider {
         const { proxy = this.env === Env.PROD, secureKey, allowHttpLocalhost = this.env !== Env.PROD } = this.oidc;
         const configuration = await this.getConfiguration();
         await this.injector.alterAsync("$alterOidcConfiguration", configuration);
-        const oidcProvider = new this.module.Provider(this.getIssuer(), configuration);
+        const oidcProvider = new Provider(this.getIssuer(), configuration);
         if (proxy) {
             // istanbul ignore next
             switch (this.platformName) {
@@ -136,62 +148,8 @@ let OidcProvider = class OidcProvider {
         };
     }
 };
-__decorate([
-    Constant("env"),
-    __metadata("design:type", String)
-], OidcProvider.prototype, "env", void 0);
-__decorate([
-    Constant("httpPort"),
-    __metadata("design:type", Object)
-], OidcProvider.prototype, "httpPort", void 0);
-__decorate([
-    Constant("httpsPort"),
-    __metadata("design:type", Object)
-], OidcProvider.prototype, "httpsPort", void 0);
-__decorate([
-    Constant("oidc.issuer", ""),
-    __metadata("design:type", String)
-], OidcProvider.prototype, "issuer", void 0);
-__decorate([
-    Constant("oidc"),
-    __metadata("design:type", Object)
-], OidcProvider.prototype, "oidc", void 0);
-__decorate([
-    Constant("PLATFORM_NAME"),
-    __metadata("design:type", String)
-], OidcProvider.prototype, "platformName", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcJwks)
-], OidcProvider.prototype, "oidcJwks", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcInteractions)
-], OidcProvider.prototype, "oidcInteractions", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcPolicy)
-], OidcProvider.prototype, "oidcPolicy", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OidcAdapters)
-], OidcProvider.prototype, "adapters", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], OidcProvider.prototype, "injector", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", PlatformApplication)
-], OidcProvider.prototype, "app", void 0);
-__decorate([
-    InjectContext(),
-    __metadata("design:type", PlatformContext)
-], OidcProvider.prototype, "$ctx", void 0);
 OidcProvider = __decorate([
-    Injectable(),
-    __param(0, Inject(OIDC_PROVIDER_NODE_MODULE)),
-    __metadata("design:paramtypes", [Object])
+    Injectable()
 ], OidcProvider);
 export { OidcProvider };
 //# sourceMappingURL=OidcProvider.js.map

package/lib/esm/services/OidcProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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"}

package/lib/types/OidcModule.d.ts

@@ -1,11 +1,10 @@
-import { InjectorService, PlatformApplication } from "@tsed/common";
+import { PlatformApplication } from "@tsed/common";
 import { OidcProvider } from "./services/OidcProvider.js";
 export declare class OidcModule {
     protected app: PlatformApplication;
-    protected platformName: string;
+    protected platformName: string | undefined;
     protected basePath: string;
     protected oidcProvider: OidcProvider;
-    protected injector: InjectorService;
     $onInit(): Promise<void>;
     $onRoutesInit(): Promise<void>;
     $afterRoutesInit(): void;

package/lib/types/index.d.ts

@@ -29,6 +29,5 @@ export * from "./services/OidcInteractions.js";
 export * from "./services/OidcJwks.js";
 export * from "./services/OidcPolicy.js";
 export * from "./services/OidcProvider.js";
-export * from "./services/OidcProviderNodeModule.js";
 export * from "./utils/debug.js";
 export * from "./utils/events.js";

package/lib/types/services/OidcAdapters.d.ts

@@ -1,9 +1,7 @@
 import { Adapter, Adapters } from "@tsed/adapters";
-import { Configuration } from "@tsed/di";
 import type { Adapter as OidcAdapter, AdapterConstructor } from "oidc-provider";
 export type OidcAdapterMethods<Model = any> = Adapter<Model> & Partial<Omit<OidcAdapter, "upsert">>;
 export declare class OidcAdapters {
     protected adapters: Adapters;
-    protected settings: Configuration;
     createAdapterClass(): AdapterConstructor;
 }

package/lib/types/services/OidcInteractionContext.d.ts

@@ -7,11 +7,10 @@ import { OidcInteractionPromptProps } from "../domain/OidcInteractionPromptProps
 import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcProvider } from "./OidcProvider.js";
 export declare class OidcInteractionContext {
-    protected env: Env;
-    protected omitClientProps: string[];
+    protected env: Env | undefined;
     protected oidcProvider: OidcProvider;
     protected oidcInteractions: OidcInteractions;
-    protected $ctx: PlatformContext;
+    get $ctx(): PlatformContext<import("@tsed/common").PlatformRequest<any>, import("@tsed/common").PlatformResponse<any>>;
     get raw(): OidcInteraction;
     get session(): OidcSession | undefined;
     get prompt(): PromptDetail;

package/lib/types/services/OidcInteractions.d.ts

@@ -1,11 +1,9 @@
-import { PlatformContext, Provider } from "@tsed/common";
+import { PlatformContext } from "@tsed/common";
 import { Env } from "@tsed/core";
-import { InjectorService } from "@tsed/di";
-import { OidcSettings } from "../domain/OidcSettings.js";
+import { Provider } from "@tsed/di";
 export declare class OidcInteractions {
-    protected injector: InjectorService;
-    protected env: Env;
-    protected oidcSettings: OidcSettings;
+    protected injector: import("@tsed/common").InjectorService;
+    protected env: Env | undefined;
     protected interactions: Map<string, Provider>;
     $onInit(): void;
     getInteractions(): Provider[];

package/lib/types/services/OidcPolicy.d.ts

@@ -1,15 +1,11 @@
-import { InjectorService } from "@tsed/di";
 import { interactionPolicy } from "oidc-provider";
 import { InteractionMethods } from "../domain/InteractionMethods.js";
 import { OidcInteractionOptions } from "../domain/OidcInteractionOptions.js";
 import { OidcInteractions } from "./OidcInteractions.js";
-import { OIDC_PROVIDER_NODE_MODULE } from "./OidcProviderNodeModule.js";
 import Prompt = interactionPolicy.Prompt;
 export declare class OidcPolicy {
-    protected module: OIDC_PROVIDER_NODE_MODULE;
-    protected injector: InjectorService;
+    protected injector: import("@tsed/di").InjectorService;
     protected oidcInteractions: OidcInteractions;
-    constructor(module: OIDC_PROVIDER_NODE_MODULE);
     getPolicy(): any;
     createPrompt(instance: InteractionMethods, options: OidcInteractionOptions): Prompt;
     private getInteractions;

package/lib/types/services/OidcProvider.d.ts

@@ -1,31 +1,26 @@
 import { PlatformApplication, PlatformContext } from "@tsed/common";
 import { Env } from "@tsed/core";
 import { InjectorService } from "@tsed/di";
-import type { Configuration } from "oidc-provider";
+import Provider, { type Configuration } from "oidc-provider";
 import { OidcSettings } from "../domain/OidcSettings.js";
 import { OidcAdapters } from "./OidcAdapters.js";
-import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcJwks } from "./OidcJwks.js";
 import { OidcPolicy } from "./OidcPolicy.js";
-import { OIDC_PROVIDER_NODE_MODULE, Provider } from "./OidcProviderNodeModule.js";
 export declare class OidcProvider {
-    protected module: OIDC_PROVIDER_NODE_MODULE;
     raw: Provider;
-    protected env: Env;
-    protected httpPort: number | string;
-    protected httpsPort: number | string;
+    protected env: Env | undefined;
+    protected httpPort: string | number | undefined;
+    protected httpsPort: string | number | undefined;
     protected issuer: string;
     protected oidc: OidcSettings;
-    protected platformName: string;
+    protected platformName: string | undefined;
     protected oidcJwks: OidcJwks;
-    protected oidcInteractions: OidcInteractions;
     protected oidcPolicy: OidcPolicy;
     protected adapters: OidcAdapters;
     protected injector: InjectorService;
-    protected app: PlatformApplication;
-    protected $ctx?: PlatformContext;
-    constructor(module: OIDC_PROVIDER_NODE_MODULE);
-    get logger(): import("@tsed/common").ContextLogger | import("@tsed/common").DILogger;
+    protected app: PlatformApplication<any>;
+    get logger(): import("@tsed/common").ContextLogger;
+    protected get $ctx(): PlatformContext<import("@tsed/common").PlatformRequest<any>, import("@tsed/common").PlatformResponse<any>>;
     hasConfiguration(): boolean;
     getConfiguration(): Promise<Configuration>;
     getIssuer(): string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/oidc-provider",
   "description": "OIDC provider package for Ts.ED framework",
   "type": "module",
-  "version": "8.0.0-alpha.9",
+  "version": "8.0.0-beta.2",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -23,40 +23,40 @@
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "dependencies": {
-    "@tsed/adapters": "8.0.0-alpha.9",
-    "express-urlrewrite": "^1.4.0",
+    "@tsed/adapters": "8.0.0-beta.2",
+    "express-urlrewrite": "^2.0.3",
     "jose2": "npm:jose@^2.0.4",
     "koa-mount": "^4.0.0",
     "koa-rewrite": "^3.0.1",
     "lodash": "4.17.21",
     "tslib": "2.7.0",
-    "uuid": "9.0.1"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.0.0-alpha.9",
-    "@tsed/common": "8.0.0-alpha.9",
-    "@tsed/core": "8.0.0-alpha.9",
-    "@tsed/di": "8.0.0-alpha.9",
-    "@tsed/exceptions": "8.0.0-alpha.9",
-    "@tsed/jwks": "8.0.0-alpha.9",
-    "@tsed/typescript": "8.0.0-alpha.9",
+    "@tsed/barrels": "8.0.0-beta.2",
+    "@tsed/common": "8.0.0-beta.2",
+    "@tsed/core": "8.0.0-beta.2",
+    "@tsed/di": "8.0.0-beta.2",
+    "@tsed/exceptions": "8.0.0-beta.2",
+    "@tsed/jwks": "8.0.0-beta.2",
+    "@tsed/typescript": "8.0.0-beta.2",
     "@types/lowdb": "1.0.15",
-    "@types/oidc-provider": "8.4.4",
-    "@types/uuid": "9.0.8",
+    "@types/oidc-provider": "8.5.2",
+    "@types/uuid": "10.0.0",
     "cross-env": "7.0.3",
-    "eslint": "9.11.1",
-    "lowdb": "3.0.0",
-    "oidc-provider": "8.4.5",
+    "eslint": "9.12.0",
+    "lowdb": "7.0.1",
+    "oidc-provider": "8.5.1",
     "typescript": "5.4.5",
-    "vitest": "2.0.4"
+    "vitest": "2.1.2"
   },
   "peerDependencies": {
-    "@tsed/ajv": "8.0.0-alpha.9",
-    "@tsed/common": "8.0.0-alpha.9",
-    "@tsed/core": "8.0.0-alpha.9",
-    "@tsed/di": "8.0.0-alpha.9",
-    "@tsed/json-mapper": "8.0.0-alpha.9",
-    "@tsed/schema": "8.0.0-alpha.9",
+    "@tsed/ajv": "8.0.0-beta.2",
+    "@tsed/common": "8.0.0-beta.2",
+    "@tsed/core": "8.0.0-beta.2",
+    "@tsed/di": "8.0.0-beta.2",
+    "@tsed/json-mapper": "8.0.0-beta.2",
+    "@tsed/schema": "8.0.0-beta.2",
     "oidc-provider": ">=8.0.0"
   },
   "peerDependenciesMeta": {
@@ -87,6 +87,6 @@
   "author": "Romain Lenzotti",
   "license": "MIT",
   "publishConfig": {
-    "tag": "alpha"
+    "tag": "beta"
   }
 }

package/vitest.config.mts

@@ -10,10 +10,10 @@ export default defineConfig(
       coverage: {
         ...presets.test.coverage,
         thresholds: {
-          statements: 97.33,
-          branches: 90.9,
-          functions: 98.63,
-          lines: 97.33
+          statements: 97.36,
+          branches: 92,
+          functions: 98.61,
+          lines: 97.36
         }
       }
     }

package/lib/esm/services/OidcProviderNodeModule.js

@@ -1,13 +0,0 @@
-import { registerProvider } from "@tsed/di";
-export const OIDC_PROVIDER_NODE_MODULE = Symbol.for("oidc:provider:node:module");
-registerProvider({
-    provide: OIDC_PROVIDER_NODE_MODULE,
-    async useAsyncFactory() {
-        const mod = await import("oidc-provider");
-        return {
-            ...mod,
-            Provider: mod.default || mod.Provider
-        };
-    }
-});
-//# sourceMappingURL=OidcProviderNodeModule.js.map

package/lib/esm/services/OidcProviderNodeModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OidcProviderNodeModule.js","sourceRoot":"","sources":["../../../src/services/OidcProviderNodeModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAI1C,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAMjF,gBAAgB,CAAC;IACf,OAAO,EAAE,yBAAyB;IAClC,KAAK,CAAC,eAAe;QACnB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;QAE1C,OAAO;YACL,GAAG,GAAG;YACN,QAAQ,EAAE,GAAG,CAAC,OAAO,IAAK,GAAW,CAAC,QAAQ;SAC/C,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}

package/lib/types/services/OidcProviderNodeModule.d.ts

@@ -1,7 +0,0 @@
-import { Type } from "@tsed/core";
-import type Provider from "oidc-provider";
-export declare const OIDC_PROVIDER_NODE_MODULE: unique symbol;
-export type OIDC_PROVIDER_NODE_MODULE = {
-    Provider: Type<Provider>;
-} & typeof import("oidc-provider");
-export { Provider };