@tsed/cli-plugin-oidc-provider 3.23.0 → 3.24.0

package/lib/cjs/hooks/OidcProviderInitHook.js

@@ -17,18 +17,22 @@ let OidcProviderInitHook = class OidcProviderInitHook {
                 task: async () => this.rootRenderer.renderAll([
                     "/src/config/oidc/index.ts.hbs",
                     "/src/controllers/oidc/InteractionsController.ts",
+                    ctx.jest && "/src/controllers/oidc/InteractionsController.spec.ts",
                     "/src/interactions/ConsentInteraction.ts",
+                    ctx.jest && "/src/interactions/ConsentInteraction.spec.ts",
                     "/src/interactions/CustomInteraction.ts",
                     "/src/interactions/LoginInteraction.ts",
+                    ctx.jest && "/src/interactions/LoginInteraction.spec.ts",
+                    ctx.jest && "/src/interactions/__mock__/oidcContext.fixture.ts",
                     "/src/models/Account.ts",
                     "/src/services/Accounts.ts",
-                    "/views/forms/interaction-form.ejs",
+                    "/views/forms/consent-form.ejs",
                     "/views/forms/login-form.ejs",
                     "/views/forms/select-account-form.ejs",
                     "/views/partials/footer.ejs",
                     "/views/partials/header.ejs",
                     "/views/partials/login-help.ejs",
-                    "/views/interaction.ejs",
+                    "/views/consent.ejs",
                     "/views/login.ejs",
                     "/views/repost.ejs",
                     "/views/select_account.ejs"

package/lib/cjs/hooks/OidcProviderInitHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcProviderInitHook.js","sourceRoot":"","sources":["../../../src/hooks/OidcProviderInitHook.ts"],"names":[],"mappings":";;;;AACA,6CAAiI;AACjI,iCAAoC;AACpC,sDAAkD;AAGlD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAErB,WAAW,CAAqB;IAGhC,YAAY,CAAsB;IAGlC,WAAW,CAAqB;IAGhC,oBAAoB,CAAuB;IAGrD,MAAM,CAAC,GAAmB;QACxB,OAAO;YACL;gBACE,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB;oBACE,+BAA+B;oBAC/B,iDAAiD;oBACjD,yCAAyC;oBACzC,wCAAwC;oBACxC,uCAAuC;oBACvC,wBAAwB;oBACxB,2BAA2B;oBAC3B,mCAAmC;oBACnC,6BAA6B;oBAC7B,sCAAsC;oBACtC,4BAA4B;oBAC5B,4BAA4B;oBAC5B,gCAAgC;oBAChC,wBAAwB;oBACxB,kBAAkB;oBAClB,mBAAmB;oBACnB,2BAA2B;iBAC5B,EACD,GAAG,EACH;oBACE,WAAW,EAAE,GAAG,0BAAY,OAAO;iBACpC,CACF;aACJ;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA7CC;IADC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAG1C;IADC,IAAA,iBAAM,GAAE;sCACe,8BAAmB;0DAAC;AAG5C;IADC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAG1C;IADC,IAAA,iBAAM,GAAE;sCACuB,+BAAoB;kEAAC;AAGrD;IADC,IAAA,iBAAM,EAAC,MAAM,CAAC;;;;kDAiCd;AA9CU,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CA+ChC;AA/CY,oDAAoB","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\n@Injectable()\nexport class OidcProviderInitHook {\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    return [\n      {\n        title: \"Generate files\",\n        task: async () =>\n          this.rootRenderer.renderAll(\n            [\n              \"/src/config/oidc/index.ts.hbs\",\n              \"/src/controllers/oidc/InteractionsController.ts\",\n              \"/src/interactions/ConsentInteraction.ts\",\n              \"/src/interactions/CustomInteraction.ts\",\n              \"/src/interactions/LoginInteraction.ts\",\n              \"/src/models/Account.ts\",\n              \"/src/services/Accounts.ts\",\n              \"/views/forms/interaction-form.ejs\",\n              \"/views/forms/login-form.ejs\",\n              \"/views/forms/select-account-form.ejs\",\n              \"/views/partials/footer.ejs\",\n              \"/views/partials/header.ejs\",\n              \"/views/partials/login-help.ejs\",\n              \"/views/interaction.ejs\",\n              \"/views/login.ejs\",\n              \"/views/repost.ejs\",\n              \"/views/select_account.ejs\"\n            ],\n            ctx,\n            {\n              templateDir: `${TEMPLATE_DIR}/init`\n            }\n          )\n      }\n    ];\n  }\n}\n"]}
+{"version":3,"file":"OidcProviderInitHook.js","sourceRoot":"","sources":["../../../src/hooks/OidcProviderInitHook.ts"],"names":[],"mappings":";;;;AACA,6CAAiI;AACjI,iCAAoC;AACpC,sDAAkD;AAGlD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAErB,WAAW,CAAqB;IAGhC,YAAY,CAAsB;IAGlC,WAAW,CAAqB;IAGhC,oBAAoB,CAAuB;IAGrD,MAAM,CAAC,GAAmB;QACxB,OAAO;YACL;gBACE,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB;oBACE,+BAA+B;oBAC/B,iDAAiD;oBACjD,GAAG,CAAC,IAAI,IAAI,sDAAsD;oBAClE,yCAAyC;oBACzC,GAAG,CAAC,IAAI,IAAI,8CAA8C;oBAC1D,wCAAwC;oBACxC,uCAAuC;oBACvC,GAAG,CAAC,IAAI,IAAI,4CAA4C;oBACxD,GAAG,CAAC,IAAI,IAAI,mDAAmD;oBAC/D,wBAAwB;oBACxB,2BAA2B;oBAC3B,+BAA+B;oBAC/B,6BAA6B;oBAC7B,sCAAsC;oBACtC,4BAA4B;oBAC5B,4BAA4B;oBAC5B,gCAAgC;oBAChC,oBAAoB;oBACpB,kBAAkB;oBAClB,mBAAmB;oBACnB,2BAA2B;iBAC5B,EACD,GAAG,EACH;oBACE,WAAW,EAAE,GAAG,0BAAY,OAAO;iBACpC,CACF;aACJ;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAjDC;IADC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAG1C;IADC,IAAA,iBAAM,GAAE;sCACe,8BAAmB;0DAAC;AAG5C;IADC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAG1C;IADC,IAAA,iBAAM,GAAE;sCACuB,+BAAoB;kEAAC;AAGrD;IADC,IAAA,iBAAM,EAAC,MAAM,CAAC;;;;kDAqCd;AAlDU,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAmDhC;AAnDY,oDAAoB","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\n@Injectable()\nexport class OidcProviderInitHook {\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    return [\n      {\n        title: \"Generate files\",\n        task: async () =>\n          this.rootRenderer.renderAll(\n            [\n              \"/src/config/oidc/index.ts.hbs\",\n              \"/src/controllers/oidc/InteractionsController.ts\",\n              ctx.jest && \"/src/controllers/oidc/InteractionsController.spec.ts\",\n              \"/src/interactions/ConsentInteraction.ts\",\n              ctx.jest && \"/src/interactions/ConsentInteraction.spec.ts\",\n              \"/src/interactions/CustomInteraction.ts\",\n              \"/src/interactions/LoginInteraction.ts\",\n              ctx.jest && \"/src/interactions/LoginInteraction.spec.ts\",\n              ctx.jest && \"/src/interactions/__mock__/oidcContext.fixture.ts\",\n              \"/src/models/Account.ts\",\n              \"/src/services/Accounts.ts\",\n              \"/views/forms/consent-form.ejs\",\n              \"/views/forms/login-form.ejs\",\n              \"/views/forms/select-account-form.ejs\",\n              \"/views/partials/footer.ejs\",\n              \"/views/partials/header.ejs\",\n              \"/views/partials/login-help.ejs\",\n              \"/views/consent.ejs\",\n              \"/views/login.ejs\",\n              \"/views/repost.ejs\",\n              \"/views/select_account.ejs\"\n            ],\n            ctx,\n            {\n              templateDir: `${TEMPLATE_DIR}/init`\n            }\n          )\n      }\n    ];\n  }\n}\n"]}

package/lib/esm/hooks/OidcProviderInitHook.js

@@ -14,18 +14,22 @@ let OidcProviderInitHook = class OidcProviderInitHook {
                 task: async () => this.rootRenderer.renderAll([
                     "/src/config/oidc/index.ts.hbs",
                     "/src/controllers/oidc/InteractionsController.ts",
+                    ctx.jest && "/src/controllers/oidc/InteractionsController.spec.ts",
                     "/src/interactions/ConsentInteraction.ts",
+                    ctx.jest && "/src/interactions/ConsentInteraction.spec.ts",
                     "/src/interactions/CustomInteraction.ts",
                     "/src/interactions/LoginInteraction.ts",
+                    ctx.jest && "/src/interactions/LoginInteraction.spec.ts",
+                    ctx.jest && "/src/interactions/__mock__/oidcContext.fixture.ts",
                     "/src/models/Account.ts",
                     "/src/services/Accounts.ts",
-                    "/views/forms/interaction-form.ejs",
+                    "/views/forms/consent-form.ejs",
                     "/views/forms/login-form.ejs",
                     "/views/forms/select-account-form.ejs",
                     "/views/partials/footer.ejs",
                     "/views/partials/header.ejs",
                     "/views/partials/login-help.ejs",
-                    "/views/interaction.ejs",
+                    "/views/consent.ejs",
                     "/views/login.ejs",
                     "/views/repost.ejs",
                     "/views/select_account.ejs"

package/lib/esm/hooks/OidcProviderInitHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcProviderInitHook.js","sourceRoot":"","sources":["../../../src/hooks/OidcProviderInitHook.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACjI,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGlD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAErB,WAAW,CAAqB;IAGhC,YAAY,CAAsB;IAGlC,WAAW,CAAqB;IAGhC,oBAAoB,CAAuB;IAGrD,MAAM,CAAC,GAAmB;QACxB,OAAO;YACL;gBACE,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB;oBACE,+BAA+B;oBAC/B,iDAAiD;oBACjD,yCAAyC;oBACzC,wCAAwC;oBACxC,uCAAuC;oBACvC,wBAAwB;oBACxB,2BAA2B;oBAC3B,mCAAmC;oBACnC,6BAA6B;oBAC7B,sCAAsC;oBACtC,4BAA4B;oBAC5B,4BAA4B;oBAC5B,gCAAgC;oBAChC,wBAAwB;oBACxB,kBAAkB;oBAClB,mBAAmB;oBACnB,2BAA2B;iBAC5B,EACD,GAAG,EACH;oBACE,WAAW,EAAE,GAAG,YAAY,OAAO;iBACpC,CACF;aACJ;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA7CC;IADC,MAAM,EAAE;8BACc,kBAAkB;yDAAC;AAG1C;IADC,MAAM,EAAE;8BACe,mBAAmB;0DAAC;AAG5C;IADC,MAAM,EAAE;8BACc,kBAAkB;yDAAC;AAG1C;IADC,MAAM,EAAE;8BACuB,oBAAoB;kEAAC;AAGrD;IADC,MAAM,CAAC,MAAM,CAAC;;;;kDAiCd;AA9CU,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CA+ChC;SA/CY,oBAAoB","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\n@Injectable()\nexport class OidcProviderInitHook {\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    return [\n      {\n        title: \"Generate files\",\n        task: async () =>\n          this.rootRenderer.renderAll(\n            [\n              \"/src/config/oidc/index.ts.hbs\",\n              \"/src/controllers/oidc/InteractionsController.ts\",\n              \"/src/interactions/ConsentInteraction.ts\",\n              \"/src/interactions/CustomInteraction.ts\",\n              \"/src/interactions/LoginInteraction.ts\",\n              \"/src/models/Account.ts\",\n              \"/src/services/Accounts.ts\",\n              \"/views/forms/interaction-form.ejs\",\n              \"/views/forms/login-form.ejs\",\n              \"/views/forms/select-account-form.ejs\",\n              \"/views/partials/footer.ejs\",\n              \"/views/partials/header.ejs\",\n              \"/views/partials/login-help.ejs\",\n              \"/views/interaction.ejs\",\n              \"/views/login.ejs\",\n              \"/views/repost.ejs\",\n              \"/views/select_account.ejs\"\n            ],\n            ctx,\n            {\n              templateDir: `${TEMPLATE_DIR}/init`\n            }\n          )\n      }\n    ];\n  }\n}\n"]}
+{"version":3,"file":"OidcProviderInitHook.js","sourceRoot":"","sources":["../../../src/hooks/OidcProviderInitHook.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACjI,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGlD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAErB,WAAW,CAAqB;IAGhC,YAAY,CAAsB;IAGlC,WAAW,CAAqB;IAGhC,oBAAoB,CAAuB;IAGrD,MAAM,CAAC,GAAmB;QACxB,OAAO;YACL;gBACE,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB;oBACE,+BAA+B;oBAC/B,iDAAiD;oBACjD,GAAG,CAAC,IAAI,IAAI,sDAAsD;oBAClE,yCAAyC;oBACzC,GAAG,CAAC,IAAI,IAAI,8CAA8C;oBAC1D,wCAAwC;oBACxC,uCAAuC;oBACvC,GAAG,CAAC,IAAI,IAAI,4CAA4C;oBACxD,GAAG,CAAC,IAAI,IAAI,mDAAmD;oBAC/D,wBAAwB;oBACxB,2BAA2B;oBAC3B,+BAA+B;oBAC/B,6BAA6B;oBAC7B,sCAAsC;oBACtC,4BAA4B;oBAC5B,4BAA4B;oBAC5B,gCAAgC;oBAChC,oBAAoB;oBACpB,kBAAkB;oBAClB,mBAAmB;oBACnB,2BAA2B;iBAC5B,EACD,GAAG,EACH;oBACE,WAAW,EAAE,GAAG,YAAY,OAAO;iBACpC,CACF;aACJ;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAjDC;IADC,MAAM,EAAE;8BACc,kBAAkB;yDAAC;AAG1C;IADC,MAAM,EAAE;8BACe,mBAAmB;0DAAC;AAG5C;IADC,MAAM,EAAE;8BACc,kBAAkB;yDAAC;AAG1C;IADC,MAAM,EAAE;8BACuB,oBAAoB;kEAAC;AAGrD;IADC,MAAM,CAAC,MAAM,CAAC;;;;kDAqCd;AAlDU,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CAmDhC;SAnDY,oBAAoB","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\n@Injectable()\nexport class OidcProviderInitHook {\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    return [\n      {\n        title: \"Generate files\",\n        task: async () =>\n          this.rootRenderer.renderAll(\n            [\n              \"/src/config/oidc/index.ts.hbs\",\n              \"/src/controllers/oidc/InteractionsController.ts\",\n              ctx.jest && \"/src/controllers/oidc/InteractionsController.spec.ts\",\n              \"/src/interactions/ConsentInteraction.ts\",\n              ctx.jest && \"/src/interactions/ConsentInteraction.spec.ts\",\n              \"/src/interactions/CustomInteraction.ts\",\n              \"/src/interactions/LoginInteraction.ts\",\n              ctx.jest && \"/src/interactions/LoginInteraction.spec.ts\",\n              ctx.jest && \"/src/interactions/__mock__/oidcContext.fixture.ts\",\n              \"/src/models/Account.ts\",\n              \"/src/services/Accounts.ts\",\n              \"/views/forms/consent-form.ejs\",\n              \"/views/forms/login-form.ejs\",\n              \"/views/forms/select-account-form.ejs\",\n              \"/views/partials/footer.ejs\",\n              \"/views/partials/header.ejs\",\n              \"/views/partials/login-help.ejs\",\n              \"/views/consent.ejs\",\n              \"/views/login.ejs\",\n              \"/views/repost.ejs\",\n              \"/views/select_account.ejs\"\n            ],\n            ctx,\n            {\n              templateDir: `${TEMPLATE_DIR}/init`\n            }\n          )\n      }\n    ];\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/cli-plugin-oidc-provider",
-  "version": "3.23.0",
+  "version": "3.24.0",
   "description": "Ts.ED CLI plugin. Add OIDC Provider",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
@@ -25,12 +25,12 @@
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@tsed/cli": "3.23.0",
-    "@tsed/cli-core": "3.23.0"
+    "@tsed/cli": "3.24.0",
+    "@tsed/cli-core": "3.24.0"
   },
   "peerDependencies": {
-    "@tsed/cli": "^3.23.0",
-    "@tsed/cli-core": "^3.23.0"
+    "@tsed/cli": "^3.24.0",
+    "@tsed/cli-core": "^3.24.0"
   },
   "repository": "https://github.com/tsedio/tsed-cli",
   "bugs": {

package/templates/init/src/controllers/oidc/InteractionsController.spec.ts

@@ -0,0 +1,20 @@
+import { PlatformTest } from "@tsed/common";
+
+import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture";
+import { InteractionsController } from "./InteractionsController";
+
+describe("InteractionsController", () => {
+  beforeEach(() => PlatformTest.create());
+  afterEach(() => PlatformTest.reset());
+
+  describe("promptInteraction()", () => {
+    it("should run the asked prompt interaction", async () => {
+      const oidcContext = getOidcContextFixture();
+      const controller = await PlatformTest.invoke<InteractionsController>(InteractionsController);
+
+      await controller.promptInteraction(oidcContext);
+
+      expect(oidcContext.runInteraction).toHaveBeenCalledWith();
+    });
+  });
+});

package/templates/init/src/controllers/oidc/InteractionsController.ts

@@ -1,14 +1,12 @@
 import {Get} from "@tsed/common";
 import {Interactions, OidcCtx} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
-import {ConsentInteraction} from "../../interactions/ConsentInteraction";
-import {CustomInteraction} from "../../interactions/CustomInteraction";
-import {LoginInteraction} from "../../interactions/LoginInteraction";
+import * as interactions from "../../interactions/index";
 
 @Name("Oidc")
 @Interactions({
   path: "/interaction/:uid",
-  children: [LoginInteraction, ConsentInteraction, CustomInteraction]
+  children: Object.values(interactions)
 })
 export class InteractionsController {
   @Get("/")

package/templates/init/src/interactions/ConsentInteraction.spec.ts

@@ -0,0 +1,71 @@
+import { PlatformTest } from "@tsed/common";
+
+import { getOidcContextFixture } from "./__mock__/oidcContext.fixture";
+import { ConsentInteraction } from "./ConsentInteraction";
+
+async function createInteractionFixture() {
+  const interaction = await PlatformTest.invoke<ConsentInteraction>(ConsentInteraction, []);
+
+  return { interaction };
+}
+
+describe("ConsentInteraction", () => {
+  beforeEach(() => PlatformTest.create());
+  afterEach(() => PlatformTest.reset());
+
+  describe("$prompt()", () => {
+    it("should return consent context", async () => {
+      const { interaction } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+
+      const result = await interaction.$prompt(oidcContext);
+
+      expect(result).toEqual({
+        client: {
+          client_id: "client_id"
+        },
+        flash: false,
+        details: {},
+        params: {
+          client_id: "client_id"
+        },
+        title: "Authorize",
+        uid: "uid"
+      });
+    });
+  });
+  describe("confirm()", () => {
+    it("should control all consentement", async () => {
+      const { interaction } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+      oidcContext.prompt.name = "consent";
+
+      const grant = {
+        save: jest.fn().mockResolvedValue("grantId"),
+        addOIDCScope: jest.fn(),
+        addOIDCClaims: jest.fn(),
+        addResourceScope: jest.fn()
+      };
+
+      oidcContext.getGrant.mockResolvedValue(grant);
+      oidcContext.prompt.details = {
+        missingOIDCScope: ["scope1", "scope2"],
+        missingOIDClaims: ["claims"],
+        missingResourceScopes: {
+          indicator: ["scopes"]
+        }
+      };
+
+      const result = await interaction.confirm(oidcContext);
+
+      expect(result).toEqual(undefined);
+
+      expect(oidcContext.getGrant).toHaveBeenCalledWith();
+      expect(grant.addOIDCScope).toHaveBeenCalledWith("scope1 scope2");
+      expect(grant.addOIDCClaims).toHaveBeenCalledWith(["claims"]);
+      expect(grant.addResourceScope).toHaveBeenCalledWith("indicator", "scopes");
+      expect(grant.save).toHaveBeenCalledWith();
+      expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ consent: { grantId: "grantId" } }, { mergeWithLastSubmission: true });
+    });
+  });
+});

package/templates/init/src/interactions/ConsentInteraction.ts

@@ -1,6 +1,5 @@
 import {Inject, Post, View} from "@tsed/common";
-import {BadRequest} from "@tsed/exceptions";
-import {Interaction, OidcCtx, OidcProvider, OidcSession, Params, Prompt, Uid} from "@tsed/oidc-provider";
+import {Interaction, OidcCtx, OidcProvider} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
 
 @Interaction({
@@ -11,47 +10,35 @@ export class ConsentInteraction {
   @Inject()
   oidc: OidcProvider;
 
-  @View("interaction")
-  async $prompt(
-    @OidcCtx() oidcCtx: OidcCtx,
-    @Prompt() prompt: Prompt,
-    @OidcSession() session: OidcSession,
-    @Params() params: Params,
-    @Uid() uid: Uid
-  ): Promise<any> {
-    const client = await oidcCtx.findClient();
-
-    return {
-      client,
-      uid,
-      details: prompt.details,
-      params,
+  @View("consent")
+  async $prompt(@OidcCtx() oidcCtx: OidcCtx): Promise<any> {
+    const account = await oidcCtx.findAccount();
+    return oidcCtx.interactionPrompt({
       title: "Authorize",
-      ...oidcCtx.debug()
-    };
+      account,
+      flash: false
+    });
   }
 
   @Post("/confirm")
-  async confirm(@OidcCtx() oidcCtx: OidcCtx, @Prompt() prompt: Prompt) {
-    if (prompt.name !== "consent") {
-      throw new BadRequest("Bad interaction name");
-    }
+  async confirm(@OidcCtx() oidcCtx: OidcCtx) {
+    oidcCtx.checkInteractionName("content");
 
     const grant = await oidcCtx.getGrant();
-    const details = prompt.details as {
+    const details = oidcCtx.prompt.details as {
       missingOIDCScope: string[];
       missingResourceScopes: Record<string, string[]>;
       missingOIDClaims: string[];
     };
 
-    const {missingOIDCScope, missingOIDClaims, missingResourceScopes} = details;
+    const { missingOIDCScope, missingOIDClaims, missingResourceScopes } = details;
 
     if (missingOIDCScope) {
       grant.addOIDCScope(missingOIDCScope.join(" "));
       // use grant.rejectOIDCScope to reject a subset or the whole thing
     }
     if (missingOIDClaims) {
-      grant.addOIDCClaims(missingOIDCScope);
+      grant.addOIDCClaims(missingOIDClaims);
       // use grant.rejectOIDCClaims to reject a subset or the whole thing
     }
 
@@ -64,7 +51,6 @@ export class ConsentInteraction {
     }
 
     const grantId = await grant.save();
-
     const consent: any = {};
 
     if (!oidcCtx.grantId) {

package/templates/init/src/interactions/LoginInteraction.spec.ts

@@ -0,0 +1,126 @@
+import { PlatformTest } from "@tsed/common";
+import { catchAsyncError } from "@tsed/core";
+import { BadRequest } from "@tsed/exceptions";
+
+import { Accounts } from "../services/Accounts";
+import { getOidcContextFixture } from "./__mock__/oidcContext.fixture";
+import { LoginInteraction } from "./LoginInteraction";
+
+async function createInteractionFixture() {
+  const accounts = {
+    authenticate: jest.fn()
+  };
+
+  const interaction = await PlatformTest.invoke<LoginInteraction>(LoginInteraction, [
+    {
+      token: Accounts,
+      use: accounts
+    }
+  ]);
+
+  return { interaction, accounts };
+}
+
+describe("LoginInteraction", () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    return PlatformTest.create();
+  });
+  afterEach(() => PlatformTest.reset());
+
+  describe("$prompt()", () => {
+    it("should return the prompt login context", async () => {
+      const { interaction } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+
+      const result = await interaction.$prompt(oidcContext);
+
+      expect(oidcContext.checkClientId).toHaveBeenCalledWith();
+
+      expect(result).toEqual({
+        client: {
+          client_id: "client_id"
+        },
+        details: {},
+        flash: false,
+        params: {
+          client_id: "client_id"
+        },
+        title: "Sign-in",
+        uid: "uid"
+      });
+    });
+    it("should throw error when the Client is unauthorized", async () => {
+      const { interaction } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+
+      (oidcContext.checkClientId as jest.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id"));
+
+      const result = await catchAsyncError(() => interaction.$prompt(oidcContext));
+
+      expect(oidcContext.checkClientId).toHaveBeenCalledWith();
+      expect(result?.message).toEqual("Unknown given client_id: client_id");
+    });
+  });
+  describe("submit()", () => {
+    it("should find account", async () => {
+      const { interaction, accounts } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+
+      const payload = { email: "email@email.com", password: "pwd" };
+
+      accounts.authenticate.mockResolvedValue({
+        accountId: "id"
+      });
+
+      const result = await interaction.submit(payload, oidcContext);
+
+      expect(result).toEqual(undefined);
+      expect(oidcContext.checkInteractionName).toHaveBeenCalledWith("login");
+      expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ login: { accountId: "id" } });
+    });
+    it("should return to the login page and return the right context page", async () => {
+      const { interaction, accounts } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+
+      const payload = { email: "email@email.com", password: "pwd" };
+
+      accounts.authenticate.mockResolvedValue(null);
+
+      const result = await interaction.submit(payload, oidcContext);
+
+      expect(result).toEqual({
+        client: {
+          client_id: "client_id"
+        },
+        details: {},
+        flash: "Invalid email or password.",
+        params: {
+          client_id: "client_id",
+          login_hint: "email@email.com"
+        },
+        title: "Sign-in",
+        uid: "uid"
+      });
+      expect(oidcContext.checkInteractionName).toHaveBeenCalledWith("login");
+      expect(oidcContext.interactionFinished).not.toHaveBeenCalled();
+    });
+    it("should fail if the prompt name is incorrect", async () => {
+      const { interaction } = await createInteractionFixture();
+      const oidcContext = getOidcContextFixture();
+      oidcContext.prompt.name = "unknown";
+
+      oidcContext.checkInteractionName.mockImplementation(() => {
+        throw new BadRequest("Bad interaction name");
+      });
+
+      const payload = { email: "email@email.com", password: "pwd" };
+
+      const error = await catchAsyncError<any>(() => interaction.submit(payload, oidcContext));
+
+      expect(oidcContext.checkInteractionName).toHaveBeenCalledWith("login");
+      expect(error?.message).toEqual("Bad interaction name");
+      expect(error?.status).toEqual(400);
+    });
+  });
+});

package/templates/init/src/interactions/LoginInteraction.ts

@@ -1,8 +1,7 @@
 import {BodyParams, Inject, Post, View} from "@tsed/common";
 import {Env} from "@tsed/core";
 import {Constant} from "@tsed/di";
-import {BadRequest, Unauthorized} from "@tsed/exceptions";
-import {Interaction, OidcCtx, OidcSession, Params, Prompt, Uid} from "@tsed/oidc-provider";
+import {Interaction, OidcCtx} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
 import {Accounts} from "../services/Accounts";
 
@@ -21,60 +20,34 @@ export class LoginInteraction {
 
   @View("login")
   async $prompt(
-    @OidcCtx() oidcCtx: OidcCtx,
-    @Prompt() prompt: Prompt,
-    @OidcSession() session: OidcSession,
-    @Params() params: Params,
-    @Uid() uid: Uid
+    @OidcCtx() oidcCtx: OidcCtx
   ): Promise<any> {
-    const client = await oidcCtx.findClient();
-
-    if (!client) {
-      throw new Unauthorized(`Unknown client_id ${params.client_id}`);
-    }
+    await oidcCtx.checkClientId();
 
-    return {
-      client,
-      uid,
-      details: prompt.details,
-      params,
+    return oidcCtx.interactionPrompt({
       title: "Sign-in",
-      flash: false,
-      ...oidcCtx.debug()
-    };
+      flash: false
+    });
   }
 
   @Post("/login")
   @View("login")
   async submit(
     @BodyParams() payload: any,
-    @Params() params: Params,
-    @Uid() uid: Uid,
-    @OidcSession() session: OidcSession,
-    @Prompt() prompt: Prompt,
     @OidcCtx() oidcCtx: OidcCtx
   ) {
-    if (prompt.name !== "login") {
-      throw new BadRequest("Bad interaction name");
-    }
-
-    const client = await oidcCtx.findClient();
+    oidcCtx.checkInteractionName("login");
 
-    const account = await this.accounts.authenticate(payload.email);
+    const account = await this.accounts.authenticate(payload.email, payload.password);
 
     if (!account) {
-      return {
-        client,
-        uid,
-        details: prompt.details,
+      return oidcCtx.interactionPrompt({
         params: {
-          ...params,
           login_hint: payload.email
         },
         title: "Sign-in",
-        flash: "Invalid email or password.",
-        ...oidcCtx.debug()
-      };
+        flash: "Invalid email or password."
+      });
     }
 
     return oidcCtx.interactionFinished({

package/templates/init/src/interactions/__mock__/oidcContext.fixture.ts

@@ -0,0 +1,57 @@
+import { OidcInteractionContext } from "@tsed/oidc-provider";
+import { PromptDetail } from "oidc-provider";
+
+export function getPromptDetailFixture(opts: Partial<PromptDetail> = {}): PromptDetail {
+  return {
+    details: {},
+    name: "login",
+    reasons: [],
+    ...opts
+  };
+}
+
+export function getOidcContextFixture(opts: Partial<OidcInteractionContext> = {}) {
+  const p = {
+    context: undefined,
+    env: undefined,
+    oidcInteractions: undefined,
+    oidcProvider: undefined,
+    raw: undefined,
+    debug: jest.fn(),
+    findAccount: jest.fn(),
+    findClient: jest.fn(),
+    getGrant: jest.fn(),
+    grantId: undefined,
+    checkInteractionName: jest.fn(),
+    checkClientId: jest.fn(),
+    interactionDetails: jest.fn().mockResolvedValue({}),
+    interactionFinished: jest.fn().mockResolvedValue(undefined),
+    interactionResult: jest.fn().mockResolvedValue(""),
+    interactionPrompt: jest.fn().mockImplementation((obj) => {
+      return {
+        client: {
+          client_id: "client_id"
+        },
+        ...obj,
+        details: p.prompt.details,
+        uid: p.uid,
+        params: {
+          ...p.params,
+          ...(obj.params || {})
+        }
+      };
+    }),
+    render: jest.fn(),
+    runInteraction: jest.fn(),
+    save: jest.fn(),
+    session: {},
+    params: {
+      client_id: "client_id"
+    },
+    uid: "uid",
+    ...opts,
+    prompt: getPromptDetailFixture(opts.prompt)
+  } as any;
+
+  return p;
+}

package/templates/init/views/{interaction.ejs → consent.ejs}

@@ -4,7 +4,7 @@
 <div class="login-card">
     <h1><%= title %></h1>
 
-    <%- include('forms/interaction-form.ejs') %>
+    <%- include('forms/consent-form.ejs') %>
 
     <%- include('partials/login-help.ejs') %>
 </div>
@@ -12,4 +12,4 @@
 <% include('partials/footer.ejs') %>
 
 </body>
-</html>
+</html>