@tsed/cli-plugin-oidc-provider 6.0.0-beta.2 → 6.0.0-beta.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-plugin-oidc-provider",
   "description": "Ts.ED CLI plugin. Add OIDC Provider",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-beta.3",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -28,9 +28,9 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/cli": "6.0.0-beta.2",
-    "@tsed/cli-core": "6.0.0-beta.2",
-    "@tsed/typescript": "6.0.0-beta.2",
+    "@tsed/cli": "6.0.0-beta.3",
+    "@tsed/cli-core": "6.0.0-beta.3",
+    "@tsed/typescript": "6.0.0-beta.3",
     "cross-env": "7.0.3",
     "typescript": "5.6.2",
     "vitest": "2.1.1"

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

@@ -1,7 +1,7 @@
-import { PlatformTest } from "@tsed/common";
+import {PlatformTest} from "@tsed/platform-http";
 
-import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture.js";
-import { InteractionsController } from "./InteractionsController.js";
+import {getOidcContextFixture} from "../../interactions/__mock__/oidcContext.fixture.js";
+import {InteractionsController} from "./InteractionsController.js";
 
 describe("InteractionsController", () => {
   beforeEach(() => PlatformTest.create());

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

@@ -1,4 +1,4 @@
-import {Get, PathParams} from "@tsed/common";
+import {Get, PathParams} from "@tsed/platform-http";
 import {Interactions, OidcCtx} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
 import * as interactions from "../../interactions/index.js";

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

@@ -1,4 +1,4 @@
-import {Inject} from "@tsed/common";
+import {Inject} from "@tsed/platform-http";
 import {Interaction, OidcCtx, OidcProvider, InteractionMethods} from "@tsed/oidc-provider";
 import {View} from "@tsed/platform-views";
 import {Name} from "@tsed/schema";

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

@@ -1,12 +1,12 @@
-import { PlatformTest } from "@tsed/common";
+import {PlatformTest} from "@tsed/platform-http";
 
-import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js";
-import { ConsentInteraction } from "./ConsentInteraction.js";
+import {getOidcContextFixture} from "./__mock__/oidcContext.fixture.js";
+import {ConsentInteraction} from "./ConsentInteraction.js";
 
 async function createInteractionFixture() {
   const interaction = await PlatformTest.invoke<ConsentInteraction>(ConsentInteraction, []);
 
-  return { interaction };
+  return {interaction};
 }
 
 describe("ConsentInteraction", () => {
@@ -15,7 +15,7 @@ describe("ConsentInteraction", () => {
 
   describe("$prompt()", () => {
     it("should return consent context", async () => {
-      const { interaction } = await createInteractionFixture();
+      const {interaction} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
       const result = await interaction.$prompt(oidcContext);
@@ -36,7 +36,7 @@ describe("ConsentInteraction", () => {
   });
   describe("confirm()", () => {
     it("should control all consentement", async () => {
-      const { interaction } = await createInteractionFixture();
+      const {interaction} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
       oidcContext.prompt.name = "consent";
 
@@ -65,7 +65,7 @@ describe("ConsentInteraction", () => {
       expect(grant.addOIDCClaims).toHaveBeenCalledWith(["claims"]);
       expect(grant.addResourceScope).toHaveBeenCalledWith("indicator", "scopes");
       expect(grant.save).toHaveBeenCalledWith();
-      expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ consent: { grantId: "grantId" } }, { mergeWithLastSubmission: true });
+      expect(oidcContext.interactionFinished).toHaveBeenCalledWith({consent: {grantId: "grantId"}}, {mergeWithLastSubmission: true});
     });
   });
 });

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

@@ -1,6 +1,6 @@
-import {Inject, Post, View} from "@tsed/common";
+import {Post, View, Name} from "@tsed/schema";
+import {Inject} from "@tsed/di";
 import {Interaction, OidcCtx, OidcProvider} from "@tsed/oidc-provider";
-import {Name} from "@tsed/schema";
 
 @Interaction({
   name: "consent",
@@ -32,7 +32,7 @@ export class ConsentInteraction {
       missingOIDClaims: string[];
     };
 
-    const { missingOIDCScope, missingOIDClaims, missingResourceScopes } = details;
+    const {missingOIDCScope, missingOIDClaims, missingResourceScopes} = details;
 
     if (missingOIDCScope) {
       grant.addOIDCScope(missingOIDCScope.join(" "));

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

@@ -1,8 +1,7 @@
-import {View} from "@tsed/common";
 import {Env} from "@tsed/core";
 import {Constant} from "@tsed/di";
 import {Interaction, InteractionMethods, OidcCtx, OidcSession, Params, Prompt, Uid} from "@tsed/oidc-provider";
-import {Name} from "@tsed/schema";
+import {Name, View} from "@tsed/schema";
 import {interactionPolicy, KoaContextWithOIDC} from "oidc-provider";
 import Check = interactionPolicy.Check;
 
@@ -15,8 +14,7 @@ export class CustomInteraction implements InteractionMethods {
   @Constant("env")
   env: Env;
 
-  $onCreate() {
-  }
+  $onCreate() {}
 
   /**
    * return checks conditions. See: https://github.com/panva/node-oidc-provider/blob/main/docs/README.md#interactionspolicy
@@ -24,7 +22,7 @@ export class CustomInteraction implements InteractionMethods {
   checks() {
     return [
       new Check("no_session", "End-User authentication is required", (ctx) => {
-        const { oidc } = ctx;
+        const {oidc} = ctx;
 
         if (oidc.session?.accountId) {
           // @ts-ignore
@@ -41,12 +39,12 @@ export class CustomInteraction implements InteractionMethods {
    * return checks conditions. See: https://github.com/panva/node-oidc-provider/blob/main/docs/README.md#interactionspolicy
    */
   details(ctx: KoaContextWithOIDC) {
-    const { oidc } = ctx;
+    const {oidc} = ctx;
 
     return {
-      ...(oidc.params?.max_age === undefined ? undefined : { max_age: oidc.params.max_age }),
-      ...(oidc.params?.login_hint === undefined ? undefined : { login_hint: oidc.params.login_hint }),
-      ...(oidc.params?.id_token_hint === undefined ? undefined : { id_token_hint: oidc.params.id_token_hint })
+      ...(oidc.params?.max_age === undefined ? undefined : {max_age: oidc.params.max_age}),
+      ...(oidc.params?.login_hint === undefined ? undefined : {login_hint: oidc.params.login_hint}),
+      ...(oidc.params?.id_token_hint === undefined ? undefined : {id_token_hint: oidc.params.id_token_hint})
     };
   }
 

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

@@ -1,10 +1,10 @@
-import { PlatformTest } from "@tsed/common";
-import { catchAsyncError } from "@tsed/core";
-import { BadRequest } from "@tsed/exceptions";
+import {PlatformTest} from "@tsed/platform-http";
+import {catchAsyncError} from "@tsed/core";
+import {BadRequest} from "@tsed/exceptions";
 
-import { Accounts } from "../services/Accounts.js";
-import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js";
-import { LoginInteraction } from "./LoginInteraction.js";
+import {Accounts} from "../services/Accounts.js";
+import {getOidcContextFixture} from "./__mock__/oidcContext.fixture.js";
+import {LoginInteraction} from "./LoginInteraction.js";
 
 async function createInteractionFixture() {
   const accounts = {
@@ -18,7 +18,7 @@ async function createInteractionFixture() {
     }
   ]);
 
-  return { interaction, accounts };
+  return {interaction, accounts};
 }
 
 describe("LoginInteraction", () => {
@@ -30,7 +30,7 @@ describe("LoginInteraction", () => {
 
   describe("$prompt()", () => {
     it("should return the prompt login context", async () => {
-      const { interaction } = await createInteractionFixture();
+      const {interaction} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
       const result = await interaction.$prompt(oidcContext);
@@ -51,7 +51,7 @@ describe("LoginInteraction", () => {
       });
     });
     it("should throw error when the Client is unauthorized", async () => {
-      const { interaction } = await createInteractionFixture();
+      const {interaction} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
       (oidcContext.checkClientId as vi.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id"));
@@ -64,10 +64,10 @@ describe("LoginInteraction", () => {
   });
   describe("submit()", () => {
     it("should find account", async () => {
-      const { interaction, accounts } = await createInteractionFixture();
+      const {interaction, accounts} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
-      const payload = { email: "email@email.com", password: "pwd" };
+      const payload = {email: "email@email.com", password: "pwd"};
 
       accounts.authenticate.mockResolvedValue({
         accountId: "id"
@@ -77,13 +77,13 @@ describe("LoginInteraction", () => {
 
       expect(result).toEqual(undefined);
       expect(oidcContext.checkInteractionName).toHaveBeenCalledWith("login");
-      expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ login: { accountId: "id" } });
+      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 {interaction, accounts} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
-      const payload = { email: "email@email.com", password: "pwd" };
+      const payload = {email: "email@email.com", password: "pwd"};
 
       accounts.authenticate.mockResolvedValue(null);
 
@@ -106,7 +106,7 @@ describe("LoginInteraction", () => {
       expect(oidcContext.interactionFinished).not.toHaveBeenCalled();
     });
     it("should fail if the prompt name is incorrect", async () => {
-      const { interaction } = await createInteractionFixture();
+      const {interaction} = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
       oidcContext.prompt.name = "unknown";
 
@@ -114,7 +114,7 @@ describe("LoginInteraction", () => {
         throw new BadRequest("Bad interaction name");
       });
 
-      const payload = { email: "email@email.com", password: "pwd" };
+      const payload = {email: "email@email.com", password: "pwd"};
 
       const error = await catchAsyncError<any>(() => interaction.submit(payload, oidcContext));
 

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

@@ -1,8 +1,8 @@
-import {BodyParams, Inject, Post, View} from "@tsed/common";
+import {BodyParams} from "@tsed/platform-params";
 import {Env} from "@tsed/core";
-import {Constant} from "@tsed/di";
+import {Constant, Inject} from "@tsed/di";
 import {Interaction, OidcCtx} from "@tsed/oidc-provider";
-import {Name} from "@tsed/schema";
+import {Name, Post, View} from "@tsed/schema";
 import {Accounts} from "../services/Accounts.js";
 
 @Interaction({
@@ -20,9 +20,7 @@ export class LoginInteraction {
   $onCreate() {}
 
   @View("login")
-  async $prompt(
-    @OidcCtx() oidcCtx: OidcCtx
-  ): Promise<any> {
+  async $prompt(@OidcCtx() oidcCtx: OidcCtx): Promise<any> {
     await oidcCtx.checkClientId();
 
     return oidcCtx.interactionPrompt({
@@ -33,10 +31,7 @@ export class LoginInteraction {
 
   @Post("/login")
   @View("login")
-  async submit(
-    @BodyParams() payload: any,
-    @OidcCtx() oidcCtx: OidcCtx
-  ) {
+  async submit(@BodyParams() payload: any, @OidcCtx() oidcCtx: OidcCtx) {
     oidcCtx.checkInteractionName("login");
 
     const account = await this.accounts.authenticate(payload.email, payload.password);