@tsed/oidc-provider 8.11.0 → 8.11.2-rc.1

package/src/middlewares/OidcSecureMiddleware.ts

@@ -1,30 +0,0 @@
-import url from "node:url";
-
-import {BadRequest} from "@tsed/exceptions";
-import {Middleware, MiddlewareMethods} from "@tsed/platform-middlewares";
-import {Context} from "@tsed/platform-params";
-
-@Middleware()
-export class OidcSecureMiddleware implements MiddlewareMethods {
-  use(@Context() ctx: Context) {
-    const req = ctx.request;
-
-    if (!req.secure) {
-      if (req.method === "GET" || req.method === "HEAD") {
-        ctx.response.redirect(
-          302,
-          url.format({
-            protocol: "https",
-            host: req.get("host"),
-            pathname: req.url
-          })
-        );
-      } else {
-        throw new BadRequest("InvalidRequest", {
-          error: "invalid_request",
-          error_description: "Do yourself a favor and only use https"
-        });
-      }
-    }
-  }
-}

package/src/services/OidcAdapters.spec.ts

@@ -1,100 +0,0 @@
-import {faker} from "@faker-js/faker";
-import {PlatformTest} from "@tsed/platform-http/testing";
-import type {Adapter} from "oidc-provider";
-
-import {OidcAdapters} from "./OidcAdapters.js";
-
-describe("OidcAdapters", () => {
-  beforeEach(() => PlatformTest.create());
-  afterEach(() => PlatformTest.reset());
-
-  describe("createAdapterClass()", () => {
-    let adapter: Adapter;
-
-    beforeEach(async () => {
-      const oidcAdapters = await PlatformTest.invoke<OidcAdapters>(OidcAdapters);
-      adapter = new (oidcAdapters.createAdapterClass())("clients");
-    });
-
-    describe("adapter.upsert()", () => {
-      it("should call upsert", async () => {
-        const id = faker.string.uuid();
-
-        await adapter.upsert(
-          id,
-          {
-            client_id: id
-          },
-          20000
-        );
-
-        const obj: any = await adapter.find(id);
-
-        expect(obj._id).toEqual(id);
-        expect(obj.client_id).toEqual(id);
-        expect(obj.expires_at).toBeInstanceOf(Date);
-
-        await adapter.destroy(id);
-      });
-    });
-
-    describe("adapter.findByUserCode()", () => {
-      it("should find data by userCode", async () => {
-        const id = faker.string.uuid();
-
-        await adapter.upsert(
-          id,
-          {
-            userCode: id
-          },
-          20000
-        );
-
-        const obj: any = await adapter.findByUserCode(id);
-
-        expect(obj._id).toEqual(id);
-        expect(obj.userCode).toEqual(id);
-        expect(obj.expires_at).toBeInstanceOf(Date);
-      });
-    });
-    describe("adapter.findByUid()", () => {
-      it("should find data by uid", async () => {
-        const id = faker.string.uuid();
-
-        await adapter.upsert(
-          id,
-          {
-            uid: id
-          },
-          20000
-        );
-
-        const obj: any = await adapter.findByUid(id);
-
-        expect(obj._id).toEqual(id);
-        expect(obj.uid).toEqual(id);
-        expect(obj.expires_at).toBeInstanceOf(Date);
-      });
-    });
-    describe("adapter.deleteMany()", () => {
-      it("should delete items", async () => {
-        const id = faker.string.uuid();
-
-        await adapter.upsert(
-          id,
-          {
-            grantId: id
-          },
-          20000
-        );
-
-        await adapter.consume(id);
-        const obj: any = await adapter.find(id);
-        await adapter.revokeByGrantId(id);
-
-        expect(obj._id).toEqual(id);
-        expect(obj.grantId).toEqual(id);
-      });
-    });
-  });
-});

package/src/services/OidcAdapters.ts

@@ -1,92 +0,0 @@
-import {Adapter, Adapters} from "@tsed/adapters";
-import {constant, inject, Injectable} from "@tsed/di";
-import type {Adapter as OidcAdapter, AdapterConstructor} from "oidc-provider";
-
-export type OidcAdapterMethods<Model = any> = Adapter<Model> & Partial<Omit<OidcAdapter, "upsert">>;
-
-@Injectable()
-export class OidcAdapters {
-  protected adapters = inject(Adapters);
-
-  createAdapterClass(): AdapterConstructor {
-    const self = this;
-    const adapterBase = constant("oidc.Adapter", constant("adapters.Adapter"));
-    const connectionName = constant("oidc.connectionName", "default");
-
-    return class CustomAdapter implements OidcAdapter {
-      adapter: OidcAdapterMethods;
-
-      constructor(name: string) {
-        this.adapter = self.adapters.invokeAdapter<any>({
-          adapter: adapterBase,
-          collectionName: name,
-          connectionName,
-          model: Object
-        }) as OidcAdapterMethods;
-      }
-
-      async upsert(id: string, payload: any, expiresIn: number): Promise<void> {
-        let expiresAt;
-
-        if (expiresIn) {
-          expiresAt = new Date(Date.now() + expiresIn * 1000);
-        }
-
-        await this.adapter.upsert(id, payload, expiresAt);
-      }
-
-      find(id: string) {
-        return this.adapter.findById(id);
-      }
-
-      findByUserCode(userCode: string) {
-        // istanbul ignore next
-        if (this.adapter.findByUserCode) {
-          return this.adapter.findByUserCode(userCode);
-        }
-
-        return this.adapter.findOne({
-          userCode
-        });
-      }
-
-      findByUid(uid: string) {
-        // istanbul ignore next
-        if (this.adapter.findByUid) {
-          return this.adapter.findByUid(uid);
-        }
-
-        return this.adapter.findOne({
-          uid
-        });
-      }
-
-      async destroy(id: string) {
-        // istanbul ignore next
-        if (this.adapter.destroy) {
-          return this.adapter.destroy(id);
-        }
-
-        await this.adapter.deleteById(id);
-      }
-
-      async revokeByGrantId(grantId: string) {
-        // istanbul ignore next
-        if (this.adapter.revokeByGrantId) {
-          return this.adapter.revokeByGrantId(grantId);
-        }
-
-        await this.adapter.deleteMany({grantId});
-      }
-
-      async consume(grantId: string) {
-        // istanbul ignore next
-        if (this.adapter.consume) {
-          return this.adapter.consume(grantId);
-        }
-
-        await this.adapter.update(grantId, {consumed: Math.floor(Date.now() / 1000)});
-      }
-    };
-  }
-}

package/src/services/OidcInteractionContext.spec.ts

@@ -1,304 +0,0 @@
-import {catchAsyncError, catchError} from "@tsed/core";
-import {runInContext} from "@tsed/di";
-import {PlatformTest} from "@tsed/platform-http/testing";
-
-import {OidcInteractionContext} from "./OidcInteractionContext.js";
-import {OidcProvider} from "./OidcProvider.js";
-
-async function createOidcInteractionContextFixture(grantId: any = "grantId") {
-  const $ctx = PlatformTest.createRequestContext();
-
-  const session = {
-    accountId: "accountId"
-  };
-
-  const interactionDetails: any = {
-    uid: "uid",
-    grantId,
-    session,
-    prompt: {
-      name: "login"
-    },
-    params: {
-      client_id: "client_id",
-      email: "email@email.com"
-    },
-    save: vi.fn()
-  };
-
-  const oidcProvider = {
-    interactionDetails: vi.fn().mockResolvedValue(interactionDetails),
-    interactionFinished: vi.fn().mockResolvedValue(undefined),
-    interactionResult: vi.fn().mockResolvedValue(undefined),
-    setProviderSession: vi.fn().mockResolvedValue(undefined),
-    find: vi.fn().mockResolvedValue("grant"),
-    Grant: class {
-      static find = vi.fn().mockResolvedValue("grant");
-    },
-    Client: {
-      find: vi.fn().mockResolvedValue({
-        client_id: "client_id"
-      })
-    },
-    Account: {
-      findAccount: vi.fn().mockResolvedValue({
-        accountId: "accountId"
-      })
-    }
-  };
-  const oidcCtx = await PlatformTest.invoke<OidcInteractionContext>(OidcInteractionContext, [
-    {
-      token: OidcProvider,
-      use: {
-        get() {
-          return oidcProvider;
-        }
-      }
-    }
-  ]);
-
-  await runInContext($ctx, () => oidcCtx.interactionDetails());
-
-  return {$ctx, oidcCtx, oidcProvider, session, interactionDetails};
-}
-
-describe("OidcInteractionContext", () => {
-  beforeEach(() => PlatformTest.create());
-  afterEach(() => PlatformTest.reset());
-
-  describe("uid()", () => {
-    it("should return uid", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, () => {
-        expect(oidcCtx.uid).toEqual("uid");
-      });
-    });
-  });
-
-  describe("checkInteractionName()", () => {
-    it("should throw error", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, () => {
-        const error: any = catchError(() => oidcCtx.checkInteractionName("test"));
-
-        expect(error?.message).toEqual("Bad interaction name");
-      });
-    });
-  });
-
-  describe("checkClientId()", () => {
-    it("should throw error", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      oidcProvider.Client.find.mockResolvedValue(undefined);
-
-      await runInContext($ctx, async () => {
-        const error: any = await catchAsyncError(() => oidcCtx.checkClientId());
-
-        expect(error?.message).toEqual("Unknown client_id client_id");
-      });
-    });
-  });
-
-  describe("grantId()", () => {
-    it("should return uid", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, () => {
-        expect(oidcCtx.grantId).toEqual("grantId");
-      });
-    });
-  });
-
-  describe("session()", () => {
-    it("should return session", async () => {
-      const {$ctx, oidcCtx, interactionDetails} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, () => {
-        expect(oidcCtx.session).toEqual(interactionDetails.session);
-      });
-    });
-  });
-
-  describe("prompt()", () => {
-    it("should return prompt", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, () => {
-        expect(oidcCtx.prompt).toEqual({
-          name: "login"
-        });
-      });
-    });
-  });
-
-  describe("params()", () => {
-    it("should return params", async () => {
-      const {$ctx, oidcCtx, interactionDetails} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, () => {
-        expect(oidcCtx.params).toEqual(interactionDetails.params);
-      });
-    });
-  });
-
-  describe("interactionFinished()", () => {
-    it("should return call interactionFinished", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, async () => {
-        await oidcCtx.interactionFinished({login: {accountId: "string"}}, {mergeWithLastSubmission: false});
-
-        expect(oidcProvider.interactionFinished).toHaveBeenCalledWith(
-          $ctx.getReq(),
-          $ctx.getRes(),
-          {login: {accountId: "string"}},
-          {mergeWithLastSubmission: false}
-        );
-      });
-    });
-  });
-
-  describe("interactionResult()", () => {
-    it("should return call interactionResult", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        await oidcCtx.interactionResult({login: {accountId: "string"}}, {mergeWithLastSubmission: false});
-
-        expect(oidcProvider.interactionResult).toHaveBeenCalledWith(
-          $ctx.getReq(),
-          $ctx.getRes(),
-          {login: {accountId: "string"}},
-          {mergeWithLastSubmission: false}
-        );
-      });
-    });
-    it("should return call interactionResult (default)", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        await oidcCtx.interactionResult({login: {accountId: "string"}});
-
-        expect(oidcProvider.interactionResult).toHaveBeenCalledWith(
-          $ctx.getReq(),
-          $ctx.getRes(),
-          {login: {accountId: "string"}},
-          {mergeWithLastSubmission: false}
-        );
-      });
-    });
-  });
-
-  describe("render()", () => {
-    it("should return call render", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        vi.spyOn($ctx.response, "render").mockResolvedValue("");
-
-        await oidcCtx.render("login", {});
-
-        expect($ctx.response.render).toHaveBeenCalledWith("login", {});
-      });
-    });
-  });
-
-  describe("save()", () => {
-    it("should return call save", async () => {
-      const {$ctx, oidcCtx, interactionDetails} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        await oidcCtx.save(2000);
-
-        expect(interactionDetails.save).toHaveBeenCalledWith(2000);
-      });
-    });
-
-    it("should return call save (default)", async () => {
-      const {$ctx, oidcCtx, interactionDetails} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        await oidcCtx.save(100);
-
-        expect(interactionDetails.save).toHaveBeenCalledWith(100);
-      });
-    });
-  });
-
-  describe("findClient()", () => {
-    it("should return call findClient", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.findClient("client_id");
-
-        expect(result).toEqual({
-          client_id: "client_id"
-        });
-        expect(oidcProvider.Client.find).toHaveBeenCalledWith("client_id");
-      });
-    });
-
-    it("should return call findClient (default)", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.findClient();
-
-        expect(result).toEqual({
-          client_id: "client_id"
-        });
-        expect(oidcProvider.Client.find).toHaveBeenCalledWith("client_id");
-      });
-    });
-  });
-
-  describe("findAccount()", () => {
-    it("should return call findAccount", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.findAccount(undefined, "token");
-
-        expect(oidcProvider.Account.findAccount).toHaveBeenCalledWith(undefined, "accountId", "token");
-        expect(result).toEqual({
-          accountId: "accountId"
-        });
-      });
-    });
-
-    it("should return call findAccount (with accountId)", async () => {
-      const {$ctx, oidcCtx, oidcProvider} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.findAccount("accountId", "token");
-
-        expect(oidcProvider.Account.findAccount).toHaveBeenCalledWith(undefined, "accountId", "token");
-        expect(result).toEqual({
-          accountId: "accountId"
-        });
-      });
-    });
-
-    it("should return call findAccount (without session/accountId)", async () => {
-      const {$ctx, oidcCtx, interactionDetails} = await createOidcInteractionContextFixture();
-
-      await runInContext($ctx, async () => {
-        interactionDetails.session.accountId = undefined;
-
-        const result = await runInContext($ctx, () => oidcCtx.findAccount(undefined, "token"));
-
-        expect(result).toBeUndefined();
-      });
-    });
-  });
-
-  describe("getGrant()", () => {
-    it("should return call grant from grantId", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture();
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.getGrant();
-        expect(result).toEqual("grant");
-      });
-    });
-
-    it("should create grant", async () => {
-      const {$ctx, oidcCtx} = await createOidcInteractionContextFixture(null);
-      await runInContext($ctx, async () => {
-        const result = await oidcCtx.getGrant();
-        expect(result).toEqual({});
-      });
-    });
-  });
-});