@tsed/oidc-provider 8.33.0 → 8.35.0

package/lib/esm/OidcModule.js

@@ -1,10 +1,10 @@
 import { __decorate } from "tslib";
-import { constant, inject, injector, Module } from "@tsed/di";
-import { PlatformApplication } from "@tsed/platform-http";
-import koaMount from "koa-mount";
+import { Module, constant, inject, injector } from "@tsed/di";
 import { OidcAdapters } from "./services/OidcAdapters.js";
 import { OidcJwks } from "./services/OidcJwks.js";
 import { OidcProvider } from "./services/OidcProvider.js";
+import { PlatformApplication } from "@tsed/platform-http";
+import koaMount from "koa-mount";
 let OidcModule = class OidcModule {
     constructor() {
         this.app = inject(PlatformApplication);

package/lib/esm/decorators/grantId.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
-import { Context } from "@tsed/platform-params";
 import { INTERACTION_GRANT_ID } from "../constants/constants.js";
+import { Context } from "@tsed/platform-params";
+import { useDecorators } from "@tsed/core";
 export function GrantId() {
     return useDecorators(Context(INTERACTION_GRANT_ID));
 }

package/lib/esm/decorators/interaction.js

@@ -1,6 +1,6 @@
+import { INTERACTION, INTERACTION_OPTIONS } from "../constants/constants.js";
 import { StoreMerge, useDecorators } from "@tsed/core";
 import { Controller } from "@tsed/di";
-import { INTERACTION, INTERACTION_OPTIONS } from "../constants/constants.js";
 /**
  * @Oidc
  */

package/lib/esm/decorators/interactions.js

@@ -1,9 +1,9 @@
 import { useDecorators } from "@tsed/core";
 import { Controller } from "@tsed/di";
-import { UseBefore } from "@tsed/platform-middlewares";
 import { INTERACTIONS } from "../constants/constants.js";
-import { OidcInteractionMiddleware } from "../middlewares/OidcInteractionMiddleware.js";
 import { NoCache } from "./noCache.js";
+import { OidcInteractionMiddleware } from "../middlewares/OidcInteractionMiddleware.js";
+import { UseBefore } from "@tsed/platform-middlewares";
 export function Interactions(options) {
     const { path } = options;
     return useDecorators(Controller({ path, children: options.children, subType: INTERACTIONS }), NoCache(), UseBefore(OidcInteractionMiddleware));

package/lib/esm/decorators/noCache.js

@@ -1,5 +1,5 @@
-import { UseBefore } from "@tsed/platform-middlewares";
 import { OidcNoCacheMiddleware } from "../middlewares/OidcNoCacheMiddleware.js";
+import { UseBefore } from "@tsed/platform-middlewares";
 export function NoCache() {
     return UseBefore(OidcNoCacheMiddleware);
 }

package/lib/esm/decorators/oidcCtx.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { Context } from "@tsed/platform-params";
 import { INTERACTION_CONTEXT } from "../constants/constants.js";
+import { useDecorators } from "@tsed/core";
 export function OidcCtx() {
     return useDecorators(Context(INTERACTION_CONTEXT));
 }

package/lib/esm/decorators/oidcSession.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { Context } from "@tsed/platform-params";
 import { INTERACTION_SESSION } from "../constants/constants.js";
+import { useDecorators } from "@tsed/core";
 /**
  * @decorator
  */

package/lib/esm/decorators/params.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { Context } from "@tsed/platform-params";
 import { INTERACTION_PARAMS } from "../constants/constants.js";
+import { useDecorators } from "@tsed/core";
 export function Params(expression) {
     return useDecorators(Context([INTERACTION_PARAMS, expression].filter(Boolean).join(".")));
 }

package/lib/esm/decorators/prompt.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { Context } from "@tsed/platform-params";
 import { INTERACTION_PROMPT } from "../constants/constants.js";
+import { useDecorators } from "@tsed/core";
 export function Prompt() {
     return useDecorators(Context(INTERACTION_PROMPT));
 }

package/lib/esm/decorators/uid.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { Context } from "@tsed/platform-params";
 import { INTERACTION_UID } from "../constants/constants.js";
+import { useDecorators } from "@tsed/core";
 export function Uid() {
     return useDecorators(Context(INTERACTION_UID));
 }

package/lib/esm/middlewares/OidcSecureMiddleware.js

@@ -1,8 +1,8 @@
 import { __decorate, __metadata, __param } from "tslib";
-import url from "node:url";
-import { BadRequest } from "@tsed/exceptions";
 import { Middleware } from "@tsed/platform-middlewares";
+import { BadRequest } from "@tsed/exceptions";
 import { Context } from "@tsed/platform-params";
+import url from "node:url";
 let OidcSecureMiddleware = class OidcSecureMiddleware {
     use(ctx) {
         const req = ctx.request;

package/lib/esm/services/OidcAdapters.js

@@ -1,6 +1,6 @@
 import { __decorate } from "tslib";
 import { Adapters } from "@tsed/adapters";
-import { constant, inject, Injectable } from "@tsed/di";
+import { Injectable, constant, inject } from "@tsed/di";
 let OidcAdapters = class OidcAdapters {
     constructor() {
         this.adapters = inject(Adapters);

package/lib/esm/services/OidcInteractionContext.js

@@ -1,13 +1,13 @@
 import { __decorate } from "tslib";
-import { Env } from "@tsed/core";
-import { constant, context, inject, Injectable } from "@tsed/di";
-import { Unauthorized } from "@tsed/exceptions";
-import omit from "lodash/omit.js";
 import { INTERACTION_CONTEXT, INTERACTION_DETAILS, INTERACTION_GRANT_ID, INTERACTION_PARAMS, INTERACTION_PROMPT, INTERACTION_SESSION, INTERACTION_UID } from "../constants/constants.js";
+import { Injectable, constant, context, inject } from "@tsed/di";
+import { Env } from "@tsed/core";
 import { OidcBadInteractionName } from "../domain/OidcBadInteractionName.js";
-import { debug } from "../utils/debug.js";
 import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcProvider } from "./OidcProvider.js";
+import { Unauthorized } from "@tsed/exceptions";
+import { debug } from "../utils/debug.js";
+import omit from "lodash/omit.js";
 let OidcInteractionContext = class OidcInteractionContext {
     constructor() {
         this.env = constant("env");

package/lib/esm/services/OidcInteractions.js

@@ -1,8 +1,8 @@
 import { __decorate } from "tslib";
-import { constant, Injectable, injector } from "@tsed/di";
+import { INTERACTION, INTERACTIONS, INTERACTION_OPTIONS } from "../constants/constants.js";
+import { Injectable, constant, injector } from "@tsed/di";
 import { PlatformHandler } from "@tsed/platform-http";
-import { EndpointMetadata } from "@tsed/schema";
-import { INTERACTION, INTERACTION_OPTIONS, INTERACTIONS } from "../constants/constants.js";
+import { s } from "@tsed/schema";
 let OidcInteractions = class OidcInteractions {
     constructor() {
         this.injector = injector();
@@ -35,7 +35,7 @@ let OidcInteractions = class OidcInteractions {
     getInteractionHandler(name) {
         const interaction = this.getInteractionProvider(name);
         if (interaction) {
-            const endpoint = EndpointMetadata.get(interaction.useClass, "$prompt");
+            const endpoint = s.store.method(interaction.useClass, "$prompt");
             return (ctx) => {
                 // Add current endpoint metadata to ctx
                 ctx.endpoint = endpoint;

package/lib/esm/services/OidcJwks.js

@@ -1,7 +1,7 @@
 import { __decorate } from "tslib";
-import { join } from "node:path";
-import { constant, Injectable } from "@tsed/di";
+import { Injectable, constant } from "@tsed/di";
 import { getJwks } from "@tsed/jwks";
+import { join } from "node:path";
 let OidcJwks = class OidcJwks {
     constructor() {
         this.jwksPath = constant("oidc.jwksPath", join(process.cwd(), "keys", "jwks.json"));

package/lib/esm/services/OidcPolicy.js

@@ -1,7 +1,7 @@
 import { __decorate } from "tslib";
-import { inject, Injectable, injector } from "@tsed/di";
-import { interactionPolicy } from "oidc-provider";
+import { Injectable, inject, injector } from "@tsed/di";
 import { OidcInteractions } from "./OidcInteractions.js";
+import { interactionPolicy } from "oidc-provider";
 let OidcPolicy = class OidcPolicy {
     constructor() {
         this.injector = injector();

package/lib/esm/services/OidcProvider.js

@@ -1,9 +1,9 @@
 import { __decorate } from "tslib";
 import { Env, setValue } from "@tsed/core";
-import { constant, context, inject, Injectable, InjectorService } from "@tsed/di";
-import { $asyncAlter } from "@tsed/hooks";
+import { Injectable, InjectorService, constant, context, inject } from "@tsed/di";
 import { PlatformApplication } from "@tsed/platform-http";
 import Provider from "oidc-provider";
+import { $asyncAlter } from "@tsed/hooks";
 import { INTERACTIONS } from "../constants/constants.js";
 import { OIDC_ERROR_EVENTS } from "../utils/events.js";
 import { OidcAdapters } from "./OidcAdapters.js";

package/lib/esm/utils/debug.js

@@ -1,6 +1,6 @@
-import qs from "node:querystring";
 import { inspect } from "node:util";
 import { isEmpty } from "@tsed/core";
+import qs from "node:querystring";
 const keys = new Set();
 function serialize(obj) {
     return Object.entries(obj).reduce((acc, [key, value]) => {

package/lib/types/OidcModule.d.ts

@@ -1,5 +1,5 @@
-import { PlatformApplication } from "@tsed/platform-http";
 import { OidcProvider } from "./services/OidcProvider.js";
+import { PlatformApplication } from "@tsed/platform-http";
 export declare class OidcModule {
     protected app: PlatformApplication;
     protected platformName: string | undefined;

package/lib/types/domain/InteractionMethods.d.ts

@@ -1,4 +1,4 @@
-import type { CanBePromise, interactionPolicy, KoaContextWithOIDC, UnknownObject } from "oidc-provider";
+import type { CanBePromise, KoaContextWithOIDC, UnknownObject, interactionPolicy } from "oidc-provider";
 export interface InteractionMethods {
     details?: (ctx: KoaContextWithOIDC) => CanBePromise<UnknownObject>;
     checks?: () => interactionPolicy.Check[];

package/lib/types/domain/OidcAccountsMethods.d.ts

@@ -1,5 +1,5 @@
-import type { Account } from "oidc-provider";
 import { AccessToken, AuthorizationCode, BackchannelAuthenticationRequest, DeviceCode } from "./interfaces.js";
+import type { Account } from "oidc-provider";
 export interface OidcAccountsMethods {
     findAccount(id: string, token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined): Promise<Account | undefined>;
 }

package/lib/types/domain/OidcInteractionOptions.d.ts

@@ -1,4 +1,4 @@
-import type { CanBePromise, interactionPolicy, KoaContextWithOIDC, UnknownObject } from "oidc-provider";
+import type { CanBePromise, KoaContextWithOIDC, UnknownObject, interactionPolicy } from "oidc-provider";
 export interface OidcInteractionOptions {
     name: string;
     requestable?: boolean | undefined;

package/lib/types/domain/OidcInteractionPromptProps.d.ts

@@ -1,5 +1,5 @@
-import type { UnknownObject } from "oidc-provider";
 import { OidcClient } from "./interfaces.js";
+import type { UnknownObject } from "oidc-provider";
 export type OidcInteractionPromptProps<Props = Record<string, any>> = {
     client: OidcClient;
     uid: string;

package/lib/types/domain/OidcSettings.d.ts

@@ -1,8 +1,8 @@
 import type { Adapter } from "@tsed/adapters";
-import type { Type } from "@tsed/core";
-import type { JwksKeyParameters } from "@tsed/jwks";
 import type { Configuration } from "oidc-provider";
+import type { JwksKeyParameters } from "@tsed/jwks";
 import type { OidcAccountsMethods } from "./OidcAccountsMethods.js";
+import type { Type } from "@tsed/core";
 export interface OidcSettings extends Configuration {
     /**
      * force the secure cookie. By default, in dev mode it's disabled and in production it's enabled.

package/lib/types/services/OidcAdapters.d.ts

@@ -1,5 +1,5 @@
 import { Adapter, Adapters } from "@tsed/adapters";
-import type { Adapter as OidcAdapter, AdapterConstructor } from "oidc-provider";
+import type { AdapterConstructor, Adapter as OidcAdapter } from "oidc-provider";
 export type OidcAdapterMethods<Model = any> = Adapter<Model> & Partial<Omit<OidcAdapter, "upsert">>;
 export declare class OidcAdapters {
     protected adapters: Adapters;

package/lib/types/services/OidcInteractionContext.d.ts

@@ -1,11 +1,11 @@
-import { Env } from "@tsed/core";
-import { PlatformContext } from "@tsed/platform-http";
-import type { Account, default as Provider, InteractionResults, PromptDetail } from "oidc-provider";
-import { OidcSession } from "../decorators/oidcSession.js";
+import type { Account, InteractionResults, PromptDetail, default as Provider } from "oidc-provider";
 import { OidcClient, OidcInteraction } from "../domain/interfaces.js";
+import { Env } from "@tsed/core";
 import { OidcInteractionPromptProps } from "../domain/OidcInteractionPromptProps.js";
 import { OidcInteractions } from "./OidcInteractions.js";
 import { OidcProvider } from "./OidcProvider.js";
+import { OidcSession } from "../decorators/oidcSession.js";
+import { PlatformContext } from "@tsed/platform-http";
 export declare class OidcInteractionContext {
     protected env: Env | undefined;
     protected oidcProvider: OidcProvider;

package/lib/types/services/OidcInteractions.d.ts

@@ -1,6 +1,6 @@
-import { Env } from "@tsed/core";
 import { Provider } from "@tsed/di";
 import { PlatformContext } from "@tsed/platform-http";
+import { Env } from "@tsed/core";
 export declare class OidcInteractions {
     protected injector: import("@tsed/di").InjectorService;
     protected env: Env | undefined;

package/lib/types/services/OidcPolicy.d.ts

@@ -1,7 +1,7 @@
-import { interactionPolicy } from "oidc-provider";
 import { InteractionMethods } from "../domain/InteractionMethods.js";
 import { OidcInteractionOptions } from "../domain/OidcInteractionOptions.js";
 import { OidcInteractions } from "./OidcInteractions.js";
+import { interactionPolicy } from "oidc-provider";
 import Prompt = interactionPolicy.Prompt;
 export declare class OidcPolicy {
     protected injector: import("@tsed/di").InjectorService;

package/lib/types/services/OidcProvider.d.ts

@@ -2,10 +2,10 @@ import { Env } from "@tsed/core";
 import { InjectorService } from "@tsed/di";
 import { PlatformApplication, PlatformContext } from "@tsed/platform-http";
 import Provider, { type Configuration } from "oidc-provider";
-import { OidcSettings } from "../domain/OidcSettings.js";
 import { OidcAdapters } from "./OidcAdapters.js";
 import { OidcJwks } from "./OidcJwks.js";
 import { OidcPolicy } from "./OidcPolicy.js";
+import { OidcSettings } from "../domain/OidcSettings.js";
 export declare class OidcProvider {
     raw: Provider;
     protected env: Env | undefined;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@tsed/oidc-provider",
+  "version": "8.35.0",
   "description": "OIDC provider package for Ts.ED framework",
-  "type": "module",
-  "version": "8.33.0",
   "source": "./src/index.ts",
+  "type": "module",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
@@ -24,7 +24,7 @@
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "dependencies": {
-    "@tsed/adapters": "8.33.0",
+    "@tsed/adapters": "8.35.0",
     "express-urlrewrite": "^2.0.3",
     "jose2": "npm:jose@^2.0.4",
     "koa-mount": "^4.0.0",
@@ -34,18 +34,17 @@
     "uuid": "^14.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.33.0",
-    "@tsed/core": "8.33.0",
-    "@tsed/di": "8.33.0",
-    "@tsed/exceptions": "8.33.0",
-    "@tsed/jwks": "8.33.0",
-    "@tsed/platform-http": "8.33.0",
-    "@tsed/typescript": "8.33.0",
+    "@tsed/barrels": "8.35.0",
+    "@tsed/core": "8.35.0",
+    "@tsed/di": "8.35.0",
+    "@tsed/exceptions": "8.35.0",
+    "@tsed/jwks": "8.35.0",
+    "@tsed/platform-http": "8.35.0",
+    "@tsed/typescript": "8.35.0",
     "@types/lowdb": "1.0.15",
     "@types/oidc-provider": "8.5.2",
     "@types/uuid": "10.0.0",
     "cross-env": "7.0.3",
-    "eslint": "9.12.0",
     "lowdb": "7.0.1",
     "oidc-provider": "9.6.0",
     "typescript": "6.0.2",