@tsed/oidc-provider 6.123.0 → 6.125.0

package/coverage.json

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

package/jest.config.js

@@ -4,11 +4,6 @@
 module.exports = {
   ...require("@tsed/jest-config")(__dirname, "oidc-provider"),
   coverageThreshold: {
-    global: {
-      statements: 98.68,
-      branches: 90.14,
-      functions: 98.61,
-      lines: 99.66
-    }
+    global: require("./coverage.json")
   }
 };

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/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/middlewares/OidcInteractionMiddleware.js

@@ -3,39 +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 {
-    oidcInteractions;
-    injector;
-    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;IAE1B,gBAAgB,CAAmB;IAGnC,QAAQ,CAAkB;IAEpC,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,yCAA0E;AAU1E,+EAA0E;AAI1E,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 {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 oidcInteractionContext: OidcInteractionContext;\n\n  async use() {\n    await this.oidcInteractionContext.interactionDetails();\n  }\n}\n"]}

package/lib/cjs/services/OidcInteractionContext.js

@@ -6,6 +6,7 @@ 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");
@@ -14,8 +15,10 @@ let OidcInteractionContext = class OidcInteractionContext {
     env;
     oidcProvider;
     oidcInteractions;
-    context;
-    raw;
+    $ctx;
+    get raw() {
+        return this.$ctx.get(constants_1.INTERACTION_DETAILS);
+    }
     get session() {
         return this.raw.session;
     }
@@ -34,18 +37,26 @@ 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();
@@ -63,17 +74,14 @@ let OidcInteractionContext = class OidcInteractionContext {
         };
     }
     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) {
         const key = `$client:${clientId}`;
-        if (!this.context.has(key)) {
-            this.context.set(key, await this.oidcProvider.get().Client.find(clientId));
-        }
-        return this.context.get(key);
+        return this.$ctx.cacheAsync(key, () => this.oidcProvider.get().Client.find(clientId));
     }
     async findAccount(sub, token) {
         if (!sub && this.session) {
@@ -82,7 +90,10 @@ let OidcInteractionContext = class OidcInteractionContext {
         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() {
         const { Grant } = this.oidcProvider.get();
@@ -137,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 {Unauthorized} from \"@tsed/exceptions\";\nimport {Account, InteractionResults, PromptDetail, Provider} from \"oidc-provider\";\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()\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 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.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    const key = `$client:${clientId}`;\n    if (!this.context.has(key)) {\n      this.context.set(key, await this.oidcProvider.get().Client.find(clientId));\n    }\n\n    return this.context.get(key);\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  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"]}
+{"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\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/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,7 +10,6 @@ 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;
@@ -28,7 +28,7 @@ let OidcProvider = class OidcProvider {
     }
     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 */
@@ -39,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);
         }
@@ -72,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:
@@ -91,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);

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

@@ -1 +1 @@
-{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import {Env, setValue} from \"@tsed/core\";\nimport {Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {Provider as OIDCProvider, Configuration, interactionPolicy} from \"oidc-provider\";\nimport {INTERACTIONS} from \"../constants/constants\";\nimport {OidcAdapters} from \"./OidcAdapters\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcJwks} from \"./OidcJwks\";\nimport {PlatformApplication} from \"@tsed/common\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\nimport {OidcAccountsMethods} from \"../domain/OidcAccountsMethods\";\n\n@Injectable()\nexport class OidcProvider {\n  raw: OIDCProvider;\n\n  @Constant(\"env\")\n  protected env: Env;\n\n  @Constant(\"httpPort\")\n  protected httpPort: number | string;\n\n  @Constant(\"httpsPort\")\n  protected httpsPort: number | string;\n\n  @Constant(\"oidc.issuer\", \"\")\n  protected issuer: string;\n\n  @Constant(\"oidc\")\n  protected oidc: OidcSettings;\n\n  @Constant(\"PLATFORM_NAME\")\n  protected platformName: string;\n\n  @Inject()\n  protected oidcJwks: OidcJwks;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected adapters: OidcAdapters;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  hasConfiguration() {\n    return !!this.oidc;\n  }\n\n  async getConfiguration(): Promise<Configuration> {\n    const [jwks, adapter] = await Promise.all([this.oidcJwks.getJwks(), this.adapters.createAdapterClass()]);\n    const {issuer, jwksPath, secureKey, proxy, Accounts, ...options} = this.oidc;\n\n    const configuration: Configuration = {\n      interactions: {\n        /* istanbul ignore next */\n        url: (ctx, interaction) => `interaction/${interaction.uid}`\n      },\n      ...options,\n      adapter,\n      jwks\n    };\n\n    if (Accounts) {\n      configuration.findAccount = (ctx, id, token) =>\n        this.injector.get<OidcAccountsMethods>(Accounts)!.findAccount(id, token, (ctx.req as any).$ctx);\n    }\n\n    if (this.env === Env.PROD) {\n      setValue(configuration, \"cookies.short.secure\", true);\n      setValue(configuration, \"cookies.long.secure\", true);\n    }\n\n    const policy = this.getPolicy();\n    if (policy) {\n      setValue(configuration, \"interactions.policy\", policy);\n    }\n\n    const url = this.getInteractionsUrl();\n    if (url) {\n      setValue(configuration, \"interactions.url\", url);\n    }\n\n    return configuration;\n  }\n\n  getIssuer() {\n    if (this.issuer) {\n      return this.issuer;\n    }\n\n    // istanbul ignore next\n    if (this.httpsPort) {\n      return `https://localhost:${this.httpsPort}`;\n    }\n\n    return `http://localhost:${this.httpPort}`;\n  }\n\n  get(): OIDCProvider {\n    return this.raw;\n  }\n\n  /**\n   * Create a new instance of OidcProvider\n   */\n  async create(): Promise<void | OIDCProvider> {\n    const {proxy, secureKey} = this.oidc;\n    const configuration = await this.getConfiguration();\n    const oidcProvider = new OIDCProvider(this.getIssuer(), configuration);\n\n    if (proxy || this.env === Env.PROD) {\n      // istanbul ignore next\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          oidcProvider.proxy = true;\n          break;\n        case \"koa\":\n          (this.app.rawApp as any).proxy = true;\n          break;\n      }\n    }\n\n    if (secureKey) {\n      oidcProvider.app.keys = secureKey;\n    }\n\n    this.raw = oidcProvider;\n\n    if (this.env !== Env.PROD) {\n      this.allowHttpLocalhost();\n    }\n\n    await this.injector.emit(\"$onCreateOIDC\", this.raw);\n\n    return this.raw;\n  }\n\n  private getInteractionsUrl() {\n    const provider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    if (provider) {\n      return (ctx: any, interaction: any) => {\n        // eslint-disable-line no-unused-vars\n        return provider.path.replace(/:uid/, interaction.uid);\n      };\n    }\n  }\n\n  private allowHttpLocalhost() {\n    const {invalidate: orig} = (this.raw.Client as any).Schema.prototype;\n\n    (this.raw.Client as any).Schema.prototype.invalidate = function invalidate(message: string, code: string) {\n      if (code === \"implicit-force-https\" || code === \"implicit-forbid-localhost\") {\n        return;\n      }\n\n      /* istanbul ignore next */\n      return orig.call(this, message);\n    };\n  }\n\n  private getPolicy() {\n    const policy = interactionPolicy.base();\n    const interactions = this.oidcInteractions.getInteractions();\n\n    if (interactions.length) {\n      interactions.forEach((provider) => {\n        const {name, ...options} = provider.store.get(\"interactionOptions\");\n\n        if (!policy.get(name)) {\n          policy.add(\n            new interactionPolicy.Prompt({\n              name,\n              ...options\n            })\n          );\n        }\n\n        const instance = this.injector.get(provider.token);\n\n        if (instance.$onCreate) {\n          instance.$onCreate(policy.get(name));\n        }\n      });\n    }\n\n    return this.injector.alter(\"$alterOidcPolicy\", policy);\n  }\n}\n"]}
+{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import {PlatformApplication} from \"@tsed/common\";\nimport {Env, setValue} from \"@tsed/core\";\nimport {Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {Configuration, interactionPolicy, Provider as OIDCProvider} from \"oidc-provider\";\nimport {INTERACTIONS} from \"../constants/constants\";\nimport {OidcAccountsMethods} from \"../domain/OidcAccountsMethods\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\nimport {OidcAdapters} from \"./OidcAdapters\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcJwks} from \"./OidcJwks\";\n\n@Injectable()\nexport class OidcProvider {\n  raw: OIDCProvider;\n\n  @Constant(\"env\")\n  protected env: Env;\n\n  @Constant(\"httpPort\")\n  protected httpPort: number | string;\n\n  @Constant(\"httpsPort\")\n  protected httpsPort: number | string;\n\n  @Constant(\"oidc.issuer\", \"\")\n  protected issuer: string;\n\n  @Constant(\"oidc\")\n  protected oidc: OidcSettings;\n\n  @Constant(\"PLATFORM_NAME\")\n  protected platformName: string;\n\n  @Inject()\n  protected oidcJwks: OidcJwks;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected adapters: OidcAdapters;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  hasConfiguration() {\n    return !!this.oidc;\n  }\n\n  async getConfiguration(): Promise<Configuration> {\n    const [jwks, adapter] = await Promise.all([this.oidcJwks.getJwks(), this.adapters.createAdapterClass()]);\n    const {issuer, jwksPath, secureKey, proxy, Accounts, secureCookies = this.env == Env.PROD, ...options} = this.oidc;\n\n    const configuration: Configuration = {\n      interactions: {\n        /* istanbul ignore next */\n        url: (ctx, interaction) => `interaction/${interaction.uid}`\n      },\n      ...options,\n      adapter,\n      jwks\n    };\n\n    if (Accounts) {\n      configuration.findAccount = (ctx, id, token) => this.injector.get<OidcAccountsMethods>(Accounts)!.findAccount(id, token);\n    }\n\n    if (secureCookies) {\n      setValue(configuration, \"cookies.short.secure\", true);\n      setValue(configuration, \"cookies.long.secure\", true);\n    }\n\n    const policy = this.getPolicy();\n    if (policy) {\n      setValue(configuration, \"interactions.policy\", policy);\n    }\n\n    const url = this.getInteractionsUrl();\n    if (url) {\n      setValue(configuration, \"interactions.url\", url);\n    }\n\n    return configuration;\n  }\n\n  getIssuer() {\n    if (this.issuer) {\n      return this.issuer;\n    }\n\n    // istanbul ignore next\n    if (this.httpsPort) {\n      return `https://localhost:${this.httpsPort}`;\n    }\n\n    return `http://localhost:${this.httpPort}`;\n  }\n\n  get(): OIDCProvider {\n    return this.raw;\n  }\n\n  /**\n   * Create a new instance of OidcProvider\n   */\n  async create(): Promise<void | OIDCProvider> {\n    const {proxy = this.env === Env.PROD, secureKey, allowHttpLocalhost = this.env !== Env.PROD} = this.oidc;\n    const configuration = await this.getConfiguration();\n    const oidcProvider = new OIDCProvider(this.getIssuer(), configuration);\n\n    if (proxy) {\n      // istanbul ignore next\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          oidcProvider.proxy = true;\n          break;\n        case \"koa\":\n          (this.app.rawApp as any).proxy = true;\n          break;\n      }\n    }\n\n    if (secureKey) {\n      oidcProvider.app.keys = secureKey;\n    }\n\n    this.raw = oidcProvider;\n\n    if (allowHttpLocalhost) {\n      this.allowHttpLocalhost();\n    }\n\n    await this.injector.emit(\"$onCreateOIDC\", this.raw);\n\n    return this.raw;\n  }\n\n  private getInteractionsUrl() {\n    const provider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    if (provider) {\n      return (ctx: any, interaction: any) => {\n        // eslint-disable-line no-unused-vars\n        return provider.path.replace(/:uid/, interaction.uid);\n      };\n    }\n  }\n\n  private allowHttpLocalhost() {\n    const {invalidate: orig} = (this.raw.Client as any).Schema.prototype;\n\n    (this.raw.Client as any).Schema.prototype.invalidate = function invalidate(message: string, code: string) {\n      if (code === \"implicit-force-https\" || code === \"implicit-forbid-localhost\") {\n        return;\n      }\n\n      /* istanbul ignore next */\n      return orig.call(this, message);\n    };\n  }\n\n  private getPolicy() {\n    const policy = interactionPolicy.base();\n    const interactions = this.oidcInteractions.getInteractions();\n\n    if (interactions.length) {\n      interactions.forEach((provider) => {\n        const {name, ...options} = provider.store.get(\"interactionOptions\");\n\n        if (!policy.get(name)) {\n          policy.add(\n            new interactionPolicy.Prompt({\n              name,\n              ...options\n            })\n          );\n        }\n\n        const instance = this.injector.get(provider.token);\n\n        if (instance.$onCreate) {\n          instance.$onCreate(policy.get(name));\n        }\n      });\n    }\n\n    return this.injector.alter(\"$alterOidcPolicy\", policy);\n  }\n}\n"]}

package/lib/esm/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/esm/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/esm/middlewares/OidcInteractionMiddleware.js

@@ -1,38 +1,16 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { Context, Inject, InjectorService, Middleware } from "@tsed/common";
-import { INTERACTION_CONTEXT, INTERACTION_DETAILS, INTERACTION_PARAMS, INTERACTION_GRANT_ID, INTERACTION_PROMPT, INTERACTION_SESSION, INTERACTION_UID } from "../constants/constants.js";
+import { __decorate, __metadata } from "tslib";
+import { Inject, Middleware } from "@tsed/common";
 import { OidcInteractionContext } from "../services/OidcInteractionContext.js";
-import { OidcInteractions } from "../services/OidcInteractions.js";
 let OidcInteractionMiddleware = class OidcInteractionMiddleware {
-    oidcInteractions;
-    injector;
-    async use(context) {
-        const oidcInteraction = this.injector.invoke(OidcInteractionContext, context.container);
-        const interactionDetails = await oidcInteraction.interactionDetails();
-        const { uid, prompt, params, session, grantId } = interactionDetails;
-        context.set(INTERACTION_CONTEXT, oidcInteraction);
-        context.set(INTERACTION_DETAILS, interactionDetails);
-        context.set(INTERACTION_UID, uid);
-        context.set(INTERACTION_PROMPT, prompt);
-        context.set(INTERACTION_PARAMS, params);
-        context.set(INTERACTION_GRANT_ID, grantId);
-        context.set(INTERACTION_SESSION, session);
+    oidcInteractionContext;
+    async use() {
+        await this.oidcInteractionContext.interactionDetails();
     }
 };
 __decorate([
     Inject(),
-    __metadata("design:type", OidcInteractions)
-], OidcInteractionMiddleware.prototype, "oidcInteractions", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], OidcInteractionMiddleware.prototype, "injector", void 0);
-__decorate([
-    __param(0, Context()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], OidcInteractionMiddleware.prototype, "use", null);
+    __metadata("design:type", OidcInteractionContext)
+], OidcInteractionMiddleware.prototype, "oidcInteractionContext", void 0);
 OidcInteractionMiddleware = __decorate([
     Middleware()
 ], OidcInteractionMiddleware);

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

@@ -1 +1 @@
-{"version":3,"file":"OidcInteractionMiddleware.js","sourceRoot":"","sources":["../../../src/middlewares/OidcInteractionMiddleware.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,sBAAsB,EAAC,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAG9D,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAE1B,gBAAgB,CAAmB;IAGnC,QAAQ,CAAkB;IAEpC,KAAK,CAAC,GAAG,CAAY,OAAgB;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAyB,sBAAsB,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,mBAAmB,EAAE,eAAe,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;AAlBC;IADC,MAAM,EAAE;8BACmB,gBAAgB;mEAAC;AAG7C;IADC,MAAM,EAAE;8BACW,eAAe;2DAAC;AAEpC;IAAW,WAAA,OAAO,EAAE,CAAA;;;;oDAYnB;AAnBU,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CAoBrC;SApBY,yBAAyB","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,OAAO,EAAU,MAAM,EAAmB,UAAU,EAAC,MAAM,cAAc,CAAC;AAU1E,OAAO,EAAC,sBAAsB,EAAC,MAAM,oCAAoC,CAAC;AAI1E,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,MAAM,EAAE;8BACyB,sBAAsB;yEAAC;AAF9C,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CAOrC;SAPY,yBAAyB","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 oidcInteractionContext: OidcInteractionContext;\n\n  async use() {\n    await this.oidcInteractionContext.interactionDetails();\n  }\n}\n"]}

package/lib/esm/services/OidcInteractionContext.js

@@ -1,8 +1,9 @@
 import { __decorate, __metadata } from "tslib";
-import { Constant, PlatformContext, ProviderScope, Scope } from "@tsed/common";
+import { Constant, InjectContext, PlatformContext } from "@tsed/common";
 import { Env } from "@tsed/core";
 import { Inject, Injectable } from "@tsed/di";
 import { Unauthorized } from "@tsed/exceptions";
+import { INTERACTION_CONTEXT, INTERACTION_DETAILS, INTERACTION_GRANT_ID, INTERACTION_PARAMS, INTERACTION_PROMPT, INTERACTION_SESSION, INTERACTION_UID } from "../constants/constants.js";
 import { OidcBadInteractionName } from "../domain/OidcBadInteractionName.js";
 import { debug } from "../utils/debug.js";
 import { OidcInteractions } from "./OidcInteractions.js";
@@ -11,8 +12,10 @@ let OidcInteractionContext = class OidcInteractionContext {
     env;
     oidcProvider;
     oidcInteractions;
-    context;
-    raw;
+    $ctx;
+    get raw() {
+        return this.$ctx.get(INTERACTION_DETAILS);
+    }
     get session() {
         return this.raw.session;
     }
@@ -31,18 +34,26 @@ 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(INTERACTION_CONTEXT, this);
+        this.$ctx.set(INTERACTION_DETAILS, raw);
+        this.$ctx.set(INTERACTION_UID, uid);
+        this.$ctx.set(INTERACTION_PROMPT, prompt);
+        this.$ctx.set(INTERACTION_PARAMS, params);
+        this.$ctx.set(INTERACTION_GRANT_ID, grantId);
+        this.$ctx.set(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();
@@ -60,17 +71,14 @@ let OidcInteractionContext = class OidcInteractionContext {
         };
     }
     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) {
         const key = `$client:${clientId}`;
-        if (!this.context.has(key)) {
-            this.context.set(key, await this.oidcProvider.get().Client.find(clientId));
-        }
-        return this.context.get(key);
+        return this.$ctx.cacheAsync(key, () => this.oidcProvider.get().Client.find(clientId));
     }
     async findAccount(sub, token) {
         if (!sub && this.session) {
@@ -79,7 +87,10 @@ let OidcInteractionContext = class OidcInteractionContext {
         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() {
         const { Grant } = this.oidcProvider.get();
@@ -134,12 +145,11 @@ __decorate([
     __metadata("design:type", OidcInteractions)
 ], OidcInteractionContext.prototype, "oidcInteractions", void 0);
 __decorate([
-    Inject(),
+    InjectContext(),
     __metadata("design:type", PlatformContext)
-], OidcInteractionContext.prototype, "context", void 0);
+], OidcInteractionContext.prototype, "$ctx", void 0);
 OidcInteractionContext = __decorate([
-    Injectable(),
-    Scope(ProviderScope.REQUEST)
+    Injectable()
 ], OidcInteractionContext);
 export { OidcInteractionContext };
 //# sourceMappingURL=OidcInteractionContext.js.map

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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","sourcesContent":["import {Constant, PlatformContext, ProviderScope, Scope} 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 {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()\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 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.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    const key = `$client:${clientId}`;\n    if (!this.context.has(key)) {\n      this.context.set(key, await this.oidcProvider.get().Client.find(clientId));\n    }\n\n    return this.context.get(key);\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  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"]}
+{"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\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/esm/services/OidcProvider.js

@@ -1,12 +1,12 @@
 import { __decorate, __metadata } from "tslib";
+import { PlatformApplication } from "@tsed/common";
 import { Env, setValue } from "@tsed/core";
 import { Constant, Inject, Injectable, InjectorService } from "@tsed/di";
-import { Provider as OIDCProvider, interactionPolicy } from "oidc-provider";
+import { interactionPolicy, Provider as OIDCProvider } from "oidc-provider";
 import { INTERACTIONS } from "../constants/constants.js";
 import { OidcAdapters } from "./OidcAdapters.js";
 import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcJwks } from "./OidcJwks.js";
-import { PlatformApplication } from "@tsed/common";
 let OidcProvider = class OidcProvider {
     raw;
     env;
@@ -25,7 +25,7 @@ let OidcProvider = class OidcProvider {
     }
     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 == Env.PROD, ...options } = this.oidc;
         const configuration = {
             interactions: {
                 /* istanbul ignore next */
@@ -36,9 +36,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 === Env.PROD) {
+        if (secureCookies) {
             setValue(configuration, "cookies.short.secure", true);
             setValue(configuration, "cookies.long.secure", true);
         }
@@ -69,10 +69,10 @@ let OidcProvider = class OidcProvider {
      * Create a new instance of OidcProvider
      */
     async create() {
-        const { proxy, secureKey } = this.oidc;
+        const { proxy = this.env === Env.PROD, secureKey, allowHttpLocalhost = this.env !== Env.PROD } = this.oidc;
         const configuration = await this.getConfiguration();
         const oidcProvider = new OIDCProvider(this.getIssuer(), configuration);
-        if (proxy || this.env === Env.PROD) {
+        if (proxy) {
             // istanbul ignore next
             switch (this.platformName) {
                 default:
@@ -88,7 +88,7 @@ let OidcProvider = class OidcProvider {
             oidcProvider.app.keys = secureKey;
         }
         this.raw = oidcProvider;
-        if (this.env !== Env.PROD) {
+        if (allowHttpLocalhost) {
             this.allowHttpLocalhost();
         }
         await this.injector.emit("$onCreateOIDC", this.raw);

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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","sourcesContent":["import {Env, setValue} from \"@tsed/core\";\nimport {Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {Provider as OIDCProvider, Configuration, interactionPolicy} from \"oidc-provider\";\nimport {INTERACTIONS} from \"../constants/constants\";\nimport {OidcAdapters} from \"./OidcAdapters\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcJwks} from \"./OidcJwks\";\nimport {PlatformApplication} from \"@tsed/common\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\nimport {OidcAccountsMethods} from \"../domain/OidcAccountsMethods\";\n\n@Injectable()\nexport class OidcProvider {\n  raw: OIDCProvider;\n\n  @Constant(\"env\")\n  protected env: Env;\n\n  @Constant(\"httpPort\")\n  protected httpPort: number | string;\n\n  @Constant(\"httpsPort\")\n  protected httpsPort: number | string;\n\n  @Constant(\"oidc.issuer\", \"\")\n  protected issuer: string;\n\n  @Constant(\"oidc\")\n  protected oidc: OidcSettings;\n\n  @Constant(\"PLATFORM_NAME\")\n  protected platformName: string;\n\n  @Inject()\n  protected oidcJwks: OidcJwks;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected adapters: OidcAdapters;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  hasConfiguration() {\n    return !!this.oidc;\n  }\n\n  async getConfiguration(): Promise<Configuration> {\n    const [jwks, adapter] = await Promise.all([this.oidcJwks.getJwks(), this.adapters.createAdapterClass()]);\n    const {issuer, jwksPath, secureKey, proxy, Accounts, ...options} = this.oidc;\n\n    const configuration: Configuration = {\n      interactions: {\n        /* istanbul ignore next */\n        url: (ctx, interaction) => `interaction/${interaction.uid}`\n      },\n      ...options,\n      adapter,\n      jwks\n    };\n\n    if (Accounts) {\n      configuration.findAccount = (ctx, id, token) =>\n        this.injector.get<OidcAccountsMethods>(Accounts)!.findAccount(id, token, (ctx.req as any).$ctx);\n    }\n\n    if (this.env === Env.PROD) {\n      setValue(configuration, \"cookies.short.secure\", true);\n      setValue(configuration, \"cookies.long.secure\", true);\n    }\n\n    const policy = this.getPolicy();\n    if (policy) {\n      setValue(configuration, \"interactions.policy\", policy);\n    }\n\n    const url = this.getInteractionsUrl();\n    if (url) {\n      setValue(configuration, \"interactions.url\", url);\n    }\n\n    return configuration;\n  }\n\n  getIssuer() {\n    if (this.issuer) {\n      return this.issuer;\n    }\n\n    // istanbul ignore next\n    if (this.httpsPort) {\n      return `https://localhost:${this.httpsPort}`;\n    }\n\n    return `http://localhost:${this.httpPort}`;\n  }\n\n  get(): OIDCProvider {\n    return this.raw;\n  }\n\n  /**\n   * Create a new instance of OidcProvider\n   */\n  async create(): Promise<void | OIDCProvider> {\n    const {proxy, secureKey} = this.oidc;\n    const configuration = await this.getConfiguration();\n    const oidcProvider = new OIDCProvider(this.getIssuer(), configuration);\n\n    if (proxy || this.env === Env.PROD) {\n      // istanbul ignore next\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          oidcProvider.proxy = true;\n          break;\n        case \"koa\":\n          (this.app.rawApp as any).proxy = true;\n          break;\n      }\n    }\n\n    if (secureKey) {\n      oidcProvider.app.keys = secureKey;\n    }\n\n    this.raw = oidcProvider;\n\n    if (this.env !== Env.PROD) {\n      this.allowHttpLocalhost();\n    }\n\n    await this.injector.emit(\"$onCreateOIDC\", this.raw);\n\n    return this.raw;\n  }\n\n  private getInteractionsUrl() {\n    const provider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    if (provider) {\n      return (ctx: any, interaction: any) => {\n        // eslint-disable-line no-unused-vars\n        return provider.path.replace(/:uid/, interaction.uid);\n      };\n    }\n  }\n\n  private allowHttpLocalhost() {\n    const {invalidate: orig} = (this.raw.Client as any).Schema.prototype;\n\n    (this.raw.Client as any).Schema.prototype.invalidate = function invalidate(message: string, code: string) {\n      if (code === \"implicit-force-https\" || code === \"implicit-forbid-localhost\") {\n        return;\n      }\n\n      /* istanbul ignore next */\n      return orig.call(this, message);\n    };\n  }\n\n  private getPolicy() {\n    const policy = interactionPolicy.base();\n    const interactions = this.oidcInteractions.getInteractions();\n\n    if (interactions.length) {\n      interactions.forEach((provider) => {\n        const {name, ...options} = provider.store.get(\"interactionOptions\");\n\n        if (!policy.get(name)) {\n          policy.add(\n            new interactionPolicy.Prompt({\n              name,\n              ...options\n            })\n          );\n        }\n\n        const instance = this.injector.get(provider.token);\n\n        if (instance.$onCreate) {\n          instance.$onCreate(policy.get(name));\n        }\n      });\n    }\n\n    return this.injector.alter(\"$alterOidcPolicy\", policy);\n  }\n}\n"]}
+{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import {PlatformApplication} from \"@tsed/common\";\nimport {Env, setValue} from \"@tsed/core\";\nimport {Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {Configuration, interactionPolicy, Provider as OIDCProvider} from \"oidc-provider\";\nimport {INTERACTIONS} from \"../constants/constants\";\nimport {OidcAccountsMethods} from \"../domain/OidcAccountsMethods\";\nimport {OidcSettings} from \"../domain/OidcSettings\";\nimport {OidcAdapters} from \"./OidcAdapters\";\nimport {OidcInteractions} from \"./OidcInteractions\";\nimport {OidcJwks} from \"./OidcJwks\";\n\n@Injectable()\nexport class OidcProvider {\n  raw: OIDCProvider;\n\n  @Constant(\"env\")\n  protected env: Env;\n\n  @Constant(\"httpPort\")\n  protected httpPort: number | string;\n\n  @Constant(\"httpsPort\")\n  protected httpsPort: number | string;\n\n  @Constant(\"oidc.issuer\", \"\")\n  protected issuer: string;\n\n  @Constant(\"oidc\")\n  protected oidc: OidcSettings;\n\n  @Constant(\"PLATFORM_NAME\")\n  protected platformName: string;\n\n  @Inject()\n  protected oidcJwks: OidcJwks;\n\n  @Inject()\n  protected oidcInteractions: OidcInteractions;\n\n  @Inject()\n  protected adapters: OidcAdapters;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  hasConfiguration() {\n    return !!this.oidc;\n  }\n\n  async getConfiguration(): Promise<Configuration> {\n    const [jwks, adapter] = await Promise.all([this.oidcJwks.getJwks(), this.adapters.createAdapterClass()]);\n    const {issuer, jwksPath, secureKey, proxy, Accounts, secureCookies = this.env == Env.PROD, ...options} = this.oidc;\n\n    const configuration: Configuration = {\n      interactions: {\n        /* istanbul ignore next */\n        url: (ctx, interaction) => `interaction/${interaction.uid}`\n      },\n      ...options,\n      adapter,\n      jwks\n    };\n\n    if (Accounts) {\n      configuration.findAccount = (ctx, id, token) => this.injector.get<OidcAccountsMethods>(Accounts)!.findAccount(id, token);\n    }\n\n    if (secureCookies) {\n      setValue(configuration, \"cookies.short.secure\", true);\n      setValue(configuration, \"cookies.long.secure\", true);\n    }\n\n    const policy = this.getPolicy();\n    if (policy) {\n      setValue(configuration, \"interactions.policy\", policy);\n    }\n\n    const url = this.getInteractionsUrl();\n    if (url) {\n      setValue(configuration, \"interactions.url\", url);\n    }\n\n    return configuration;\n  }\n\n  getIssuer() {\n    if (this.issuer) {\n      return this.issuer;\n    }\n\n    // istanbul ignore next\n    if (this.httpsPort) {\n      return `https://localhost:${this.httpsPort}`;\n    }\n\n    return `http://localhost:${this.httpPort}`;\n  }\n\n  get(): OIDCProvider {\n    return this.raw;\n  }\n\n  /**\n   * Create a new instance of OidcProvider\n   */\n  async create(): Promise<void | OIDCProvider> {\n    const {proxy = this.env === Env.PROD, secureKey, allowHttpLocalhost = this.env !== Env.PROD} = this.oidc;\n    const configuration = await this.getConfiguration();\n    const oidcProvider = new OIDCProvider(this.getIssuer(), configuration);\n\n    if (proxy) {\n      // istanbul ignore next\n      switch (this.platformName) {\n        default:\n        case \"express\":\n          oidcProvider.proxy = true;\n          break;\n        case \"koa\":\n          (this.app.rawApp as any).proxy = true;\n          break;\n      }\n    }\n\n    if (secureKey) {\n      oidcProvider.app.keys = secureKey;\n    }\n\n    this.raw = oidcProvider;\n\n    if (allowHttpLocalhost) {\n      this.allowHttpLocalhost();\n    }\n\n    await this.injector.emit(\"$onCreateOIDC\", this.raw);\n\n    return this.raw;\n  }\n\n  private getInteractionsUrl() {\n    const provider = this.injector.getProviders().find((provider) => provider.subType === INTERACTIONS);\n\n    if (provider) {\n      return (ctx: any, interaction: any) => {\n        // eslint-disable-line no-unused-vars\n        return provider.path.replace(/:uid/, interaction.uid);\n      };\n    }\n  }\n\n  private allowHttpLocalhost() {\n    const {invalidate: orig} = (this.raw.Client as any).Schema.prototype;\n\n    (this.raw.Client as any).Schema.prototype.invalidate = function invalidate(message: string, code: string) {\n      if (code === \"implicit-force-https\" || code === \"implicit-forbid-localhost\") {\n        return;\n      }\n\n      /* istanbul ignore next */\n      return orig.call(this, message);\n    };\n  }\n\n  private getPolicy() {\n    const policy = interactionPolicy.base();\n    const interactions = this.oidcInteractions.getInteractions();\n\n    if (interactions.length) {\n      interactions.forEach((provider) => {\n        const {name, ...options} = provider.store.get(\"interactionOptions\");\n\n        if (!policy.get(name)) {\n          policy.add(\n            new interactionPolicy.Prompt({\n              name,\n              ...options\n            })\n          );\n        }\n\n        const instance = this.injector.get(provider.token);\n\n        if (instance.$onCreate) {\n          instance.$onCreate(policy.get(name));\n        }\n      });\n    }\n\n    return this.injector.alter(\"$alterOidcPolicy\", policy);\n  }\n}\n"]}

package/lib/types/domain/OidcAccountsMethods.d.ts

@@ -1,9 +1,8 @@
-import { PlatformContext } from "@tsed/common";
 import { Provider, Account } from "oidc-provider";
 export declare type AuthorizationCode = InstanceType<Provider["AuthorizationCode"]>;
 export declare type AccessToken = InstanceType<Provider["AccessToken"]>;
 export declare type DeviceCode = InstanceType<Provider["DeviceCode"]>;
 export declare type BackchannelAuthenticationRequest = InstanceType<Provider["BackchannelAuthenticationRequest"]>;
 export interface OidcAccountsMethods {
-    findAccount(id: string, token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined, ctx: PlatformContext): Promise<Account | undefined>;
+    findAccount(id: string, token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined): Promise<Account | undefined>;
 }

package/lib/types/domain/OidcSettings.d.ts

@@ -3,12 +3,16 @@ import { JwksKeyParameters } from "@tsed/jwks";
 import { Configuration } from "oidc-provider";
 import { OidcAccountsMethods } from "./OidcAccountsMethods";
 export interface OidcSettings extends Configuration {
+    /**
+     * force the secure cookie. By default, in dev mode it's disabled and in production it's enabled.
+     */
+    secureCookies?: boolean;
     /**
      * Path on which the oidc-provider instance is mounted.
      */
     path?: string;
     /**
-     * Issuer URI. By default Ts.ED create issuer with http://localhost:${httpPort}
+     * Issuer URI. By default, Ts.ED create issuer with http://localhost:${httpPort}
      */
     issuer?: string;
     /**
@@ -27,6 +31,10 @@ export interface OidcSettings extends Configuration {
      * Enable proxy.
      */
     proxy?: boolean;
+    /**
+     * Allow redirect_uri on HTTP protocol and localhost domain.
+     */
+    allowHttpLocalhost?: boolean;
     /**
      * Injectable service to manage accounts.
      */

package/lib/types/middlewares/OidcInteractionMiddleware.d.ts

@@ -1,7 +1,5 @@
-import { Context, InjectorService } from "@tsed/common";
-import { OidcInteractions } from "../services/OidcInteractions";
+import { OidcInteractionContext } from "../services/OidcInteractionContext";
 export declare class OidcInteractionMiddleware {
-    protected oidcInteractions: OidcInteractions;
-    protected injector: InjectorService;
-    use(context: Context): Promise<void>;
+    protected oidcInteractionContext: OidcInteractionContext;
+    use(): Promise<void>;
 }

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

@@ -11,8 +11,8 @@ export declare class OidcInteractionContext {
     env: Env;
     protected oidcProvider: OidcProvider;
     protected oidcInteractions: OidcInteractions;
-    protected context: PlatformContext;
-    protected raw: OidcInteraction;
+    protected $ctx: PlatformContext;
+    get raw(): OidcInteraction;
     get session(): OidcSession | undefined;
     get prompt(): PromptDetail;
     get params(): Record<string, any>;

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

@@ -1,11 +1,11 @@
+import { PlatformApplication } from "@tsed/common";
 import { Env } from "@tsed/core";
 import { InjectorService } from "@tsed/di";
-import { Provider as OIDCProvider, Configuration } from "oidc-provider";
+import { Configuration, Provider as OIDCProvider } from "oidc-provider";
+import { OidcSettings } from "../domain/OidcSettings";
 import { OidcAdapters } from "./OidcAdapters";
 import { OidcInteractions } from "./OidcInteractions";
 import { OidcJwks } from "./OidcJwks";
-import { PlatformApplication } from "@tsed/common";
-import { OidcSettings } from "../domain/OidcSettings";
 export declare class OidcProvider {
     raw: OIDCProvider;
     protected env: Env;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/oidc-provider",
-  "version": "6.123.0",
+  "version": "6.125.0",
   "description": "OIDC provider package for Ts.ED framework",
   "private": false,
   "source": "./src/index.ts",
@@ -22,7 +22,7 @@
     "test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
   },
   "dependencies": {
-    "@tsed/adapters": "6.123.0",
+    "@tsed/adapters": "6.125.0",
     "express-urlrewrite": "^1.4.0",
     "jose2": "npm:jose@^2.0.4",
     "koa-mount": "^4.0.0",
@@ -32,17 +32,17 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@tsed/common": "6.123.0",
-    "@tsed/core": "6.123.0",
-    "@tsed/di": "6.123.0",
-    "@tsed/exceptions": "6.123.0",
+    "@tsed/common": "6.125.0",
+    "@tsed/core": "6.125.0",
+    "@tsed/di": "6.125.0",
+    "@tsed/exceptions": "6.125.0",
     "@types/lowdb": "1.0.11",
     "@types/oidc-provider": "^7.1.1",
     "@types/uuid": "8.3.4",
     "oidc-provider": "7.11.1"
   },
   "peerDependencies": {
-    "@tsed/common": "^6.123.0",
+    "@tsed/common": "^6.125.0",
     "oidc-provider": ">=7.3.0"
   },
   "peerDependenciesMeta": {

package/readme.md

@@ -62,6 +62,7 @@ import {MemoryAdapter} from "../adapters/MemoryAdapter";
     jwksPath: `./../keys/jwks.json`, // don't forget add this path to .gitignore
     Adapter: MemoryAdapter,
     Accounts: Accounts,
+    allowHttpLocalhost: false, // by default. true in dev mode and false in production
     // Clients: Clients,
     clients: [
       {