@tsed/oidc-provider 7.14.2 → 7.15.1

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 json_mapper_1 = require("@tsed/json-mapper");
 const constants_1 = require("../constants/constants");
 const OidcBadInteractionName_1 = require("../domain/OidcBadInteractionName");
 const debug_1 = require("../utils/debug");
@@ -64,10 +65,12 @@ let OidcInteractionContext = class OidcInteractionContext {
     async interactionResult(result, options = { mergeWithLastSubmission: false }) {
         return this.oidcProvider.get().interactionResult(this.$ctx.getReq(), this.$ctx.getRes(), result, options);
     }
-    async interactionPrompt(options) {
-        const client = await this.findClient();
+    async interactionPrompt({ client, ...options }) {
+        client = client || (await this.findClient());
+        // remove client secret from
+        delete client.clientSecret;
         return {
-            client,
+            client: (0, json_mapper_1.serialize)(client, { useAlias: false, groups: ["render"] }),
             uid: this.uid,
             grantId: this.grantId,
             details: this.prompt.details,

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, 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) {\n    name = name || this.prompt.name;\n\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      this.raw.prompt = {\n        ...this.raw.prompt,\n        name,\n        reasons: [name]\n      };\n\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 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 {serialize} from \"@tsed/json-mapper\";\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) {\n    name = name || this.prompt.name;\n\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      this.raw.prompt = {\n        ...this.raw.prompt,\n        name,\n        reasons: [name]\n      };\n\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({client, ...options}: Record<string, any>): Promise<OidcInteractionPromptProps> {\n    client = client || (await this.findClient());\n\n    // remove client secret from\n    delete client.clientSecret;\n\n    return {\n      client: serialize(client, {useAlias: false, groups: [\"render\"]}),\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 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/OidcInteractionContext.js

@@ -3,6 +3,7 @@ import { Constant, InjectContext, PlatformContext } from "@tsed/common";
 import { Env } from "@tsed/core";
 import { Inject, Injectable } from "@tsed/di";
 import { Unauthorized } from "@tsed/exceptions";
+import { serialize } from "@tsed/json-mapper";
 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";
@@ -61,10 +62,12 @@ let OidcInteractionContext = class OidcInteractionContext {
     async interactionResult(result, options = { mergeWithLastSubmission: false }) {
         return this.oidcProvider.get().interactionResult(this.$ctx.getReq(), this.$ctx.getRes(), result, options);
     }
-    async interactionPrompt(options) {
-        const client = await this.findClient();
+    async interactionPrompt({ client, ...options }) {
+        client = client || (await this.findClient());
+        // remove client secret from
+        delete client.clientSecret;
         return {
-            client,
+            client: serialize(client, { useAlias: false, groups: ["render"] }),
             uid: this.uid,
             grantId: this.grantId,
             details: this.prompt.details,

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, 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) {\n    name = name || this.prompt.name;\n\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      this.raw.prompt = {\n        ...this.raw.prompt,\n        name,\n        reasons: [name]\n      };\n\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 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 {serialize} from \"@tsed/json-mapper\";\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) {\n    name = name || this.prompt.name;\n\n    const handler = this.oidcInteractions.getInteractionHandler(name);\n\n    if (handler) {\n      this.raw.prompt = {\n        ...this.raw.prompt,\n        name,\n        reasons: [name]\n      };\n\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({client, ...options}: Record<string, any>): Promise<OidcInteractionPromptProps> {\n    client = client || (await this.findClient());\n\n    // remove client secret from\n    delete client.clientSecret;\n\n    return {\n      client: serialize(client, {useAlias: false, groups: [\"render\"]}),\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 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/types/services/OidcInteractionContext.d.ts

@@ -26,7 +26,7 @@ export declare class OidcInteractionContext {
     interactionResult(result: InteractionResults, options?: {
         mergeWithLastSubmission?: boolean;
     }): Promise<string>;
-    interactionPrompt(options: Record<string, any>): Promise<OidcInteractionPromptProps>;
+    interactionPrompt({ client, ...options }: Record<string, any>): Promise<OidcInteractionPromptProps>;
     render(view: string, result: any): Promise<string>;
     save(ttl: number): Promise<string>;
     findClient(clientId?: string): Promise<OidcClient | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/oidc-provider",
-  "version": "7.14.2",
+  "version": "7.15.1",
   "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": "7.14.2",
+    "@tsed/adapters": "7.15.1",
     "express-urlrewrite": "^1.4.0",
     "jose2": "npm:jose@^2.0.4",
     "koa-mount": "^4.0.0",
@@ -31,10 +31,10 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@tsed/common": "7.14.2",
-    "@tsed/core": "7.14.2",
-    "@tsed/di": "7.14.2",
-    "@tsed/exceptions": "7.14.2",
+    "@tsed/common": "7.15.1",
+    "@tsed/core": "7.15.1",
+    "@tsed/di": "7.15.1",
+    "@tsed/exceptions": "7.15.1",
     "@types/lowdb": "1.0.11",
     "@types/oidc-provider": "^7.1.1",
     "@types/uuid": "8.3.4",
@@ -42,12 +42,12 @@
     "oidc-provider": "7.11.1"
   },
   "peerDependencies": {
-    "@tsed/ajv": "^7.14.2",
-    "@tsed/common": "^7.14.2",
-    "@tsed/core": "^7.14.2",
-    "@tsed/di": "^7.14.2",
-    "@tsed/json-mapper": "^7.14.2",
-    "@tsed/schema": "^7.14.2",
+    "@tsed/ajv": "^7.15.1",
+    "@tsed/common": "^7.15.1",
+    "@tsed/core": "^7.15.1",
+    "@tsed/di": "^7.15.1",
+    "@tsed/json-mapper": "^7.15.1",
+    "@tsed/schema": "^7.15.1",
     "oidc-provider": ">=7.3.0"
   },
   "peerDependenciesMeta": {