@tsed/cli-plugin-oidc-provider 5.3.1 → 6.0.0-alpha.1

package/lib/types/index.d.ts

@@ -1,4 +1,4 @@
-import { CliPluginOidcProviderModule } from "./CliPluginOidcProviderModule";
-export * from "./hooks/OidcProviderInitHook";
-export * from "./utils/templateDir";
+import { CliPluginOidcProviderModule } from "./CliPluginOidcProviderModule.js";
+export * from "./hooks/OidcProviderInitHook.js";
+export * from "./utils/templateDir.js";
 export default CliPluginOidcProviderModule;

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@tsed/cli-plugin-oidc-provider",
-  "version": "5.3.1",
   "description": "Ts.ED CLI plugin. Add OIDC Provider",
+  "version": "6.0.0-alpha.1",
+  "type": "module",
+  "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
-  "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
   "exports": {
-    "types": "./lib/types/index.d.ts",
-    "import": "./lib/esm/index.js",
-    "require": "./lib/cjs/index.js",
-    "default": "./lib/esm/index.js"
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "import": "./lib/esm/index.js",
+      "default": "./lib/esm/index.js"
+    }
   },
   "scripts": {
     "build": "yarn build:ts",
-    "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js",
-    "lint": "eslint '**/*.{ts,js}'",
-    "lint:fix": "eslint '**/*.{ts,js}' --fix",
-    "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper"
+    "build:ts": "tsc --build tsconfig.json",
+    "test": "vitest run",
+    "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "files": [
     "lib",
@@ -27,18 +28,16 @@
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@tsed/cli": "5.3.1",
-    "@tsed/cli-core": "5.3.1",
-    "@tsed/eslint": "5.3.1",
-    "@tsed/jest-config": "5.3.1",
-    "@tsed/typescript": "5.3.1",
+    "@tsed/cli": "6.0.0-alpha.1",
+    "@tsed/cli-core": "6.0.0-alpha.1",
+    "@tsed/typescript": "6.0.0-alpha.1",
     "cross-env": "7.0.3",
-    "eslint": "8.22.0",
-    "jest": "29.5.0"
+    "typescript": "4.9.5",
+    "vitest": "2.1.1"
   },
   "peerDependencies": {
-    "@tsed/cli": "5.3.1",
-    "@tsed/cli-core": "5.3.1"
+    "@tsed/cli": "workspace:*",
+    "@tsed/cli-core": "workspace:*"
   },
   "repository": "https://github.com/tsedio/tsed-cli",
   "bugs": {
@@ -46,5 +45,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-oidc-provider",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "alpha"
+  }
 }

package/templates/init/src/config/oidc/index.ts.hbs

@@ -1,5 +1,5 @@
 import {OidcSettings} from "@tsed/oidc-provider";
-import {Accounts} from "../../services/Accounts";
+import {Accounts} from "../../services/Accounts.js";
 
 const settings: OidcSettings = {
   path: "{{oidcBasePath}}",
@@ -30,4 +30,4 @@ const settings: OidcSettings = {
   }
 }
 
-export default settings
+export default settings

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

@@ -1,7 +1,7 @@
 import { PlatformTest } from "@tsed/common";
 
-import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture";
-import { InteractionsController } from "./InteractionsController";
+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,7 +1,7 @@
 import {Get, PathParams} from "@tsed/common";
 import {Interactions, OidcCtx} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
-import * as interactions from "../../interactions/index";
+import * as interactions from "../../interactions/index.js";
 
 @Name("Oidc")
 @Interactions({

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

@@ -1,7 +1,7 @@
 import { PlatformTest } from "@tsed/common";
 
-import { getOidcContextFixture } from "./__mock__/oidcContext.fixture";
-import { ConsentInteraction } from "./ConsentInteraction";
+import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js";
+import { ConsentInteraction } from "./ConsentInteraction.js";
 
 async function createInteractionFixture() {
   const interaction = await PlatformTest.invoke<ConsentInteraction>(ConsentInteraction, []);
@@ -41,10 +41,10 @@ describe("ConsentInteraction", () => {
       oidcContext.prompt.name = "consent";
 
       const grant = {
-        save: jest.fn().mockResolvedValue("grantId"),
-        addOIDCScope: jest.fn(),
-        addOIDCClaims: jest.fn(),
-        addResourceScope: jest.fn()
+        save: vi.fn().mockResolvedValue("grantId"),
+        addOIDCScope: vi.fn(),
+        addOIDCClaims: vi.fn(),
+        addResourceScope: vi.fn()
       };
 
       oidcContext.getGrant.mockResolvedValue(grant);

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

@@ -2,13 +2,13 @@ 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";
+import { Accounts } from "../services/Accounts.js";
+import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js";
+import { LoginInteraction } from "./LoginInteraction.js";
 
 async function createInteractionFixture() {
   const accounts = {
-    authenticate: jest.fn()
+    authenticate: vi.fn()
   };
 
   const interaction = await PlatformTest.invoke<LoginInteraction>(LoginInteraction, [
@@ -23,7 +23,7 @@ async function createInteractionFixture() {
 
 describe("LoginInteraction", () => {
   beforeEach(() => {
-    jest.resetAllMocks();
+    vi.resetAllMocks();
     return PlatformTest.create();
   });
   afterEach(() => PlatformTest.reset());
@@ -54,7 +54,7 @@ describe("LoginInteraction", () => {
       const { interaction } = await createInteractionFixture();
       const oidcContext = getOidcContextFixture();
 
-      (oidcContext.checkClientId as jest.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id"));
+      (oidcContext.checkClientId as vi.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id"));
 
       const result = await catchAsyncError(() => interaction.$prompt(oidcContext));
 

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

@@ -3,7 +3,7 @@ import {Env} from "@tsed/core";
 import {Constant} from "@tsed/di";
 import {Interaction, OidcCtx} from "@tsed/oidc-provider";
 import {Name} from "@tsed/schema";
-import {Accounts} from "../services/Accounts";
+import {Accounts} from "../services/Accounts.js";
 
 @Interaction({
   name: "login",

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

@@ -17,17 +17,17 @@ export function getOidcContextFixture(opts: Partial<OidcInteractionContext> = {}
     oidcInteractions: undefined,
     oidcProvider: undefined,
     raw: undefined,
-    debug: jest.fn(),
-    findAccount: jest.fn(),
-    findClient: jest.fn(),
-    getGrant: jest.fn(),
+    debug: vi.fn(),
+    findAccount: vi.fn(),
+    findClient: vi.fn(),
+    getGrant: vi.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) => {
+    checkInteractionName: vi.fn(),
+    checkClientId: vi.fn(),
+    interactionDetails: vi.fn().mockResolvedValue({}),
+    interactionFinished: vi.fn().mockResolvedValue(undefined),
+    interactionResult: vi.fn().mockResolvedValue(""),
+    interactionPrompt: vi.fn().mockImplementation((obj) => {
       return {
         client: {
           client_id: "client_id"
@@ -41,9 +41,9 @@ export function getOidcContextFixture(opts: Partial<OidcInteractionContext> = {}
         }
       };
     }),
-    render: jest.fn(),
-    runInteraction: jest.fn(),
-    save: jest.fn(),
+    render: vi.fn(),
+    runInteraction: vi.fn(),
+    save: vi.fn(),
     session: {},
     params: {
       client_id: "client_id"

package/templates/init/src/services/Accounts.ts

@@ -2,7 +2,7 @@ import {Adapter, InjectAdapter} from "@tsed/adapters";
 import {Injectable} from "@tsed/di";
 import {deserialize} from "@tsed/json-mapper";
 import {OidcAccountsMethods} from "@tsed/oidc-provider";
-import {Account} from "../models/Account";
+import {Account} from "../models/Account.js";
 
 @Injectable()
 export class Accounts implements OidcAccountsMethods {

package/lib/cjs/CliPluginOidcProviderModule.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CliPluginOidcProviderModule = void 0;
-const tslib_1 = require("tslib");
-const cli_core_1 = require("@tsed/cli-core");
-const di_1 = require("@tsed/di");
-const OidcProviderInitHook_1 = require("./hooks/OidcProviderInitHook");
-let CliPluginOidcProviderModule = class CliPluginOidcProviderModule {
-    packageJson;
-    install() {
-        this.packageJson.addDependencies({
-            "oidc-provider": "latest",
-            "@tsed/oidc-provider": "latest",
-            "@tsed/jwks": "latest",
-            "@tsed/adapters": "latest",
-            bcrypt: "latest"
-        });
-        this.packageJson.addDevDependencies({
-            "@types/oidc-provider": "latest"
-        });
-    }
-};
-tslib_1.__decorate([
-    (0, di_1.Inject)(),
-    tslib_1.__metadata("design:type", cli_core_1.ProjectPackageJson)
-], CliPluginOidcProviderModule.prototype, "packageJson", void 0);
-tslib_1.__decorate([
-    (0, cli_core_1.OnAdd)("@tsed/cli-plugin-oidc-provider"),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
-], CliPluginOidcProviderModule.prototype, "install", null);
-CliPluginOidcProviderModule = tslib_1.__decorate([
-    (0, cli_core_1.Module)({
-        imports: [OidcProviderInitHook_1.OidcProviderInitHook]
-    })
-], CliPluginOidcProviderModule);
-exports.CliPluginOidcProviderModule = CliPluginOidcProviderModule;
-//# sourceMappingURL=CliPluginOidcProviderModule.js.map

package/lib/cjs/CliPluginOidcProviderModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CliPluginOidcProviderModule.js","sourceRoot":"","sources":["../../src/CliPluginOidcProviderModule.ts"],"names":[],"mappings":";;;;AAAA,6CAAiE;AACjE,iCAAgC;AAChC,uEAAkE;AAK3D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAEtC,WAAW,CAAqB;IAGhC,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;YAC/B,eAAe,EAAE,QAAQ;YACzB,qBAAqB,EAAE,QAAQ;YAC/B,YAAY,EAAE,QAAQ;YACtB,gBAAgB,EAAE,QAAQ;YAC1B,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC;YAClC,sBAAsB,EAAE,QAAQ;SACjC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhBC;IAAC,IAAA,WAAM,GAAE;sCACI,6BAAkB;gEAAC;AAEhC;IAAC,IAAA,gBAAK,EAAC,gCAAgC,CAAC;;;;0DAYvC;AAhBU,2BAA2B;IAHvC,IAAA,iBAAM,EAAC;QACN,OAAO,EAAE,CAAC,2CAAoB,CAAC;KAChC,CAAC;GACW,2BAA2B,CAiBvC;AAjBY,kEAA2B"}

package/lib/cjs/hooks/OidcProviderInitHook.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OidcProviderInitHook = void 0;
-const tslib_1 = require("tslib");
-const cli_core_1 = require("@tsed/cli-core");
-const di_1 = require("@tsed/di");
-const templateDir_1 = require("../utils/templateDir");
-let OidcProviderInitHook = class OidcProviderInitHook {
-    packageJson;
-    rootRenderer;
-    srcRenderer;
-    cliDockerComposeYaml;
-    onExec(ctx) {
-        return [
-            {
-                title: "Generate OIDC files",
-                task: () => 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/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/consent.ejs",
-                    "/views/login.ejs",
-                    "/views/repost.ejs",
-                    "/views/select_account.ejs"
-                ], ctx, {
-                    templateDir: `${templateDir_1.TEMPLATE_DIR}/init`
-                })
-            }
-        ];
-    }
-};
-tslib_1.__decorate([
-    (0, cli_core_1.Inject)(),
-    tslib_1.__metadata("design:type", cli_core_1.ProjectPackageJson)
-], OidcProviderInitHook.prototype, "packageJson", void 0);
-tslib_1.__decorate([
-    (0, cli_core_1.Inject)(),
-    tslib_1.__metadata("design:type", cli_core_1.RootRendererService)
-], OidcProviderInitHook.prototype, "rootRenderer", void 0);
-tslib_1.__decorate([
-    (0, cli_core_1.Inject)(),
-    tslib_1.__metadata("design:type", cli_core_1.SrcRendererService)
-], OidcProviderInitHook.prototype, "srcRenderer", void 0);
-tslib_1.__decorate([
-    (0, cli_core_1.Inject)(),
-    tslib_1.__metadata("design:type", cli_core_1.CliDockerComposeYaml)
-], OidcProviderInitHook.prototype, "cliDockerComposeYaml", void 0);
-tslib_1.__decorate([
-    (0, cli_core_1.OnExec)("init"),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", void 0)
-], OidcProviderInitHook.prototype, "onExec", null);
-OidcProviderInitHook = tslib_1.__decorate([
-    (0, di_1.Injectable)()
-], OidcProviderInitHook);
-exports.OidcProviderInitHook = OidcProviderInitHook;
-//# sourceMappingURL=OidcProviderInitHook.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"OidcProviderInitHook.js","sourceRoot":"","sources":["../../../src/hooks/OidcProviderInitHook.ts"],"names":[],"mappings":";;;;AACA,6CAAiI;AACjI,iCAAoC;AACpC,sDAAkD;AAG3C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAErB,WAAW,CAAqB;IAGhC,YAAY,CAAsB;IAGlC,WAAW,CAAqB;IAGhC,oBAAoB,CAAuB;IAGrD,MAAM,CAAC,GAAmB;QACxB,OAAO;YACL;gBACE,KAAK,EAAE,qBAAqB;gBAC5B,IAAI,EAAE,GAAG,EAAE,CACT,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;AAlDC;IAAC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAE1C;IAAC,IAAA,iBAAM,GAAE;sCACe,8BAAmB;0DAAC;AAE5C;IAAC,IAAA,iBAAM,GAAE;sCACc,6BAAkB;yDAAC;AAE1C;IAAC,IAAA,iBAAM,GAAE;sCACuB,+BAAoB;kEAAC;AAErD;IAAC,IAAA,iBAAM,EAAC,MAAM,CAAC;;;;kDAqCd;AAlDU,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAmDhC;AAnDY,oDAAoB"}

package/lib/cjs/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const CliPluginOidcProviderModule_1 = require("./CliPluginOidcProviderModule");
-tslib_1.__exportStar(require("./hooks/OidcProviderInitHook"), exports);
-tslib_1.__exportStar(require("./utils/templateDir"), exports);
-exports.default = CliPluginOidcProviderModule_1.CliPluginOidcProviderModule;
-//# sourceMappingURL=index.js.map

package/lib/cjs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,+EAA0E;AAE1E,uEAA6C;AAC7C,8DAAoC;AAEpC,kBAAe,yDAA2B,CAAC"}

package/lib/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/lib/cjs/utils/templateDir.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEMPLATE_DIR = void 0;
-const cli_core_1 = require("@tsed/cli-core");
-exports.TEMPLATE_DIR = (0, cli_core_1.getTemplateDirectory)(__dirname);
-//# sourceMappingURL=templateDir.js.map

package/lib/cjs/utils/templateDir.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"templateDir.js","sourceRoot":"","sources":["../../../src/utils/templateDir.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AAEvC,QAAA,YAAY,GAAG,IAAA,+BAAoB,EAAC,SAAS,CAAC,CAAC"}

package/lib/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}