@tsed/oidc-provider 7.0.0-beta.9 → 7.0.0-rc.1

package/coverage.json

@@ -0,0 +1,6 @@
+{
+  "statements": 99.69,
+  "branches": 94.82,
+  "functions": 98.71,
+  "lines": 99.67
+}

package/jest.config.js

@@ -0,0 +1,9 @@
+// For a detailed explanation regarding each configuration property, visit:
+// https://jestjs.io/docs/en/configuration.html
+
+module.exports = {
+  ...require("@tsed/jest-config")(__dirname, "oidc-provider"),
+  coverageThreshold: {
+    global: require("./coverage.json")
+  }
+};

package/lib/cjs/OidcModule.js

@@ -9,6 +9,11 @@ const OidcAdapters_1 = require("./services/OidcAdapters");
 const OidcJwks_1 = require("./services/OidcJwks");
 const OidcProvider_1 = require("./services/OidcProvider");
 let OidcModule = class OidcModule {
+    app;
+    platformName;
+    basePath;
+    oidcProvider;
+    injector;
     async $onInit() {
         if (this.oidcProvider.hasConfiguration()) {
             await this.oidcProvider.create();
@@ -34,8 +39,9 @@ let OidcModule = class OidcModule {
         }
     }
     $onReady() {
-        if (this.oidcProvider.hasConfiguration() && this.injector.settings.getBestHost) {
+        if (this.oidcProvider.hasConfiguration() && "getBestHost" in this.injector.settings) {
             const { injector } = this;
+            // @ts-ignore
             const host = injector.settings.getBestHost();
             const url = host.toString();
             injector.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);

package/lib/cjs/OidcModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAC1E,iCAA0C;AAC1C,kEAAiC;AACjC,0DAAqD;AACrD,kDAA6C;AAC7C,0DAAqD;AAKrD,IAAa,UAAU,GAAvB,MAAa,UAAU;IAgBrB,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE;YACxC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;SAClC;IACH,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;SACjD;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAEzC,QAAQ,IAAI,CAAC,YAAY,EAAE;gBACzB,QAAQ;gBACR,KAAK,SAAS;oBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,KAAK;oBACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;oBACpD,MAAM;aACT;SACF;IACH,CAAC;IAED,QAAQ;QACN,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE;YAC9E,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;YACxB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE5B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,GAAG,mCAAmC,CAAC,CAAC;SAC3F;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,QAAQ,IAAI,CAAC,YAAY,EAAE;YACzB,QAAQ;YACR,KAAK,SAAS;gBACZ,MAAM,EAAC,OAAO,EAAE,iBAAiB,EAAC,GAAG,gEAAa,oBAAoB,GAAC,CAAC;gBACxE,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;YAChF,KAAK,KAAK;gBACR,aAAa;gBACb,MAAM,EAAC,OAAO,EAAE,aAAa,EAAC,GAAG,gEAAa,aAAa,GAAC,CAAC;gBAC7D,OAAO,aAAa,CAAC,mBAAmB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;SAChF;IACH,CAAC;CACF,CAAA;AAhEC;IADC,IAAA,eAAM,GAAE;sCACJ,4BAAmB;uCAAC;AAGzB;IADC,IAAA,aAAQ,EAAC,eAAe,CAAC;;gDACL;AAGrB;IADC,IAAA,aAAQ,EAAC,WAAW,EAAE,OAAO,CAAC;;4CACd;AAGjB;IADC,IAAA,eAAM,GAAE;sCACK,2BAAY;gDAAC;AAG3B;IADC,IAAA,eAAM,GAAE;sCACC,wBAAe;4CAAC;AAdf,UAAU;IAHtB,IAAA,WAAM,EAAC;QACN,OAAO,EAAE,CAAC,2BAAY,EAAE,2BAAY,EAAE,mBAAQ,CAAC;KAChD,CAAC;GACW,UAAU,CAkEtB;AAlEY,gCAAU","sourcesContent":["import {Inject, InjectorService, PlatformApplication} from \"@tsed/common\";\nimport {Constant, Module} from \"@tsed/di\";\nimport koaMount from \"koa-mount\";\nimport {OidcAdapters} from \"./services/OidcAdapters\";\nimport {OidcJwks} from \"./services/OidcJwks\";\nimport {OidcProvider} from \"./services/OidcProvider\";\n\n@Module({\n  imports: [OidcProvider, OidcAdapters, OidcJwks]\n})\nexport class OidcModule {\n  @Inject()\n  app: PlatformApplication;\n\n  @Constant(\"PLATFORM_NAME\")\n  platformName: string;\n\n  @Constant(\"oidc.path\", \"/oidc\")\n  basePath: string;\n\n  @Inject()\n  oidcProvider: OidcProvider;\n\n  @Inject()\n  injector: InjectorService;\n\n  async $onInit() {\n    if (this.oidcProvider.hasConfiguration()) {\n      await this.oidcProvider.create();\n    }\n  }\n\n  async $onRoutesInit() {\n    if (this.basePath !== \"/\") {\n      this.app.use(await this.getRewriteMiddleware());\n    }\n  }\n\n  async $afterRoutesInit() {\n    if (this.oidcProvider.hasConfiguration()) {\n      const provider = this.oidcProvider.get();\n\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          this.app.use(this.basePath, provider.callback());\n          break;\n        case \"koa\":\n          this.app.use(koaMount(this.basePath, provider.app));\n          break;\n      }\n    }\n  }\n\n  $onReady() {\n    if (this.oidcProvider.hasConfiguration() && this.injector.settings.getBestHost) {\n      const {injector} = this;\n      const host = injector.settings.getBestHost();\n      const url = host.toString();\n\n      injector.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);\n    }\n  }\n\n  private async getRewriteMiddleware() {\n    switch (this.platformName) {\n      default:\n      case \"express\":\n        const {default: expressUrlRewrite} = await import(\"express-urlrewrite\");\n        return expressUrlRewrite(\"/.well-known/*\", `${this.basePath}/.well-known/$1`);\n      case \"koa\":\n        // @ts-ignore\n        const {default: koaUrlRewrite} = await import(\"koa-rewrite\");\n        return koaUrlRewrite(\"/.well-known/(.*)\", `${this.basePath}/.well-known/$1`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAC1E,iCAA0C;AAC1C,kEAAiC;AACjC,0DAAqD;AACrD,kDAA6C;AAC7C,0DAAqD;AAKrD,IAAa,UAAU,GAAvB,MAAa,UAAU;IAEX,GAAG,CAAsB;IAGzB,YAAY,CAAS;IAGrB,QAAQ,CAAS;IAGjB,YAAY,CAAe;IAG3B,QAAQ,CAAkB;IAEpC,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE;YACxC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;SAClC;IACH,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;SACjD;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAEzC,QAAQ,IAAI,CAAC,YAAY,EAAE;gBACzB,QAAQ;gBACR,KAAK,SAAS;oBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,KAAK;oBACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;oBACpD,MAAM;aACT;SACF;IACH,CAAC;IAED,QAAQ;QACN,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACnF,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;YACxB,aAAa;YACb,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE5B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,GAAG,mCAAmC,CAAC,CAAC;SAC3F;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,QAAQ,IAAI,CAAC,YAAY,EAAE;YACzB,QAAQ;YACR,KAAK,SAAS;gBACZ,MAAM,EAAC,OAAO,EAAE,iBAAiB,EAAC,GAAG,gEAAa,oBAAoB,GAAC,CAAC;gBACxE,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;YAChF,KAAK,KAAK;gBACR,aAAa;gBACb,MAAM,EAAC,OAAO,EAAE,aAAa,EAAC,GAAG,gEAAa,aAAa,GAAC,CAAC;gBAC7D,OAAO,aAAa,CAAC,mBAAmB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;SAChF;IACH,CAAC;CACF,CAAA;AAjEC;IADC,IAAA,eAAM,GAAE;sCACM,4BAAmB;uCAAC;AAGnC;IADC,IAAA,aAAQ,EAAC,eAAe,CAAC;;gDACK;AAG/B;IADC,IAAA,aAAQ,EAAC,WAAW,EAAE,OAAO,CAAC;;4CACJ;AAG3B;IADC,IAAA,eAAM,GAAE;sCACe,2BAAY;gDAAC;AAGrC;IADC,IAAA,eAAM,GAAE;sCACW,wBAAe;4CAAC;AAdzB,UAAU;IAHtB,IAAA,WAAM,EAAC;QACN,OAAO,EAAE,CAAC,2BAAY,EAAE,2BAAY,EAAE,mBAAQ,CAAC;KAChD,CAAC;GACW,UAAU,CAmEtB;AAnEY,gCAAU","sourcesContent":["import {Inject, InjectorService, PlatformApplication} from \"@tsed/common\";\nimport {Constant, Module} from \"@tsed/di\";\nimport koaMount from \"koa-mount\";\nimport {OidcAdapters} from \"./services/OidcAdapters\";\nimport {OidcJwks} from \"./services/OidcJwks\";\nimport {OidcProvider} from \"./services/OidcProvider\";\n\n@Module({\n  imports: [OidcProvider, OidcAdapters, OidcJwks]\n})\nexport class OidcModule {\n  @Inject()\n  protected app: PlatformApplication;\n\n  @Constant(\"PLATFORM_NAME\")\n  protected platformName: string;\n\n  @Constant(\"oidc.path\", \"/oidc\")\n  protected basePath: string;\n\n  @Inject()\n  protected oidcProvider: OidcProvider;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  async $onInit() {\n    if (this.oidcProvider.hasConfiguration()) {\n      await this.oidcProvider.create();\n    }\n  }\n\n  async $onRoutesInit() {\n    if (this.basePath !== \"/\") {\n      this.app.use(await this.getRewriteMiddleware());\n    }\n  }\n\n  async $afterRoutesInit() {\n    if (this.oidcProvider.hasConfiguration()) {\n      const provider = this.oidcProvider.get();\n\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          this.app.use(this.basePath, provider.callback());\n          break;\n        case \"koa\":\n          this.app.use(koaMount(this.basePath, provider.app));\n          break;\n      }\n    }\n  }\n\n  $onReady() {\n    if (this.oidcProvider.hasConfiguration() && \"getBestHost\" in this.injector.settings) {\n      const {injector} = this;\n      // @ts-ignore\n      const host = injector.settings.getBestHost();\n      const url = host.toString();\n\n      injector.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);\n    }\n  }\n\n  private async getRewriteMiddleware() {\n    switch (this.platformName) {\n      default:\n      case \"express\":\n        const {default: expressUrlRewrite} = await import(\"express-urlrewrite\");\n        return expressUrlRewrite(\"/.well-known/*\", `${this.basePath}/.well-known/$1`);\n      case \"koa\":\n        // @ts-ignore\n        const {default: koaUrlRewrite} = await import(\"koa-rewrite\");\n        return koaUrlRewrite(\"/.well-known/(.*)\", `${this.basePath}/.well-known/$1`);\n    }\n  }\n}\n"]}

package/lib/cjs/domain/OidcAccountsMethods.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcAccountsMethods.js","sourceRoot":"","sources":["../../../src/domain/OidcAccountsMethods.ts"],"names":[],"mappings":"","sourcesContent":["import {PlatformContext} from \"@tsed/common\";\nimport {Provider, Account} from \"oidc-provider\";\n\nexport type AuthorizationCode = InstanceType<Provider[\"AuthorizationCode\"]>;\nexport type AccessToken = InstanceType<Provider[\"AccessToken\"]>;\nexport type DeviceCode = InstanceType<Provider[\"DeviceCode\"]>;\nexport type BackchannelAuthenticationRequest = InstanceType<Provider[\"BackchannelAuthenticationRequest\"]>;\n\nexport interface OidcAccountsMethods {\n  findAccount(\n    id: string,\n    token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined,\n    ctx: PlatformContext\n  ): Promise<Account | undefined>;\n}\n"]}
+{"version":3,"file":"OidcAccountsMethods.js","sourceRoot":"","sources":["../../../src/domain/OidcAccountsMethods.ts"],"names":[],"mappings":"","sourcesContent":["import {Provider, Account} from \"oidc-provider\";\n\nexport type AuthorizationCode = InstanceType<Provider[\"AuthorizationCode\"]>;\nexport type AccessToken = InstanceType<Provider[\"AccessToken\"]>;\nexport type DeviceCode = InstanceType<Provider[\"DeviceCode\"]>;\nexport type BackchannelAuthenticationRequest = InstanceType<Provider[\"BackchannelAuthenticationRequest\"]>;\n\nexport interface OidcAccountsMethods {\n  findAccount(\n    id: string,\n    token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined\n  ): Promise<Account | undefined>;\n}\n"]}

package/lib/cjs/domain/OidcBadInteractionName.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OidcBadInteractionName = void 0;
+const exceptions_1 = require("@tsed/exceptions");
+class OidcBadInteractionName extends exceptions_1.BadRequest {
+}
+exports.OidcBadInteractionName = OidcBadInteractionName;
+//# sourceMappingURL=OidcBadInteractionName.js.map

package/lib/cjs/domain/OidcBadInteractionName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OidcBadInteractionName.js","sourceRoot":"","sources":["../../../src/domain/OidcBadInteractionName.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAE5C,MAAa,sBAAuB,SAAQ,uBAAU;CAAG;AAAzD,wDAAyD","sourcesContent":["import {BadRequest} from \"@tsed/exceptions\";\n\nexport class OidcBadInteractionName extends BadRequest {}\n"]}

package/lib/cjs/domain/OidcInteractionPromptProps.js

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

package/lib/cjs/domain/OidcInteractionPromptProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OidcInteractionPromptProps.js","sourceRoot":"","sources":["../../../src/domain/OidcInteractionPromptProps.ts"],"names":[],"mappings":"","sourcesContent":["import {UnknownObject} from \"oidc-provider\";\nimport {OidcClient} from \"./interfaces\";\n\nexport type OidcInteractionPromptProps<Props = Record<string, any>> = {\n  client: OidcClient;\n  uid: string;\n  grantId: string;\n  details: UnknownObject;\n  params: Record<string, any>;\n} & Props;\n"]}

package/lib/cjs/domain/OidcSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcSettings.js","sourceRoot":"","sources":["../../../src/domain/OidcSettings.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {JwksKeyParameters} from \"@tsed/jwks\";\nimport {Configuration} from \"oidc-provider\";\nimport {OidcAccountsMethods} from \"./OidcAccountsMethods\";\n\nexport interface OidcSettings extends Configuration {\n  /**\n   * Path on which the oidc-provider instance is mounted.\n   */\n  path?: string;\n  /**\n   * Issuer URI. By default Ts.ED create issuer with http://localhost:${httpPort}\n   */\n  issuer?: string;\n  /**\n   * Path to store jwks keys.\n   */\n  jwksPath?: string;\n  /**\n   * Generate jwks from given certificates\n   */\n  certificates?: JwksKeyParameters[];\n  /**\n   * Secure keys.\n   */\n  secureKey?: string[];\n  /**\n   * Enable proxy.\n   */\n  proxy?: boolean;\n  /**\n   * Injectable service to manage accounts.\n   */\n  Accounts?: Type<OidcAccountsMethods>;\n  /**\n   * Injectable service to manage clients.\n   */\n  // Clients?: Type<OidcClientsMethods>;\n}\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      oidc: OidcSettings;\n    }\n  }\n}\n"]}
+{"version":3,"file":"OidcSettings.js","sourceRoot":"","sources":["../../../src/domain/OidcSettings.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {JwksKeyParameters} from \"@tsed/jwks\";\nimport {Configuration} from \"oidc-provider\";\nimport {OidcAccountsMethods} from \"./OidcAccountsMethods\";\n\nexport interface OidcSettings extends Configuration {\n  /**\n   * force the secure cookie. By default, in dev mode it's disabled and in production it's enabled.\n   */\n  secureCookies?: boolean;\n  /**\n   * Path on which the oidc-provider instance is mounted.\n   */\n  path?: string;\n  /**\n   * Issuer URI. By default, Ts.ED create issuer with http://localhost:${httpPort}\n   */\n  issuer?: string;\n  /**\n   * Path to store jwks keys.\n   */\n  jwksPath?: string;\n  /**\n   * Generate jwks from given certificates\n   */\n  certificates?: JwksKeyParameters[];\n  /**\n   * Secure keys.\n   */\n  secureKey?: string[];\n  /**\n   * Enable proxy.\n   */\n  proxy?: boolean;\n  /**\n   * Allow redirect_uri on HTTP protocol and localhost domain.\n   */\n  allowHttpLocalhost?: boolean;\n  /**\n   * Injectable service to manage accounts.\n   */\n  Accounts?: Type<OidcAccountsMethods>;\n}\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      oidc: OidcSettings;\n    }\n  }\n}\n"]}

package/lib/cjs/index.js

@@ -16,9 +16,11 @@ tslib_1.__exportStar(require("./decorators/params"), exports);
 tslib_1.__exportStar(require("./decorators/prompt"), exports);
 tslib_1.__exportStar(require("./decorators/uid"), exports);
 tslib_1.__exportStar(require("./domain/OidcAccountsMethods"), exports);
+tslib_1.__exportStar(require("./domain/OidcBadInteractionName"), exports);
 tslib_1.__exportStar(require("./domain/OidcInteraction"), exports);
 tslib_1.__exportStar(require("./domain/OidcInteractionMethods"), exports);
 tslib_1.__exportStar(require("./domain/OidcInteractionOptions"), exports);
+tslib_1.__exportStar(require("./domain/OidcInteractionPromptProps"), exports);
 tslib_1.__exportStar(require("./domain/OidcSettings"), exports);
 tslib_1.__exportStar(require("./domain/interfaces"), exports);
 tslib_1.__exportStar(require("./middlewares/OidcInteractionMiddleware"), exports);

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,uDAA6B;AAC7B,gEAAsC;AACtC,+DAAqC;AACrC,mEAAyC;AACzC,oEAA0C;AAC1C,+DAAqC;AACrC,+DAAqC;AACrC,mEAAyC;AACzC,8DAAoC;AACpC,8DAAoC;AACpC,2DAAiC;AACjC,uEAA6C;AAC7C,mEAAyC;AACzC,0EAAgD;AAChD,0EAAgD;AAChD,gEAAsC;AACtC,8DAAoC;AACpC,kFAAwD;AACxD,8EAAoD;AACpD,6EAAmD;AACnD,kEAAwC;AACxC,4EAAkD;AAClD,sEAA4C;AAC5C,8DAAoC;AACpC,kEAAwC;AACxC,wDAA8B","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./OidcModule\";\nexport * from \"./constants/constants\";\nexport * from \"./decorators/grantId\";\nexport * from \"./decorators/interaction\";\nexport * from \"./decorators/interactions\";\nexport * from \"./decorators/noCache\";\nexport * from \"./decorators/oidcCtx\";\nexport * from \"./decorators/oidcSession\";\nexport * from \"./decorators/params\";\nexport * from \"./decorators/prompt\";\nexport * from \"./decorators/uid\";\nexport * from \"./domain/OidcAccountsMethods\";\nexport * from \"./domain/OidcInteraction\";\nexport * from \"./domain/OidcInteractionMethods\";\nexport * from \"./domain/OidcInteractionOptions\";\nexport * from \"./domain/OidcSettings\";\nexport * from \"./domain/interfaces\";\nexport * from \"./middlewares/OidcInteractionMiddleware\";\nexport * from \"./middlewares/OidcNoCacheMiddleware\";\nexport * from \"./middlewares/OidcSecureMiddleware\";\nexport * from \"./services/OidcAdapters\";\nexport * from \"./services/OidcInteractionContext\";\nexport * from \"./services/OidcInteractions\";\nexport * from \"./services/OidcJwks\";\nexport * from \"./services/OidcProvider\";\nexport * from \"./utils/debug\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,uDAA6B;AAC7B,gEAAsC;AACtC,+DAAqC;AACrC,mEAAyC;AACzC,oEAA0C;AAC1C,+DAAqC;AACrC,+DAAqC;AACrC,mEAAyC;AACzC,8DAAoC;AACpC,8DAAoC;AACpC,2DAAiC;AACjC,uEAA6C;AAC7C,0EAAgD;AAChD,mEAAyC;AACzC,0EAAgD;AAChD,0EAAgD;AAChD,8EAAoD;AACpD,gEAAsC;AACtC,8DAAoC;AACpC,kFAAwD;AACxD,8EAAoD;AACpD,6EAAmD;AACnD,kEAAwC;AACxC,4EAAkD;AAClD,sEAA4C;AAC5C,8DAAoC;AACpC,kEAAwC;AACxC,wDAA8B","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./OidcModule\";\nexport * from \"./constants/constants\";\nexport * from \"./decorators/grantId\";\nexport * from \"./decorators/interaction\";\nexport * from \"./decorators/interactions\";\nexport * from \"./decorators/noCache\";\nexport * from \"./decorators/oidcCtx\";\nexport * from \"./decorators/oidcSession\";\nexport * from \"./decorators/params\";\nexport * from \"./decorators/prompt\";\nexport * from \"./decorators/uid\";\nexport * from \"./domain/OidcAccountsMethods\";\nexport * from \"./domain/OidcBadInteractionName\";\nexport * from \"./domain/OidcInteraction\";\nexport * from \"./domain/OidcInteractionMethods\";\nexport * from \"./domain/OidcInteractionOptions\";\nexport * from \"./domain/OidcInteractionPromptProps\";\nexport * from \"./domain/OidcSettings\";\nexport * from \"./domain/interfaces\";\nexport * from \"./middlewares/OidcInteractionMiddleware\";\nexport * from \"./middlewares/OidcNoCacheMiddleware\";\nexport * from \"./middlewares/OidcSecureMiddleware\";\nexport * from \"./services/OidcAdapters\";\nexport * from \"./services/OidcInteractionContext\";\nexport * from \"./services/OidcInteractions\";\nexport * from \"./services/OidcJwks\";\nexport * from \"./services/OidcProvider\";\nexport * from \"./utils/debug\";\n"]}

package/lib/cjs/middlewares/OidcInteractionMiddleware.js

@@ -3,37 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OidcInteractionMiddleware = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@tsed/common");
-const constants_1 = require("../constants/constants");
 const OidcInteractionContext_1 = require("../services/OidcInteractionContext");
-const OidcInteractions_1 = require("../services/OidcInteractions");
 let OidcInteractionMiddleware = class OidcInteractionMiddleware {
-    async use(context) {
-        const oidcInteraction = this.injector.invoke(OidcInteractionContext_1.OidcInteractionContext, context.container);
-        const interactionDetails = await oidcInteraction.interactionDetails();
-        const { uid, prompt, params, session, grantId } = interactionDetails;
-        context.set(constants_1.INTERACTION_CONTEXT, oidcInteraction);
-        context.set(constants_1.INTERACTION_DETAILS, interactionDetails);
-        context.set(constants_1.INTERACTION_UID, uid);
-        context.set(constants_1.INTERACTION_PROMPT, prompt);
-        context.set(constants_1.INTERACTION_PARAMS, params);
-        context.set(constants_1.INTERACTION_GRANT_ID, grantId);
-        context.set(constants_1.INTERACTION_SESSION, session);
+    oidcInteractionContext;
+    async use() {
+        await this.oidcInteractionContext.interactionDetails();
     }
 };
 tslib_1.__decorate([
     (0, common_1.Inject)(),
-    tslib_1.__metadata("design:type", OidcInteractions_1.OidcInteractions)
-], OidcInteractionMiddleware.prototype, "oidcInteractions", void 0);
-tslib_1.__decorate([
-    (0, common_1.Inject)(),
-    tslib_1.__metadata("design:type", common_1.InjectorService)
-], OidcInteractionMiddleware.prototype, "injector", void 0);
-tslib_1.__decorate([
-    tslib_1.__param(0, (0, common_1.Context)()),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], OidcInteractionMiddleware.prototype, "use", null);
+    tslib_1.__metadata("design:type", OidcInteractionContext_1.OidcInteractionContext)
+], OidcInteractionMiddleware.prototype, "oidcInteractionContext", void 0);
 OidcInteractionMiddleware = tslib_1.__decorate([
     (0, common_1.Middleware)()
 ], OidcInteractionMiddleware);

package/lib/cjs/middlewares/OidcInteractionMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractionMiddleware.js","sourceRoot":"","sources":["../../../src/middlewares/OidcInteractionMiddleware.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAC1E,sDAQgC;AAChC,+EAA0E;AAC1E,mEAA8D;AAG9D,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAOpC,KAAK,CAAC,GAAG,CAAY,OAAgB;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAyB,+CAAsB,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAChH,MAAM,kBAAkB,GAAG,MAAM,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACtE,MAAM,EAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,kBAAyB,CAAC;QAE1E,OAAO,CAAC,GAAG,CAAC,+BAAmB,EAAE,eAAe,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,+BAAmB,EAAE,kBAAkB,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,2BAAe,EAAE,GAAG,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,8BAAkB,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,8BAAkB,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,+BAAmB,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;AAlBC;IADC,IAAA,eAAM,GAAE;sCACmB,mCAAgB;mEAAC;AAG7C;IADC,IAAA,eAAM,GAAE;sCACW,wBAAe;2DAAC;AAEpC;IAAW,mBAAA,IAAA,gBAAO,GAAE,CAAA;;;;oDAYnB;AAnBU,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAoBrC;AApBY,8DAAyB","sourcesContent":["import {Context, Inject, InjectorService, Middleware} from \"@tsed/common\";\nimport {\n  INTERACTION_CONTEXT,\n  INTERACTION_DETAILS,\n  INTERACTION_PARAMS,\n  INTERACTION_GRANT_ID,\n  INTERACTION_PROMPT,\n  INTERACTION_SESSION,\n  INTERACTION_UID\n} from \"../constants/constants\";\nimport {OidcInteractionContext} from \"../services/OidcInteractionContext\";\nimport {OidcInteractions} from \"../services/OidcInteractions\";\n\n@Middleware()\nexport class OidcInteractionMiddleware {\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  async use(@Context() context: Context) {\n    const oidcInteraction = this.injector.invoke<OidcInteractionContext>(OidcInteractionContext, context.container);\n    const interactionDetails = await oidcInteraction.interactionDetails();\n    const {uid, prompt, params, session, grantId} = interactionDetails as any;\n\n    context.set(INTERACTION_CONTEXT, oidcInteraction);\n    context.set(INTERACTION_DETAILS, interactionDetails);\n    context.set(INTERACTION_UID, uid);\n    context.set(INTERACTION_PROMPT, prompt);\n    context.set(INTERACTION_PARAMS, params);\n    context.set(INTERACTION_GRANT_ID, grantId);\n    context.set(INTERACTION_SESSION, session);\n  }\n}\n"]}
+{"version":3,"file":"OidcInteractionMiddleware.js","sourceRoot":"","sources":["../../../src/middlewares/OidcInteractionMiddleware.ts"],"names":[],"mappings":";;;;AAAA,yCAAgD;AAChD,+EAA0E;AAG1E,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAE1B,sBAAsB,CAAyB;IAEzD,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,EAAE,CAAC;IACzD,CAAC;CACF,CAAA;AALC;IADC,IAAA,eAAM,GAAE;sCACyB,+CAAsB;yEAAC;AAF9C,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAOrC;AAPY,8DAAyB","sourcesContent":["import {Inject, Middleware} from \"@tsed/common\";\nimport {OidcInteractionContext} from \"../services/OidcInteractionContext\";\n\n@Middleware()\nexport class OidcInteractionMiddleware {\n  @Inject()\n  protected oidcInteractionContext: OidcInteractionContext;\n\n  async use() {\n    await this.oidcInteractionContext.interactionDetails();\n  }\n}\n"]}

package/lib/cjs/services/OidcAdapters.js

@@ -5,9 +5,11 @@ const tslib_1 = require("tslib");
 const adapters_1 = require("@tsed/adapters");
 const di_1 = require("@tsed/di");
 let OidcAdapters = class OidcAdapters {
+    adapters;
     createAdapterClass() {
         const self = this;
         return class CustomAdapter {
+            adapter;
             constructor(name) {
                 this.adapter = self.adapters.invokeAdapter({
                     collectionName: name,
@@ -25,22 +27,42 @@ let OidcAdapters = class OidcAdapters {
                 return this.adapter.findById(id);
             }
             async findByUserCode(userCode) {
+                // istanbul ignore next
+                if (this.adapter.findByUserCode) {
+                    return this.adapter.findByUserCode(userCode);
+                }
                 return this.adapter.findOne({
                     userCode
                 });
             }
             async findByUid(uid) {
+                // istanbul ignore next
+                if (this.adapter.findByUid) {
+                    return this.adapter.findByUid(uid);
+                }
                 return this.adapter.findOne({
                     uid
                 });
             }
             async destroy(id) {
+                // istanbul ignore next
+                if (this.adapter.destroy) {
+                    return this.adapter.destroy(id);
+                }
                 await this.adapter.deleteById(id);
             }
             async revokeByGrantId(grantId) {
+                // istanbul ignore next
+                if (this.adapter.revokeByGrantId) {
+                    return this.adapter.revokeByGrantId(grantId);
+                }
                 await this.adapter.deleteMany({ grantId });
             }
             async consume(grantId) {
+                // istanbul ignore next
+                if (this.adapter.consume) {
+                    return this.adapter.consume(grantId);
+                }
                 await this.adapter.update(grantId, { consumed: Math.floor(Date.now() / 1000) });
             }
         };

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

@@ -1 +1 @@
-{"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":";;;;AAAA,6CAAiD;AACjD,iCAA4C;AAI5C,IAAa,YAAY,GAAzB,MAAa,YAAY;IAIvB,kBAAkB;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,OAAO,MAAM,aAAa;YAGxB,YAAY,IAAY;gBACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAM;oBAC9C,cAAc,EAAE,IAAI;oBACpB,KAAK,EAAE,MAAM;iBACd,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,OAAY,EAAE,SAAiB;gBACtD,IAAI,SAAS,CAAC;gBAEd,IAAI,SAAS,EAAE;oBACb,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;iBACrD;gBAED,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACpD,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,EAAU;gBACnB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC;YAED,KAAK,CAAC,cAAc,CAAC,QAAgB;gBACnC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;oBAC1B,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,SAAS,CAAC,GAAW;gBACzB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;oBAC1B,GAAG;iBACJ,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,OAAO,CAAC,EAAU;gBACtB,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACpC,CAAC;YAED,KAAK,CAAC,eAAe,CAAC,OAAe;gBACnC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;YAC3C,CAAC;YAED,KAAK,CAAC,OAAO,CAAC,OAAe;gBAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAC,CAAC,CAAC;YAChF,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAtDC;IADC,IAAA,WAAM,GAAE;sCACW,mBAAQ;8CAAC;AAFlB,YAAY;IADxB,IAAA,eAAU,GAAE;GACA,YAAY,CAwDxB;AAxDY,oCAAY","sourcesContent":["import {Adapter, Adapters} from \"@tsed/adapters\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {Adapter as OidcAdapter, AdapterConstructor} from \"oidc-provider\";\n\n@Injectable()\nexport class OidcAdapters {\n  @Inject()\n  protected adapters: Adapters;\n\n  createAdapterClass(): AdapterConstructor {\n    const self = this;\n\n    return class CustomAdapter implements OidcAdapter {\n      adapter: Adapter<any>;\n\n      constructor(name: string) {\n        this.adapter = self.adapters.invokeAdapter<any>({\n          collectionName: name,\n          model: Object\n        });\n      }\n\n      async upsert(id: string, payload: any, expiresIn: number): Promise<void> {\n        let expiresAt;\n\n        if (expiresIn) {\n          expiresAt = new Date(Date.now() + expiresIn * 1000);\n        }\n\n        await this.adapter.upsert(id, payload, expiresAt);\n      }\n\n      async find(id: string) {\n        return this.adapter.findById(id);\n      }\n\n      async findByUserCode(userCode: string) {\n        return this.adapter.findOne({\n          userCode\n        });\n      }\n\n      async findByUid(uid: string) {\n        return this.adapter.findOne({\n          uid\n        });\n      }\n\n      async destroy(id: string) {\n        await this.adapter.deleteById(id);\n      }\n\n      async revokeByGrantId(grantId: string) {\n        await this.adapter.deleteMany({grantId});\n      }\n\n      async consume(grantId: string) {\n        await this.adapter.update(grantId, {consumed: Math.floor(Date.now() / 1000)});\n      }\n    };\n  }\n}\n"]}
+{"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":"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","sourcesContent":["import {Adapter, Adapters} from \"@tsed/adapters\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {Adapter as OidcAdapter, AdapterConstructor} from \"oidc-provider\";\n\nexport type OidcAdapterMethods<Model = any> = Adapter<Model> & Partial<Omit<OidcAdapter, \"upsert\">>;\n\n@Injectable()\nexport class OidcAdapters {\n  @Inject()\n  protected adapters: Adapters;\n\n  createAdapterClass(): AdapterConstructor {\n    const self = this;\n\n    return class CustomAdapter implements OidcAdapter {\n      adapter: OidcAdapterMethods;\n\n      constructor(name: string) {\n        this.adapter = self.adapters.invokeAdapter<any>({\n          collectionName: name,\n          model: Object\n        }) as OidcAdapterMethods;\n      }\n\n      async upsert(id: string, payload: any, expiresIn: number): Promise<void> {\n        let expiresAt;\n\n        if (expiresIn) {\n          expiresAt = new Date(Date.now() + expiresIn * 1000);\n        }\n\n        await this.adapter.upsert(id, payload, expiresAt);\n      }\n\n      async find(id: string) {\n        return this.adapter.findById(id);\n      }\n\n      async findByUserCode(userCode: string) {\n        // istanbul ignore next\n        if (this.adapter.findByUserCode) {\n          return this.adapter.findByUserCode(userCode);\n        }\n\n        return this.adapter.findOne({\n          userCode\n        });\n      }\n\n      async findByUid(uid: string) {\n        // istanbul ignore next\n        if (this.adapter.findByUid) {\n          return this.adapter.findByUid(uid);\n        }\n\n        return this.adapter.findOne({\n          uid\n        });\n      }\n\n      async destroy(id: string) {\n        // istanbul ignore next\n        if (this.adapter.destroy) {\n          return this.adapter.destroy(id);\n        }\n\n        await this.adapter.deleteById(id);\n      }\n\n      async revokeByGrantId(grantId: string) {\n        // istanbul ignore next\n        if (this.adapter.revokeByGrantId) {\n          return this.adapter.revokeByGrantId(grantId);\n        }\n\n        await this.adapter.deleteMany({grantId});\n      }\n\n      async consume(grantId: string) {\n        // istanbul ignore next\n        if (this.adapter.consume) {\n          return this.adapter.consume(grantId);\n        }\n\n        await this.adapter.update(grantId, {consumed: Math.floor(Date.now() / 1000)});\n      }\n    };\n  }\n}\n"]}

package/lib/cjs/services/OidcInteractionContext.js

@@ -5,10 +5,20 @@ const tslib_1 = require("tslib");
 const common_1 = require("@tsed/common");
 const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
+const exceptions_1 = require("@tsed/exceptions");
+const constants_1 = require("../constants/constants");
+const OidcBadInteractionName_1 = require("../domain/OidcBadInteractionName");
 const debug_1 = require("../utils/debug");
 const OidcInteractions_1 = require("./OidcInteractions");
 const OidcProvider_1 = require("./OidcProvider");
 let OidcInteractionContext = class OidcInteractionContext {
+    env;
+    oidcProvider;
+    oidcInteractions;
+    $ctx;
+    get raw() {
+        return this.$ctx.get(constants_1.INTERACTION_DETAILS);
+    }
     get session() {
         return this.raw.session;
     }
@@ -27,40 +37,65 @@ let OidcInteractionContext = class OidcInteractionContext {
     async runInteraction(name = this.prompt.name) {
         const handler = this.oidcInteractions.getInteractionHandler(name);
         if (handler) {
-            await handler(this.context);
+            await handler(this.$ctx);
         }
     }
     async interactionDetails() {
-        this.raw = await this.oidcProvider.get().interactionDetails(this.context.getReq(), this.context.getRes());
-        return this.raw;
+        const raw = await this.oidcProvider.get().interactionDetails(this.$ctx.getReq(), this.$ctx.getRes());
+        const { uid, prompt, params, session, grantId } = raw;
+        this.$ctx.set(constants_1.INTERACTION_CONTEXT, this);
+        this.$ctx.set(constants_1.INTERACTION_DETAILS, raw);
+        this.$ctx.set(constants_1.INTERACTION_UID, uid);
+        this.$ctx.set(constants_1.INTERACTION_PROMPT, prompt);
+        this.$ctx.set(constants_1.INTERACTION_PARAMS, params);
+        this.$ctx.set(constants_1.INTERACTION_GRANT_ID, grantId);
+        this.$ctx.set(constants_1.INTERACTION_SESSION, session);
+        return raw;
     }
     async interactionFinished(result, options = { mergeWithLastSubmission: false }) {
-        return this.oidcProvider.get().interactionFinished(this.context.getReq(), this.context.getRes(), result, options);
+        return this.oidcProvider.get().interactionFinished(this.$ctx.getReq(), this.$ctx.getRes(), result, options);
     }
     async interactionResult(result, options = { mergeWithLastSubmission: false }) {
-        return this.oidcProvider.get().interactionResult(this.context.getReq(), this.context.getRes(), result, options);
+        return this.oidcProvider.get().interactionResult(this.$ctx.getReq(), this.$ctx.getRes(), result, options);
+    }
+    async interactionPrompt(options) {
+        const client = await this.findClient();
+        return {
+            client,
+            uid: this.uid,
+            grantId: this.grantId,
+            details: this.prompt.details,
+            params: {
+                ...this.params,
+                ...options.params
+            },
+            ...options,
+            ...this.debug()
+        };
     }
     async render(view, result) {
-        return this.context.response.render(view, result);
+        return this.$ctx.response.render(view, result);
     }
     async save(ttl) {
         return this.raw.save(ttl);
     }
     async findClient(clientId = this.params.client_id) {
-        return this.oidcProvider.get().Client.find(clientId);
+        const key = `$client:${clientId}`;
+        return this.$ctx.cacheAsync(key, () => this.oidcProvider.get().Client.find(clientId));
     }
     async findAccount(sub, token) {
-        var _a;
         if (!sub && this.session) {
-            sub = (_a = this.session) === null || _a === void 0 ? void 0 : _a.accountId;
+            sub = this.session?.accountId;
         }
         if (!sub) {
             return;
         }
-        return this.oidcProvider.get().Account.findAccount(undefined, sub, token);
+        const key = `$account:${sub}`;
+        return this.$ctx.cacheAsync(key, (() => {
+            return this.oidcProvider.get().Account.findAccount(undefined, sub, token);
+        }));
     }
     async getGrant() {
-        var _a;
         const { Grant } = this.oidcProvider.get();
         if (this.grantId) {
             // we'll be modifying existing grant in existing session
@@ -68,10 +103,21 @@ let OidcInteractionContext = class OidcInteractionContext {
             return await (this.oidcProvider.get().find || Grant.find)(this.grantId);
         }
         return new Grant({
-            accountId: (_a = this.session) === null || _a === void 0 ? void 0 : _a.accountId,
+            accountId: this.session?.accountId,
             clientId: this.params.client_id
         });
     }
+    checkInteractionName(name) {
+        if (this.prompt.name !== name) {
+            throw new OidcBadInteractionName_1.OidcBadInteractionName("Bad interaction name");
+        }
+    }
+    async checkClientId(clientId = this.params.client_id) {
+        const client = await this.findClient(clientId);
+        if (!client) {
+            throw new exceptions_1.Unauthorized(`Unknown client_id ${clientId}`);
+        }
+    }
     debug(obj) {
         /* istanbul ignore next */
         if (this.env === core_1.Env.PROD) {
@@ -102,12 +148,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", OidcInteractions_1.OidcInteractions)
 ], OidcInteractionContext.prototype, "oidcInteractions", void 0);
 tslib_1.__decorate([
-    (0, di_1.Inject)(),
+    (0, common_1.InjectContext)(),
     tslib_1.__metadata("design:type", common_1.PlatformContext)
-], OidcInteractionContext.prototype, "context", void 0);
+], OidcInteractionContext.prototype, "$ctx", void 0);
 OidcInteractionContext = tslib_1.__decorate([
-    (0, di_1.Injectable)(),
-    (0, common_1.Scope)(common_1.ProviderScope.REQUEST)
+    (0, di_1.Injectable)()
 ], OidcInteractionContext);
 exports.OidcInteractionContext = OidcInteractionContext;
 //# sourceMappingURL=OidcInteractionContext.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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","sourcesContent":["import {Constant, PlatformContext, ProviderScope, Scope} from \"@tsed/common\";\nimport {Env} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {Account, InteractionResults, PromptDetail, Provider} from \"oidc-provider\";\nimport {OidcSession} from \"../decorators/oidcSession\";\nimport {OidcClient} from \"../domain/interfaces\";\nimport {OidcInteraction} from \"../domain/OidcInteraction\";\nimport {debug} from \"../utils/debug\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcProvider} from \"./OidcProvider\";\n\n@Injectable()\n@Scope(ProviderScope.REQUEST)\nexport class OidcInteractionContext {\n  @Constant(\"env\")\n  env: Env;\n\n  @Inject()\n  protected oidcProvider: OidcProvider;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected context: PlatformContext;\n\n  protected raw: OidcInteraction;\n\n  get session(): OidcSession | undefined {\n    return this.raw.session as any;\n  }\n\n  get prompt(): PromptDetail {\n    return this.raw.prompt;\n  }\n\n  get params(): Record<string, any> {\n    return this.raw.params;\n  }\n\n  get uid(): string {\n    return this.raw.uid;\n  }\n\n  get grantId(): string {\n    return (this.raw as any).grantId;\n  }\n\n  async runInteraction(name: string = this.prompt.name) {\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      await handler(this.context);\n    }\n  }\n\n  async interactionDetails(): Promise<OidcInteraction> {\n    this.raw = await this.oidcProvider.get().interactionDetails(this.context.getReq(), this.context.getRes());\n\n    return this.raw;\n  }\n\n  async interactionFinished(result: InteractionResults, options: {mergeWithLastSubmission?: boolean} = {mergeWithLastSubmission: false}) {\n    return this.oidcProvider.get().interactionFinished(this.context.getReq(), this.context.getRes(), result, options);\n  }\n\n  async interactionResult(result: InteractionResults, options: {mergeWithLastSubmission?: boolean} = {mergeWithLastSubmission: false}) {\n    return this.oidcProvider.get().interactionResult(this.context.getReq(), this.context.getRes(), result, options);\n  }\n\n  async render(view: string, result: any): Promise<string> {\n    return this.context.response.render(view, result);\n  }\n\n  async save(ttl: number): Promise<string> {\n    return this.raw.save(ttl);\n  }\n\n  async findClient(clientId: string = this.params.client_id): Promise<OidcClient | undefined> {\n    return this.oidcProvider.get().Client.find(clientId);\n  }\n\n  async findAccount(sub?: string, token?: any): Promise<Account | undefined> {\n    if (!sub && this.session) {\n      sub = this.session?.accountId as any;\n    }\n\n    if (!sub) {\n      return;\n    }\n\n    return this.oidcProvider.get().Account.findAccount(undefined as any, sub!, token);\n  }\n\n  async getGrant(): Promise<InstanceType<Provider[\"Grant\"]>> {\n    const {Grant} = this.oidcProvider.get() as any;\n\n    if (this.grantId) {\n      // we'll be modifying existing grant in existing session\n      // @ts-ignore\n      return await (this.oidcProvider.get().find || Grant.find)(this.grantId);\n    }\n\n    return new Grant({\n      accountId: this.session?.accountId,\n      clientId: this.params.client_id\n    });\n  }\n\n  debug(obj?: any): any {\n    /* istanbul ignore next */\n    if (this.env === Env.PROD) {\n      return {session: undefined, dbg: {params: undefined, prompt: undefined}};\n    }\n\n    if (obj) {\n      return debug(obj);\n    }\n\n    return {\n      session: this.session ? this.debug(this.session) : undefined,\n      dbg: {\n        params: this.debug(this.params),\n        prompt: this.debug(this.prompt)\n      }\n    };\n  }\n}\n"]}
+{"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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","sourcesContent":["import {Constant, InjectContext, PlatformContext} from \"@tsed/common\";\nimport {Env} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {Unauthorized} from \"@tsed/exceptions\";\nimport {Account, InteractionResults, PromptDetail, Provider} from \"oidc-provider\";\nimport {\n  INTERACTION_CONTEXT,\n  INTERACTION_DETAILS,\n  INTERACTION_GRANT_ID,\n  INTERACTION_PARAMS,\n  INTERACTION_PROMPT,\n  INTERACTION_SESSION,\n  INTERACTION_UID\n} from \"../constants/constants\";\nimport {OidcSession} from \"../decorators/oidcSession\";\nimport {OidcClient} from \"../domain/interfaces\";\nimport {OidcBadInteractionName} from \"../domain/OidcBadInteractionName\";\nimport {OidcInteraction} from \"../domain/OidcInteraction\";\nimport {OidcInteractionPromptProps} from \"../domain/OidcInteractionPromptProps\";\nimport {debug} from \"../utils/debug\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcProvider} from \"./OidcProvider\";\n\n@Injectable()\nexport class OidcInteractionContext {\n  @Constant(\"env\")\n  env: Env;\n\n  @Inject()\n  protected oidcProvider: OidcProvider;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @InjectContext()\n  protected $ctx: PlatformContext;\n\n  get raw(): OidcInteraction {\n    return this.$ctx.get(INTERACTION_DETAILS)!;\n  }\n\n  get session(): OidcSession | undefined {\n    return this.raw.session as any;\n  }\n\n  get prompt(): PromptDetail {\n    return this.raw.prompt;\n  }\n\n  get params(): Record<string, any> {\n    return this.raw.params;\n  }\n\n  get uid(): string {\n    return this.raw.uid;\n  }\n\n  get grantId(): string {\n    return (this.raw as any).grantId;\n  }\n\n  async runInteraction(name: string = this.prompt.name) {\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      await handler(this.$ctx);\n    }\n  }\n\n  async interactionDetails(): Promise<OidcInteraction> {\n    const raw = await this.oidcProvider.get().interactionDetails(this.$ctx.getReq(), this.$ctx.getRes());\n    const {uid, prompt, params, session, grantId} = raw as any;\n\n    this.$ctx.set(INTERACTION_CONTEXT, this);\n    this.$ctx.set(INTERACTION_DETAILS, raw);\n    this.$ctx.set(INTERACTION_UID, uid);\n    this.$ctx.set(INTERACTION_PROMPT, prompt);\n    this.$ctx.set(INTERACTION_PARAMS, params);\n    this.$ctx.set(INTERACTION_GRANT_ID, grantId);\n    this.$ctx.set(INTERACTION_SESSION, session);\n\n    return raw;\n  }\n\n  async interactionFinished(result: InteractionResults, options: {mergeWithLastSubmission?: boolean} = {mergeWithLastSubmission: false}) {\n    return this.oidcProvider.get().interactionFinished(this.$ctx.getReq(), this.$ctx.getRes(), result, options);\n  }\n\n  async interactionResult(result: InteractionResults, options: {mergeWithLastSubmission?: boolean} = {mergeWithLastSubmission: false}) {\n    return this.oidcProvider.get().interactionResult(this.$ctx.getReq(), this.$ctx.getRes(), result, options);\n  }\n\n  async interactionPrompt(options: Record<string, any>): Promise<OidcInteractionPromptProps> {\n    const client = await this.findClient();\n\n    return {\n      client,\n      uid: this.uid,\n      grantId: this.grantId,\n      details: this.prompt.details,\n      params: {\n        ...this.params,\n        ...options.params\n      },\n      ...options,\n      ...this.debug()\n    };\n  }\n\n  async render(view: string, result: any): Promise<string> {\n    return this.$ctx.response.render(view, result);\n  }\n\n  async save(ttl: number): Promise<string> {\n    return this.raw.save(ttl);\n  }\n\n  async findClient(clientId: string = this.params.client_id): Promise<OidcClient | undefined> {\n    const key = `$client:${clientId}`;\n\n    return this.$ctx.cacheAsync(key, () => this.oidcProvider.get().Client.find(clientId));\n  }\n\n  async findAccount(sub?: string, token?: any): Promise<Account | undefined> {\n    if (!sub && this.session) {\n      sub = this.session?.accountId as any;\n    }\n\n    if (!sub) {\n      return;\n    }\n\n    const key = `$account:${sub}`;\n\n    return this.$ctx.cacheAsync<Account | undefined>(key, (() => {\n      return this.oidcProvider.get().Account.findAccount(undefined as any, sub!, token);\n    }) as any);\n  }\n\n  async getGrant(): Promise<InstanceType<Provider[\"Grant\"]>> {\n    const {Grant} = this.oidcProvider.get() as any;\n\n    if (this.grantId) {\n      // we'll be modifying existing grant in existing session\n      // @ts-ignore\n      return await (this.oidcProvider.get().find || Grant.find)(this.grantId);\n    }\n\n    return new Grant({\n      accountId: this.session?.accountId,\n      clientId: this.params.client_id\n    });\n  }\n\n  checkInteractionName(name: string) {\n    if (this.prompt.name !== name) {\n      throw new OidcBadInteractionName(\"Bad interaction name\");\n    }\n  }\n\n  async checkClientId(clientId = this.params.client_id) {\n    const client = await this.findClient(clientId);\n\n    if (!client) {\n      throw new Unauthorized(`Unknown client_id ${clientId}`);\n    }\n  }\n\n  debug(obj?: any): any {\n    /* istanbul ignore next */\n    if (this.env === Env.PROD) {\n      return {session: undefined, dbg: {params: undefined, prompt: undefined}};\n    }\n\n    if (obj) {\n      return debug(obj);\n    }\n\n    return {\n      session: this.session ? this.debug(this.session) : undefined,\n      dbg: {\n        params: this.debug(this.params),\n        prompt: this.debug(this.prompt)\n      }\n    };\n  }\n}\n"]}

package/lib/cjs/services/OidcInteractions.js

@@ -7,16 +7,16 @@ const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
 const constants_1 = require("../constants/constants");
 let OidcInteractions = class OidcInteractions {
-    constructor() {
-        this.interactions = new Map();
-    }
+    injector;
+    env;
+    oidcSettings;
+    interactions = new Map();
     $onInit() {
         const platformHandler = this.injector.get(common_1.PlatformHandler);
         this.getInteractions().forEach((provider) => {
-            var _a;
             const { name } = provider.store.get(constants_1.INTERACTION_OPTIONS);
             this.interactions.set(name, provider);
-            if ((_a = this.injector.get(provider.token)) === null || _a === void 0 ? void 0 : _a.$prompt) {
+            if (this.injector.get(provider.token)?.$prompt) {
                 provider.store.set("$prompt", platformHandler.createCustomHandler(provider, "$prompt"));
             }
         });
@@ -29,7 +29,7 @@ let OidcInteractions = class OidcInteractions {
         }
         return interactionsProvider.children
             .map((token) => this.injector.getProvider(token))
-            .filter((provider) => (provider === null || provider === void 0 ? void 0 : provider.subType) === constants_1.INTERACTION);
+            .filter((provider) => provider?.subType === constants_1.INTERACTION);
     }
     getInteractionProvider(name) {
         return this.interactions.get(name);
@@ -37,9 +37,10 @@ let OidcInteractions = class OidcInteractions {
     getInteractionHandler(name) {
         const interaction = this.getInteractionProvider(name);
         if (interaction) {
+            const endpoint = common_1.EndpointMetadata.get(interaction.useClass, "$prompt");
             return (ctx) => {
                 // Add current endpoint metadata to ctx
-                ctx.endpoint = common_1.EndpointMetadata.get(interaction.useClass, "$prompt");
+                ctx.endpoint = endpoint;
                 return interaction.store.get("$prompt")(ctx);
             };
         }

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

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";;;;AAAA,yCAAmH;AACnH,qCAA+B;AAC/B,iCAA6D;AAC7D,sDAAsF;AAKtF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QAUY,iBAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IA4C5D,CAAC;IA1CC,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,wBAAe,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,+BAAmB,CAAC,CAAC;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,IAAI,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,0CAAE,OAAO,EAAE;gBAC9C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;aACzF;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,wBAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO,EAAE,CAAC;SACX;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,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,MAAK,uBAAW,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;YACf,OAAO,CAAC,GAAoB,EAAE,EAAE;gBAC9B,uCAAuC;gBACvC,GAAG,CAAC,QAAQ,GAAG,yBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAErE,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC,CAAC;SACH;IACH,CAAC;CACF,CAAA;AApDC;IADC,IAAA,WAAM,GAAE;sCACC,oBAAe;kDAAC;AAG1B;IADC,IAAA,iBAAQ,EAAC,KAAK,CAAC;;6CACP;AAGT;IADC,IAAA,iBAAQ,EAAC,MAAM,CAAC;;sDACU;AARhB,gBAAgB;IAD5B,IAAA,eAAU,GAAE;GACA,gBAAgB,CAsD5B;AAtDY,4CAAgB","sourcesContent":["import {Constant, EndpointMetadata, PlatformContext, PlatformHandler, Provider, TokenProvider} from \"@tsed/common\";\nimport {Env} from \"@tsed/core\";\nimport {Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {INTERACTION, INTERACTION_OPTIONS, INTERACTIONS} from \"../constants/constants\";\nimport {OidcInteractionOptions} from \"../domain/OidcInteractionOptions\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\n\n@Injectable()\nexport class OidcInteractions {\n  @Inject()\n  injector: InjectorService;\n\n  @Constant(\"env\")\n  env: Env;\n\n  @Constant(\"oidc\")\n  oidcSettings: OidcSettings;\n\n  protected interactions: Map<string, Provider> = new Map();\n\n  $onInit(): void {\n    const platformHandler = this.injector.get<PlatformHandler>(PlatformHandler)!;\n\n    this.getInteractions().forEach((provider: Provider) => {\n      const {name} = provider.store.get<OidcInteractionOptions>(INTERACTION_OPTIONS);\n      this.interactions.set(name, provider);\n\n      if (this.injector.get(provider.token)?.$prompt) {\n        provider.store.set(\"$prompt\", platformHandler.createCustomHandler(provider, \"$prompt\"));\n      }\n    });\n  }\n\n  getInteractions(): Provider[] {\n    const interactionsProvider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    /* istanbul ignore next */\n    if (!interactionsProvider) {\n      return [];\n    }\n\n    return interactionsProvider.children\n      .map((token: TokenProvider) => this.injector.getProvider(token)!)\n      .filter((provider: Provider) => provider?.subType === INTERACTION);\n  }\n\n  getInteractionProvider(name: string): Provider | undefined {\n    return this.interactions.get(name);\n  }\n\n  getInteractionHandler(name: string) {\n    const interaction = this.getInteractionProvider(name);\n\n    if (interaction) {\n      return (ctx: PlatformContext) => {\n        // Add current endpoint metadata to ctx\n        ctx.endpoint = EndpointMetadata.get(interaction.useClass, \"$prompt\");\n\n        return interaction.store.get(\"$prompt\")(ctx);\n      };\n    }\n  }\n}\n"]}
+{"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";;;;AAAA,yCAAmH;AACnH,qCAA+B;AAC/B,iCAA6D;AAC7D,sDAAsF;AAKtF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAE3B,QAAQ,CAAkB;IAG1B,GAAG,CAAM;IAGT,YAAY,CAAe;IAEjB,YAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IAE1D,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,wBAAe,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,+BAAmB,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;gBAC9C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;aACzF;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,wBAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO,EAAE,CAAC;SACX;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,uBAAW,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;YACf,MAAM,QAAQ,GAAG,yBAAgB,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;SACH;IACH,CAAC;CACF,CAAA;AApDC;IADC,IAAA,WAAM,GAAE;sCACC,oBAAe;kDAAC;AAG1B;IADC,IAAA,iBAAQ,EAAC,KAAK,CAAC;;6CACP;AAGT;IADC,IAAA,iBAAQ,EAAC,MAAM,CAAC;;sDACU;AARhB,gBAAgB;IAD5B,IAAA,eAAU,GAAE;GACA,gBAAgB,CAsD5B;AAtDY,4CAAgB","sourcesContent":["import {Constant, EndpointMetadata, PlatformContext, PlatformHandler, Provider, TokenProvider} from \"@tsed/common\";\nimport {Env} from \"@tsed/core\";\nimport {Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {INTERACTION, INTERACTION_OPTIONS, INTERACTIONS} from \"../constants/constants\";\nimport {OidcInteractionOptions} from \"../domain/OidcInteractionOptions\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\n\n@Injectable()\nexport class OidcInteractions {\n  @Inject()\n  injector: InjectorService;\n\n  @Constant(\"env\")\n  env: Env;\n\n  @Constant(\"oidc\")\n  oidcSettings: OidcSettings;\n\n  protected interactions: Map<string, Provider> = new Map();\n\n  $onInit(): void {\n    const platformHandler = this.injector.get<PlatformHandler>(PlatformHandler)!;\n\n    this.getInteractions().forEach((provider: Provider) => {\n      const {name} = provider.store.get<OidcInteractionOptions>(INTERACTION_OPTIONS);\n      this.interactions.set(name, provider);\n\n      if (this.injector.get(provider.token)?.$prompt) {\n        provider.store.set(\"$prompt\", platformHandler.createCustomHandler(provider, \"$prompt\"));\n      }\n    });\n  }\n\n  getInteractions(): Provider[] {\n    const interactionsProvider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    /* istanbul ignore next */\n    if (!interactionsProvider) {\n      return [];\n    }\n\n    return interactionsProvider.children\n      .map((token: TokenProvider) => this.injector.getProvider(token)!)\n      .filter((provider: Provider) => provider?.subType === INTERACTION);\n  }\n\n  getInteractionProvider(name: string): Provider | undefined {\n    return this.interactions.get(name);\n  }\n\n  getInteractionHandler(name: string) {\n    const interaction = this.getInteractionProvider(name);\n\n    if (interaction) {\n      const endpoint = EndpointMetadata.get(interaction.useClass, \"$prompt\");\n      return (ctx: PlatformContext) => {\n        // Add current endpoint metadata to ctx\n        ctx.endpoint = endpoint;\n        return interaction.store.get(\"$prompt\")(ctx);\n      };\n    }\n  }\n}\n"]}

package/lib/cjs/services/OidcJwks.js

@@ -6,6 +6,9 @@ const di_1 = require("@tsed/di");
 const path_1 = require("path");
 const jwks_1 = require("@tsed/jwks");
 let OidcJwks = class OidcJwks {
+    jwksPath;
+    certificates;
+    keys;
     async $onInit() {
         return this.getJwks();
     }

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

@@ -1 +1 @@
-{"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";;;;AAAA,iCAA8C;AAC9C,+BAA0B;AAC1B,qCAAsD;AAGtD,IAAa,QAAQ,GAArB,MAAa,QAAQ;IASnB,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,IAAA,cAAO,EAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,aAAQ,EAAC,eAAe,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;;0CACnD;AAGjB;IADC,IAAA,aAAQ,EAAC,mBAAmB,CAAC;;8CACK;AALxB,QAAQ;IADpB,IAAA,eAAU,GAAE;GACA,QAAQ,CAmBpB;AAnBY,4BAAQ","sourcesContent":["import {Constant, Injectable} from \"@tsed/di\";\nimport {join} from \"path\";\nimport {getJwks, JwksKeyParameters} from \"@tsed/jwks\";\n\n@Injectable()\nexport class OidcJwks {\n  @Constant(\"oidc.jwksPath\", join(process.cwd(), \"keys\", \"jwks.json\"))\n  jwksPath: string;\n\n  @Constant(\"oidc.certificates\")\n  certificates?: JwksKeyParameters[];\n\n  keys: string;\n\n  async $onInit() {\n    return this.getJwks();\n  }\n\n  getJwks() {\n    return getJwks({\n      path: this.jwksPath,\n      certificates: this.certificates\n    });\n  }\n}\n"]}
+{"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";;;;AAAA,iCAA8C;AAC9C,+BAA0B;AAC1B,qCAAsD;AAGtD,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAEnB,QAAQ,CAAS;IAGjB,YAAY,CAAuB;IAEnC,IAAI,CAAS;IAEb,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,IAAA,cAAO,EAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,aAAQ,EAAC,eAAe,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;;0CACnD;AAGjB;IADC,IAAA,aAAQ,EAAC,mBAAmB,CAAC;;8CACK;AALxB,QAAQ;IADpB,IAAA,eAAU,GAAE;GACA,QAAQ,CAmBpB;AAnBY,4BAAQ","sourcesContent":["import {Constant, Injectable} from \"@tsed/di\";\nimport {join} from \"path\";\nimport {getJwks, JwksKeyParameters} from \"@tsed/jwks\";\n\n@Injectable()\nexport class OidcJwks {\n  @Constant(\"oidc.jwksPath\", join(process.cwd(), \"keys\", \"jwks.json\"))\n  jwksPath: string;\n\n  @Constant(\"oidc.certificates\")\n  certificates?: JwksKeyParameters[];\n\n  keys: string;\n\n  async $onInit() {\n    return this.getJwks();\n  }\n\n  getJwks() {\n    return getJwks({\n      path: this.jwksPath,\n      certificates: this.certificates\n    });\n  }\n}\n"]}

package/lib/cjs/services/OidcProvider.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OidcProvider = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@tsed/common");
 const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
 const oidc_provider_1 = require("oidc-provider");
@@ -9,14 +10,25 @@ const constants_1 = require("../constants/constants");
 const OidcAdapters_1 = require("./OidcAdapters");
 const OidcInteractions_1 = require("./OidcInteractions");
 const OidcJwks_1 = require("./OidcJwks");
-const common_1 = require("@tsed/common");
 let OidcProvider = class OidcProvider {
+    raw;
+    env;
+    httpPort;
+    httpsPort;
+    issuer;
+    oidc;
+    platformName;
+    oidcJwks;
+    oidcInteractions;
+    adapters;
+    injector;
+    app;
     hasConfiguration() {
         return !!this.oidc;
     }
     async getConfiguration() {
         const [jwks, adapter] = await Promise.all([this.oidcJwks.getJwks(), this.adapters.createAdapterClass()]);
-        const { issuer, jwksPath, secureKey, proxy, Accounts, ...options } = this.oidc;
+        const { issuer, jwksPath, secureKey, proxy, Accounts, secureCookies = this.env == core_1.Env.PROD, ...options } = this.oidc;
         const configuration = {
             interactions: {
                 /* istanbul ignore next */
@@ -27,9 +39,9 @@ let OidcProvider = class OidcProvider {
             jwks
         };
         if (Accounts) {
-            configuration.findAccount = (ctx, id, token) => this.injector.get(Accounts).findAccount(id, token, ctx.req.$ctx);
+            configuration.findAccount = (ctx, id, token) => this.injector.get(Accounts).findAccount(id, token);
         }
-        if (this.env === core_1.Env.PROD) {
+        if (secureCookies) {
             (0, core_1.setValue)(configuration, "cookies.short.secure", true);
             (0, core_1.setValue)(configuration, "cookies.long.secure", true);
         }
@@ -60,10 +72,10 @@ let OidcProvider = class OidcProvider {
      * Create a new instance of OidcProvider
      */
     async create() {
-        const { proxy, secureKey } = this.oidc;
+        const { proxy = this.env === core_1.Env.PROD, secureKey, allowHttpLocalhost = this.env !== core_1.Env.PROD } = this.oidc;
         const configuration = await this.getConfiguration();
         const oidcProvider = new oidc_provider_1.Provider(this.getIssuer(), configuration);
-        if (proxy || this.env === core_1.Env.PROD) {
+        if (proxy) {
             // istanbul ignore next
             switch (this.platformName) {
                 default:
@@ -79,7 +91,7 @@ let OidcProvider = class OidcProvider {
             oidcProvider.app.keys = secureKey;
         }
         this.raw = oidcProvider;
-        if (this.env !== core_1.Env.PROD) {
+        if (allowHttpLocalhost) {
             this.allowHttpLocalhost();
         }
         await this.injector.emit("$onCreateOIDC", this.raw);