@tsed/oidc-provider-plugin-wildcard-redirect-uri 8.0.0-alpha.4 → 8.0.0-alpha.6

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@tsed/oidc-provider-plugin-wildcard-redirect-uri",
   "description": "A plugin to support wildcard in the redirect uri whitelist",
-  "type": "commonjs",
-  "version": "8.0.0-alpha.4",
+  "type": "module",
+  "version": "8.0.0-alpha.6",
   "source": "./src/index.ts",
-  "main": "./lib/cjs/index.js",
+  "main": "./lib/esm/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/cjs/index.js"
     }
   },
@@ -28,11 +27,11 @@
     "wildcard": "2.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.0.0-alpha.4",
-    "@tsed/core": "8.0.0-alpha.4",
-    "@tsed/di": "8.0.0-alpha.4",
-    "@tsed/oidc-provider": "8.0.0-alpha.4",
-    "@tsed/typescript": "8.0.0-alpha.4",
+    "@tsed/barrels": "8.0.0-alpha.6",
+    "@tsed/core": "8.0.0-alpha.6",
+    "@tsed/di": "8.0.0-alpha.6",
+    "@tsed/oidc-provider": "8.0.0-alpha.6",
+    "@tsed/typescript": "8.0.0-alpha.6",
     "@types/psl": "^1.1.3",
     "@types/uuid": "9.0.8",
     "eslint": "^8.57.0",
@@ -40,10 +39,10 @@
     "vitest": "2.0.4"
   },
   "peerDependencies": {
-    "@tsed/core": "8.0.0-alpha.4",
-    "@tsed/di": "8.0.0-alpha.4",
+    "@tsed/core": "8.0.0-alpha.6",
+    "@tsed/di": "8.0.0-alpha.6",
     "@tsed/logger": ">=6.7.5",
-    "@tsed/oidc-provider": "8.0.0-alpha.4",
+    "@tsed/oidc-provider": "8.0.0-alpha.6",
     "oidc-provider": ">=8.0.0"
   },
   "peerDependenciesMeta": {

package/lib/cjs/OidcWildcardRedirectUriModule.js

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OidcWildcardRedirectUriModule = void 0;
-const tslib_1 = require("tslib");
-const di_1 = require("@tsed/di");
-const logger_1 = require("@tsed/logger");
-const oidc_provider_1 = require("@tsed/oidc-provider");
-// @ts-ignore
-const psl_1 = tslib_1.__importDefault(require("psl"));
-const wildcardRedirectUriAllowed_js_1 = require("./utils/wildcardRedirectUriAllowed.js");
-let OidcWildcardRedirectUriModule = class OidcWildcardRedirectUriModule {
-    constructor(module) {
-        this.module = module;
-    }
-    $onCreateOIDC(provider) {
-        if (this.enabled) {
-            const { redirectUriAllowed, postLogoutRedirectUriAllowed } = provider.Client.prototype;
-            provider.Client.prototype.redirectUriAllowed = (0, wildcardRedirectUriAllowed_js_1.wildcardRedirectUriAllowed)(redirectUriAllowed, "redirectUris");
-            provider.Client.prototype.postLogoutRedirectUriAllowed = (0, wildcardRedirectUriAllowed_js_1.wildcardRedirectUriAllowed)(postLogoutRedirectUriAllowed, "postLogoutRedirectUris");
-            this.logger.warn("⚠️⚠️⚠️ OIDC Wildcard Uris plugin is ENABLED ⚠️⚠️⚠️");
-        }
-    }
-    $alterOidcConfiguration(config) {
-        if (this.enabled) {
-            const actualProperties = config?.extraClientMetadata?.properties || [];
-            config.extraClientMetadata = {
-                properties: [...actualProperties, "redirect_uris", "post_logout_redirect_uris"],
-                validator: this.validator.bind(this)
-            };
-        }
-        return Promise.resolve(config);
-    }
-    validator(ctx, key, value) {
-        if (key === "redirect_uris") {
-            for (const redirectUri of value) {
-                if (redirectUri.includes("*")) {
-                    const { hostname, href } = new URL(redirectUri);
-                    if (href.split("*").length !== 2) {
-                        throw new this.module.errors.InvalidClientMetadata("redirect_uris with a wildcard may only contain a single one");
-                    }
-                    if (!hostname.includes("*")) {
-                        throw new this.module.errors.InvalidClientMetadata("redirect_uris may only have a wildcard in the hostname");
-                    }
-                    if (!psl_1.default.get(hostname.split("*.")[1])) {
-                        throw new this.module.errors.InvalidClientMetadata("redirect_uris with a wildcard must not match an eTLD+1 of a known public suffix domain");
-                    }
-                }
-            }
-        }
-        else if (key === "post_logout_redirect_uris") {
-            for (const postLogoutRedirectUri of value) {
-                if (postLogoutRedirectUri.includes("*")) {
-                    const { hostname, href } = new URL(postLogoutRedirectUri);
-                    if (href.split("*").length !== 2) {
-                        throw new this.module.errors.InvalidClientMetadata("post_logout_redirect_uris with a wildcard may only contain a single one");
-                    }
-                    if (!hostname.includes("*")) {
-                        throw new this.module.errors.InvalidClientMetadata("post_logout_redirect_uris may only have a wildcard in the hostname");
-                    }
-                    if (!psl_1.default.get(hostname.split("*.")[1])) {
-                        throw new this.module.errors.InvalidClientMetadata("post_logout_redirect_uris with a wildcard must not match an eTLD+1 of a known public suffix domain");
-                    }
-                }
-            }
-        }
-    }
-};
-tslib_1.__decorate([
-    (0, di_1.Constant)("oidc.plugins.wildcard.enabled", false),
-    tslib_1.__metadata("design:type", Boolean)
-], OidcWildcardRedirectUriModule.prototype, "enabled", void 0);
-tslib_1.__decorate([
-    (0, di_1.Inject)(logger_1.Logger),
-    tslib_1.__metadata("design:type", logger_1.Logger)
-], OidcWildcardRedirectUriModule.prototype, "logger", void 0);
-OidcWildcardRedirectUriModule = tslib_1.__decorate([
-    (0, di_1.Module)(),
-    tslib_1.__param(0, (0, di_1.Inject)(oidc_provider_1.OIDC_PROVIDER_NODE_MODULE)),
-    tslib_1.__metadata("design:paramtypes", [Object])
-], OidcWildcardRedirectUriModule);
-exports.OidcWildcardRedirectUriModule = OidcWildcardRedirectUriModule;
-//# sourceMappingURL=OidcWildcardRedirectUriModule.js.map

package/lib/cjs/OidcWildcardRedirectUriModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OidcWildcardRedirectUriModule.js","sourceRoot":"","sources":["../../src/OidcWildcardRedirectUriModule.ts"],"names":[],"mappings":";;;;AAAA,iCAAkD;AAClD,yCAAoC;AACpC,uDAA4E;AAG5E,aAAa;AACb,sDAAsB;AACtB,yFAAiF;AAa1E,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAOxC,YAAyD,MAAiC;QAAjC,WAAM,GAAN,MAAM,CAA2B;IAAG,CAAC;IAE9F,aAAa,CAAC,QAAkB;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,EAAC,kBAAkB,EAAE,4BAA4B,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YACrF,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,GAAG,IAAA,0DAA0B,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;YAC9G,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,4BAA4B,GAAG,IAAA,0DAA0B,EACjF,4BAA4B,EAC5B,wBAAwB,CACzB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;SACxE;IACH,CAAC;IAED,uBAAuB,CAAC,MAAoB;QAC1C,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,gBAAgB,GAAG,MAAM,EAAE,mBAAmB,EAAE,UAAU,IAAI,EAAE,CAAC;YAEvE,MAAM,CAAC,mBAAmB,GAAG;gBAC3B,UAAU,EAAE,CAAC,GAAG,gBAAgB,EAAE,eAAe,EAAE,2BAA2B,CAAC;gBAC/E,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;aACrC,CAAC;SACH;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,GAAuB,EAAE,GAAW,EAAE,KAAU;QACxD,IAAI,GAAG,KAAK,eAAe,EAAE;YAC3B,KAAK,MAAM,WAAW,IAAI,KAAK,EAAE;gBAC/B,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC7B,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;oBAE9C,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;wBAChC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,6DAA6D,CAAC,CAAC;qBACnH;oBAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBAC3B,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,wDAAwD,CAAC,CAAC;qBAC9G;oBAED,IAAI,CAAC,aAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;wBACrC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAChD,wFAAwF,CACzF,CAAC;qBACH;iBACF;aACF;SACF;aAAM,IAAI,GAAG,KAAK,2BAA2B,EAAE;YAC9C,KAAK,MAAM,qBAAqB,IAAI,KAAK,EAAE;gBACzC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACvC,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;oBAExD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;wBAChC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,yEAAyE,CAAC,CAAC;qBAC/H;oBAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBAC3B,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,oEAAoE,CAAC,CAAC;qBAC1H;oBAED,IAAI,CAAC,aAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;wBACrC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAChD,oGAAoG,CACrG,CAAC;qBACH;iBACF;aACF;SACF;IACH,CAAC;CACF,CAAA;AA7EC;IAAC,IAAA,aAAQ,EAAC,+BAA+B,EAAE,KAAK,CAAC;;8DACvB;AAE1B;IAAC,IAAA,WAAM,EAAC,eAAM,CAAC;sCACG,eAAM;6DAAC;AALd,6BAA6B;IADzC,IAAA,WAAM,GAAE;IAQM,mBAAA,IAAA,WAAM,EAAC,yCAAyB,CAAC,CAAA;;GAPnC,6BAA6B,CA8EzC;AA9EY,sEAA6B"}

package/lib/cjs/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-/**
- * @file Automatically generated by @tsed/barrels.
- */
-tslib_1.__exportStar(require("./OidcWildcardRedirectUriModule.js"), exports);
-tslib_1.__exportStar(require("./utils/wildcardRedirectUriAllowed.js"), exports);
-//# 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;;GAEG;AACH,6EAAmD;AACnD,gFAAsD"}

package/lib/cjs/package.json

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

package/lib/cjs/utils/wildcardRedirectUriAllowed.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wildcardRedirectUriAllowed = void 0;
-const tslib_1 = require("tslib");
-// @ts-ignore
-const wildcard_1 = tslib_1.__importDefault(require("wildcard"));
-const hasWildcardHost = (redirectUri) => {
-    const { hostname } = new URL(redirectUri);
-    return hostname.includes("*");
-};
-const wildcardMatches = (redirectUri, wildcardUri) => !!(0, wildcard_1.default)(wildcardUri, redirectUri);
-function wildcardRedirectUriAllowed(originalRedirectUriAllowed, redirectUriOrPostLogoutRedirectUri) {
-    return function (redirectUri) {
-        if (this[redirectUriOrPostLogoutRedirectUri].some(hasWildcardHost)) {
-            const wildcardUris = this[redirectUriOrPostLogoutRedirectUri].filter(hasWildcardHost);
-            return wildcardUris.some(wildcardMatches.bind(undefined, redirectUri)) || originalRedirectUriAllowed.call(this, redirectUri);
-        }
-        return originalRedirectUriAllowed.call(this, redirectUri);
-    };
-}
-exports.wildcardRedirectUriAllowed = wildcardRedirectUriAllowed;
-//# sourceMappingURL=wildcardRedirectUriAllowed.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"wildcardRedirectUriAllowed.js","sourceRoot":"","sources":["../../../src/utils/wildcardRedirectUriAllowed.ts"],"names":[],"mappings":";;;;AAAA,aAAa;AACb,gEAAgC;AAEhC,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,EAAE;IAC9C,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IACxC,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,WAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAA,kBAAQ,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAE3G,SAAgB,0BAA0B,CAAC,0BAA+B,EAAE,kCAA6E;IACvJ,OAAO,UAAU,WAAmB;QAClC,IAAI,IAAI,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YAClE,MAAM,YAAY,GAAG,IAAI,CAAC,kCAAkC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACtF,OAAO,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SAC9H;QACD,OAAO,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AARD,gEAQC"}

package/lib/esm/package.json

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

package/lib/types-esm/OidcWildcardRedirectUriModule.d.ts

@@ -1,21 +0,0 @@
-import { Logger } from "@tsed/logger";
-import { OIDC_PROVIDER_NODE_MODULE, OidcSettings } from "@tsed/oidc-provider";
-import type { default as Provider, KoaContextWithOIDC } from "oidc-provider";
-declare global {
-    namespace TsED {
-        interface OIDCPluginSettings {
-            wildcard: {
-                enabled?: boolean;
-            };
-        }
-    }
-}
-export declare class OidcWildcardRedirectUriModule {
-    protected module: OIDC_PROVIDER_NODE_MODULE;
-    readonly enabled: boolean;
-    protected logger: Logger;
-    constructor(module: OIDC_PROVIDER_NODE_MODULE);
-    $onCreateOIDC(provider: Provider): void;
-    $alterOidcConfiguration(config: OidcSettings): Promise<OidcSettings>;
-    validator(ctx: KoaContextWithOIDC, key: string, value: any): void;
-}

package/lib/types-esm/index.d.ts

@@ -1,5 +0,0 @@
-/**
- * @file Automatically generated by @tsed/barrels.
- */
-export * from "./OidcWildcardRedirectUriModule.js";
-export * from "./utils/wildcardRedirectUriAllowed.js";

package/lib/types-esm/utils/wildcardRedirectUriAllowed.d.ts

@@ -1 +0,0 @@
-export declare function wildcardRedirectUriAllowed(originalRedirectUriAllowed: any, redirectUriOrPostLogoutRedirectUri: "redirectUris" | "postLogoutRedirectUris"): (redirectUri: string) => any;