@authup/server-core 1.0.0-beta.19 → 1.0.0-beta.20

package/dist/http/controllers/root/base/handlers/register.js

@@ -8,40 +8,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthRegisterRequestValidator = void 0;
 exports.createAuthRegisterRouteHandler = createAuthRegisterRouteHandler;
+const adapter_routup_1 = require("@validup/adapter-routup");
 const node_crypto_1 = require("node:crypto");
-const core_kit_1 = require("@authup/core-kit");
 const http_1 = require("@ebec/http");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const server_kit_1 = require("@authup/server-kit");
+const validup_1 = require("validup");
 const core_1 = require("../../../../../core");
 const domains_1 = require("../../../../../domains");
 const config_1 = require("../../../../../config");
-class AuthRegisterRequestValidator extends core_1.RequestValidator {
-    constructor() {
-        super();
-        this.add('email')
-            .exists()
-            .notEmpty()
-            .isEmail();
-        this.add('name')
-            .exists()
-            .custom((value) => {
-            const isValid = (0, core_kit_1.isValidUserName)(value);
-            if (!isValid) {
-                throw new http_1.BadRequestError('Only the characters [a-z0-9-_]+ are allowed.');
-            }
-            return isValid;
-        })
-            .optional({ nullable: true });
-        this.add('password')
-            .exists()
-            .notEmpty()
-            .isLength({ min: 5, max: 512 });
-        this.add('realm_id')
-            .exists()
-            .isUUID()
-            .optional({ nullable: true });
+const env_1 = require("../../../../../env");
+const user_1 = require("../../../user");
+class AuthRegisterRequestValidator extends validup_1.Container {
+    constructor(options = {}) {
+        super(options);
+        this.mount(new user_1.UserRequestValidator({
+            pathsToInclude: ['email', 'name', 'password', 'realm_id'],
+        }));
     }
 }
 exports.AuthRegisterRequestValidator = AuthRegisterRequestValidator;
@@ -56,20 +40,25 @@ async function createAuthRegisterRouteHandler(req, res) {
         throw new http_1.BadRequestError('SMTP options are not defined.');
     }
     const validator = new AuthRegisterRequestValidator();
-    const data = await validator.execute(req);
+    const validatorWrapper = new adapter_routup_1.RoutupContainerAdapter(validator);
+    const data = await validatorWrapper.run(req);
+    const dataSource = await (0, typeorm_extension_1.useDataSource)();
+    await (0, typeorm_extension_1.validateEntityJoinColumns)(data, {
+        dataSource,
+        entityTarget: domains_1.UserEntity,
+    });
     data.name ?? (data.name = data.email);
     if (config.emailVerification) {
         data.active = false;
         data.activate_hash = (0, node_crypto_1.randomBytes)(32).toString('hex'); // todo: create random bytes to hex
     }
-    const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = new domains_1.UserRepository(dataSource);
     const { entity } = await repository.createWithPassword(data);
     const realm = await (0, domains_1.resolveRealm)(entity.realm_id, true);
     entity.realm_id = realm.id;
     await repository.save(entity);
     if (config.emailVerification &&
-        config.env !== config_1.EnvironmentName.TEST) {
+        config.env !== env_1.EnvironmentName.TEST) {
         if (!(0, core_1.isSMTPClientUsable)()) {
             throw new http_1.BadRequestError('Email verification is not possible.');
         }

package/dist/http/controllers/root/base/handlers/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/root/jwks/handlers/read.js

@@ -44,7 +44,7 @@ async function getJwksRouteHandler(req, res) {
     });
 }
 async function getJwkRouteHandler(req, res) {
-    const id = (0, request_1.useRequestIDParam)(req);
+    const id = (0, request_1.useRequestParamID)(req);
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.KeyEntity);
     const entity = await repository.findOne({

package/dist/http/controllers/root/token/handlers/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAahD;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAmDf"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAahD;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAuDf"}

package/dist/http/controllers/root/token/handlers/create.js

@@ -10,7 +10,6 @@ exports.createTokenRouteHandler = createTokenRouteHandler;
 const core_http_kit_1 = require("@authup/core-http-kit");
 const kit_1 = require("@authup/kit");
 const cookie_1 = require("@routup/basic/cookie");
-const node_url_1 = require("node:url");
 const routup_1 = require("routup");
 const config_1 = require("../../../../../config");
 const oauth2_1 = require("../../../../oauth2");
@@ -52,8 +51,13 @@ async function createTokenRouteHandler(req, res) {
     const config = (0, config_1.useConfig)();
     const tokenResponse = await grant.run(req);
     const cookieOptions = {};
-    if (config.env === config_1.EnvironmentName.PRODUCTION) {
-        cookieOptions.domain = new node_url_1.URL(config.publicUrl).hostname;
+    if (config.cookieDomain) {
+        cookieOptions.domain = config.cookieDomain;
+    }
+    else {
+        cookieOptions.domain = (0, routup_1.getRequestHostName)(req, {
+            trustProxy: true,
+        });
     }
     (0, cookie_1.setResponseCookie)(res, core_http_kit_1.CookieName.ACCESS_TOKEN, tokenResponse.access_token, {
         ...cookieOptions,

package/dist/http/controllers/root/token/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA+BH,0DAsDC;AAjFD,yDAAmD;AACnD,qCAEqB;AAErB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAmE;AAEnE,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,gBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,sBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,wBAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,0BAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,0BAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA4BH,0DA0DC;AApFD,yDAAmD;AAGnD,qCAA2D;AAE3D,iDAAyD;AAEzD,mCAAkD;AAClD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,gBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,sBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,sBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACtB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;IAC/C,CAAC;SAAM,CAAC;QACJ,aAAa,CAAC,MAAM,GAAG,IAAA,2BAAkB,EAAC,GAAG,EAAE;YAC3C,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;IACP,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,0BAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,0BAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC"}

package/dist/http/controllers/root/token/handlers/introspect.d.ts

@@ -1,6 +1,6 @@
 import type { Request, Response } from 'routup';
-import { RequestValidator } from '../../../../../core';
-export declare class TokenIntrospectRequestValidator extends RequestValidator<{
+import { Container } from 'validup';
+export declare class TokenIntrospectRequestValidator extends Container<{
     token: string;
 }> {
     constructor();

package/dist/http/controllers/root/token/handlers/introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"introspect.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,qBAAqB,CAAC;AAOpF,qBAAa,+BAAgC,SAAQ,gBAAgB,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;;CAiBvF;AAED,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAqBf"}
+{"version":3,"file":"introspect.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAA6C,MAAM,SAAS,CAAC;AAQ/E,qBAAa,+BAAgC,SAAQ,SAAS,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;;CAUhF;AAED,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAuCf"}

package/dist/http/controllers/root/token/handlers/introspect.js

@@ -8,34 +8,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenIntrospectRequestValidator = void 0;
 exports.introspectTokenRouteHandler = introspectTokenRouteHandler;
+const adapter_validator_1 = require("@validup/adapter-validator");
 const routup_1 = require("routup");
-const core_1 = require("../../../../../core");
+const validup_1 = require("validup");
+const adapter_routup_1 = require("@validup/adapter-routup");
 const oauth2_1 = require("../../../../oauth2");
-const utils_1 = require("../../../../utils");
-class TokenIntrospectRequestValidator extends core_1.RequestValidator {
+const request_1 = require("../../../../request");
+class TokenIntrospectRequestValidator extends validup_1.Container {
     constructor() {
         super();
-        const chains = [
-            this.createFor('token', core_1.RequestValidatorFieldSource.BODY),
-            this.createFor('token', core_1.RequestValidatorFieldSource.QUERY),
-            this.createFor('token', core_1.RequestValidatorFieldSource.PARAMS),
-            // todo: this might not work due routup context
-        ].map((chain) => chain
+        this.mount('token', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .notEmpty()
             .isString()
-            .isLength({ min: 16, max: 2048 }));
-        this.addOneOf(chains);
+            .isLength({ min: 16, max: 2048 })));
     }
 }
 exports.TokenIntrospectRequestValidator = TokenIntrospectRequestValidator;
 async function introspectTokenRouteHandler(req, res) {
     const validator = new TokenIntrospectRequestValidator();
-    const data = await validator.execute(req);
-    if (!data.token) {
-        data.token = (0, utils_1.useRequestEnv)(req, 'token');
+    const validatorAdapter = new adapter_routup_1.RoutupContainerAdapter(validator);
+    let token;
+    try {
+        const data = await validatorAdapter.run(req, {
+            locations: ['body', 'query', 'params'],
+        });
+        token = data.token;
     }
-    const payload = await (0, oauth2_1.readOAuth2TokenPayload)(data.token);
+    catch (e) {
+        token = (0, request_1.useRequestEnv)(req, 'token');
+    }
+    if (!token) {
+        const validatorError = new validup_1.ValidupValidatorError({
+            path: 'token',
+            pathAbsolute: 'token',
+        });
+        throw new validup_1.ValidupNestedError({
+            children: [validatorError],
+        });
+    }
+    const payload = await (0, oauth2_1.readOAuth2TokenPayload)(token);
     const permissions = await (0, oauth2_1.loadOAuth2SubPermissions)(payload.sub_kind, payload.sub, payload.scope);
     const output = {
         active: true,

package/dist/http/controllers/root/token/handlers/introspect.js.map

@@ -1 +1 @@
-{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAgCH,kEAwBC;AApDD,mCAA8B;AAE9B,8CAAoF;AACpF,+CAG4B;AAC5B,6CAAkD;AAElD,MAAa,+BAAgC,SAAQ,uBAAmC;IACpF;QACI,KAAK,EAAE,CAAC;QAER,MAAM,MAAM,GAA8B;YACtC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,IAAI,CAAC;YACzD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,KAAK,CAAC;YAC1D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,MAAM,CAAC;YAC3D,+CAA+C;SAClD,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACjB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;CACJ;AAjBD,0EAiBC;AAEM,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAI,+BAA+B,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAsC;QAC9C,MAAM,EAAE,IAAI;QACZ,WAAW;QACX,GAAG,OAAO;QACV,GAAG,IAAA,yCAAgC,EAC/B,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,4BAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E;KACJ,CAAC;IAEF,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AA0BH,kEA0CC;AAjED,kEAA6D;AAE7D,mCAA8B;AAC9B,qCAA+E;AAC/E,4DAAiE;AACjE,+CAG4B;AAC5B,iDAAoD;AAEpD,MAAa,+BAAgC,SAAQ,mBAA4B;IAC7E;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aAC/C,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;CACJ;AAVD,0EAUC;AAEM,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAI,+BAA+B,EAAE,CAAC;IACxD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,IAAI,KAA0B,CAAC;IAC/B,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;YACzC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SACzC,CAAC,CAAC;QAEH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,KAAK,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,cAAc,GAAG,IAAI,+BAAqB,CAAC;YAC7C,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,OAAO;SACxB,CAAC,CAAC;QAEH,MAAM,IAAI,4BAAkB,CAAC;YACzB,QAAQ,EAAE,CAAC,cAAc,CAAC;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAsC;QAC9C,MAAM,EAAE,IAAI;QACZ,WAAW;QACX,GAAG,OAAO;QACV,GAAG,IAAA,yCAAgC,EAC/B,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,4BAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E;KACJ,CAAC;IAEF,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}

package/dist/http/controllers/scope/handlers/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/delete.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAqCxF"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/delete.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAgCxF"}

package/dist/http/controllers/scope/handlers/delete.js

@@ -13,26 +13,22 @@ const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../../domains");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
 async function deleteScopeRouteHandler(req, res) {
-    const id = (0, request_1.useRequestIDParam)(req);
-    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
-    if (!ability.has(core_kit_1.PermissionName.SCOPE_DELETE)) {
-        throw new http_1.ForbiddenError();
-    }
+    const id = (0, request_1.useRequestParamID)(req);
+    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    await permissionChecker.preCheck({ name: core_kit_1.PermissionName.SCOPE_DELETE });
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.ScopeEntity);
     const entity = await repository.findOneBy({ id });
     if (!entity) {
         throw new http_1.NotFoundError();
     }
-    if (!ability.can(core_kit_1.PermissionName.SCOPE_DELETE, { attributes: entity })) {
-        throw new http_1.ForbiddenError();
-    }
-    // ----------------------------------------------
-    if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.realm_id)) {
-        throw new http_1.ForbiddenError();
-    }
+    await permissionChecker.check({
+        name: core_kit_1.PermissionName.SCOPE_DELETE,
+        data: {
+            attributes: entity,
+        },
+    });
     // ----------------------------------------------
     const { id: entityId } = entity;
     await repository.remove(entity);

package/dist/http/controllers/scope/handlers/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAWH,0DAqCC;AA9CD,qCAA2D;AAC3D,+CAA2E;AAE3E,mCAAsC;AACtC,yDAAkD;AAClD,iDAAkD;AAClD,8CAAqD;AACrD,0CAA+C;AAExC,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,0DAgCC;AAxCD,qCAA2C;AAC3C,+CAAkD;AAElD,mCAAsC;AACtC,yDAAkD;AAClD,iDAAkD;AAClD,8CAAoE;AAE7D,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,YAAY,EAAE,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,YAAY;QACjC,IAAI,EAAE;YACF,UAAU,EAAE,MAAM;SACrB;KACJ,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC"}

package/dist/http/controllers/scope/handlers/index.d.ts

@@ -1,5 +1,4 @@
-export * from './create';
 export * from './delete';
 export * from './read';
-export * from './update';
+export * from './write';
 //# sourceMappingURL=index.d.ts.map

package/dist/http/controllers/scope/handlers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/http/controllers/scope/handlers/index.js

@@ -20,8 +20,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./create"), exports);
 __exportStar(require("./delete"), exports);
 __exportStar(require("./read"), exports);
-__exportStar(require("./update"), exports);
+__exportStar(require("./write"), exports);
 //# sourceMappingURL=index.js.map

package/dist/http/controllers/scope/handlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB"}

package/dist/http/controllers/scope/handlers/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/read.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAYhD,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA+CzF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAkDxF"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/read.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWhD,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAgDzF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAmDxF"}

package/dist/http/controllers/scope/handlers/read.js

@@ -16,14 +16,15 @@ const typeorm_extension_1 = require("typeorm-extension");
 const http_1 = require("@ebec/http");
 const domains_1 = require("../../../../domains");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
 async function getManyScopeRouteHandler(req, res) {
-    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
-    if (!ability.has(core_kit_1.PermissionName.SCOPE_READ) &&
-        !ability.has(core_kit_1.PermissionName.SCOPE_UPDATE) &&
-        !ability.has(core_kit_1.PermissionName.SCOPE_DELETE)) {
-        throw new http_1.ForbiddenError();
-    }
+    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    await permissionChecker.preCheckOneOf({
+        name: [
+            core_kit_1.PermissionName.SCOPE_READ,
+            core_kit_1.PermissionName.SCOPE_UPDATE,
+            core_kit_1.PermissionName.SCOPE_DELETE,
+        ],
+    });
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.ScopeEntity);
     const query = repository.createQueryBuilder('scope');
@@ -34,6 +35,7 @@ async function getManyScopeRouteHandler(req, res) {
                 'id',
                 'built_in',
                 'name',
+                'display_name',
                 'description',
                 'realm_id',
                 'created_at',
@@ -60,14 +62,16 @@ async function getManyScopeRouteHandler(req, res) {
     });
 }
 async function getOneScopeRouteHandler(req, res) {
-    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
-    if (!ability.has(core_kit_1.PermissionName.SCOPE_READ) &&
-        !ability.has(core_kit_1.PermissionName.SCOPE_UPDATE) &&
-        !ability.has(core_kit_1.PermissionName.SCOPE_DELETE)) {
-        throw new http_1.ForbiddenError();
-    }
-    const id = (0, request_1.useRequestIDParam)(req, {
-        strict: false,
+    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    await permissionChecker.preCheckOneOf({
+        name: [
+            core_kit_1.PermissionName.SCOPE_READ,
+            core_kit_1.PermissionName.SCOPE_UPDATE,
+            core_kit_1.PermissionName.SCOPE_DELETE,
+        ],
+    });
+    const id = (0, request_1.useRequestParamID)(req, {
+        isUUID: false,
     });
     const fields = (0, query_1.useRequestQuery)(req, 'fields');
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
@@ -89,6 +93,7 @@ async function getOneScopeRouteHandler(req, res) {
             'id',
             'built_in',
             'name',
+            'display_name',
             'description',
             'realm_id',
             'created_at',

package/dist/http/controllers/scope/handlers/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/read.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/scope/handlers/write.d.ts

@@ -0,0 +1,5 @@
+import type { Request, Response } from 'routup';
+export declare function writeScopeRouteHandler(req: Request, res: Response, options?: {
+    updateOnly?: boolean;
+}): Promise<any>;
+//# sourceMappingURL=write.d.ts.map

package/dist/http/controllers/scope/handlers/write.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/write.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAiBhD,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,OAAO,GAAE;IACL,UAAU,CAAC,EAAE,OAAO,CAAA;CAClB,GACN,OAAO,CAAC,GAAG,CAAC,CAwGf"}

package/dist/http/controllers/scope/handlers/write.js

@@ -0,0 +1,110 @@
+"use strict";
+/*
+ * Copyright (c) 2022.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeScopeRouteHandler = writeScopeRouteHandler;
+const kit_1 = require("@authup/kit");
+const http_1 = require("@ebec/http");
+const core_kit_1 = require("@authup/core-kit");
+const routup_1 = require("routup");
+const typeorm_extension_1 = require("typeorm-extension");
+const adapter_routup_1 = require("@validup/adapter-routup");
+const database_1 = require("../../../../database");
+const domains_1 = require("../../../../domains");
+const utils_1 = require("../utils");
+const request_1 = require("../../../request");
+async function writeScopeRouteHandler(req, res, options = {}) {
+    let group;
+    const id = (0, request_1.getRequestParamID)(req, { isUUID: false });
+    const realmId = (0, request_1.getRequestBodyRealmID)(req);
+    const dataSource = await (0, typeorm_extension_1.useDataSource)();
+    const repository = dataSource.getRepository(domains_1.ScopeEntity);
+    let entity;
+    if (id) {
+        const where = {};
+        if ((0, kit_1.isUUID)(id)) {
+            where.id = id;
+        }
+        else {
+            where.name = id;
+        }
+        if (realmId) {
+            where.realm_id = realmId;
+        }
+        entity = await repository.findOneBy(where);
+        if (!entity && options.updateOnly) {
+            throw new http_1.NotFoundError();
+        }
+    }
+    else if (options.updateOnly) {
+        throw new http_1.NotFoundError();
+    }
+    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    if (entity) {
+        await permissionChecker.preCheck({ name: core_kit_1.PermissionName.SCOPE_UPDATE });
+        group = request_1.RequestHandlerOperation.UPDATE;
+    }
+    else {
+        await permissionChecker.preCheck({ name: core_kit_1.PermissionName.SCOPE_CREATE });
+        group = request_1.RequestHandlerOperation.CREATE;
+    }
+    const validator = new utils_1.ScopeRequestValidator();
+    const validatorAdapter = new adapter_routup_1.RoutupContainerAdapter(validator);
+    const data = await validatorAdapter.run(req, {
+        group,
+    });
+    await (0, typeorm_extension_1.validateEntityJoinColumns)(data, {
+        dataSource,
+        entityTarget: domains_1.ScopeEntity,
+    });
+    // ----------------------------------------------
+    if (entity) {
+        await permissionChecker.check({
+            name: core_kit_1.PermissionName.SCOPE_UPDATE,
+            data: {
+                attributes: {
+                    ...entity,
+                    ...data,
+                },
+            },
+        });
+    }
+    else {
+        if (!data.realm_id) {
+            const identity = (0, request_1.useRequestIdentityOrFail)(req);
+            if (!(0, request_1.isRequestIdentityMasterRealmMember)(identity)) {
+                data.realm_id = identity.realmId;
+            }
+        }
+        await permissionChecker.check({
+            name: core_kit_1.PermissionName.SCOPE_CREATE,
+            data: {
+                attributes: data,
+            },
+        });
+    }
+    // ----------------------------------------------
+    const isUnique = await (0, typeorm_extension_1.isEntityUnique)({
+        dataSource,
+        entityTarget: domains_1.ScopeEntity,
+        entity: data,
+        entityExisting: entity,
+    });
+    if (!isUnique) {
+        throw new database_1.DatabaseConflictError();
+    }
+    // ----------------------------------------------
+    if (entity) {
+        entity = repository.merge(entity, data);
+        await repository.save(entity);
+        return (0, routup_1.sendAccepted)(res, entity);
+    }
+    entity = repository.create(data);
+    await repository.save(entity);
+    return (0, routup_1.sendCreated)(res, entity);
+}
+//# sourceMappingURL=write.js.map

package/dist/http/controllers/scope/handlers/write.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/write.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/scope/module.d.ts

@@ -4,6 +4,7 @@ export declare class ScopeController {
     add(data: Pick<Scope, 'name'>, req: any, res: any): Promise<Scope>;
     getOne(id: string, req: any, res: any): Promise<Scope>;
     edit(id: string, data: Pick<Scope, 'name'>, req: any, res: any): Promise<Scope>;
+    put(id: string, data: Pick<Scope, 'name'>, req: any, res: any): Promise<Scope>;
     drop(id: string, req: any, res: any): Promise<Scope>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/http/controllers/scope/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/controllers/scope/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAU9C,qBAEa,eAAe;IAElB,OAAO,CACG,GAAG,EAAE,GAAG,EACH,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,EAAE,CAAC;IAKb,GAAG,CACI,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAClB,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,MAAM,CACK,EAAE,EAAE,MAAM,EACP,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,IAAI,CACO,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EACtB,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,IAAI,CACO,EAAE,EAAE,MAAM,EACP,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;CAGpB"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/controllers/scope/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAS9C,qBAEa,eAAe;IAElB,OAAO,CACG,GAAG,EAAE,GAAG,EACH,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,EAAE,CAAC;IAKb,GAAG,CACI,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAClB,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,MAAM,CACK,EAAE,EAAE,MAAM,EACP,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,IAAI,CACO,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EACtB,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAOX,GAAG,CACQ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EACtB,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;IAKX,IAAI,CACO,EAAE,EAAE,MAAM,EACP,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GAC1B,OAAO,CAAC,KAAK,CAAC;CAGpB"}

package/dist/http/controllers/scope/module.js

@@ -27,13 +27,18 @@ let ScopeController = class ScopeController {
         return (0, handlers_1.getManyScopeRouteHandler)(req, res);
     }
     async add(data, req, res) {
-        return (0, handlers_1.createScopeRouteHandler)(req, res);
+        return (0, handlers_1.writeScopeRouteHandler)(req, res);
     }
     async getOne(id, req, res) {
         return (0, handlers_1.getOneScopeRouteHandler)(req, res);
     }
     async edit(id, data, req, res) {
-        return (0, handlers_1.updateScopeRouteHandler)(req, res);
+        return (0, handlers_1.writeScopeRouteHandler)(req, res, {
+            updateOnly: true,
+        });
+    }
+    async put(id, data, req, res) {
+        return (0, handlers_1.writeScopeRouteHandler)(req, res);
     }
     async drop(id, req, res) {
         return (0, handlers_1.deleteScopeRouteHandler)(req, res);
@@ -76,6 +81,16 @@ __decorate([
     __metadata("design:paramtypes", [String, Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], ScopeController.prototype, "edit", null);
+__decorate([
+    (0, decorators_1.DPut)('/:id', [middleware_1.ForceLoggedInMiddleware]),
+    __param(0, (0, decorators_1.DPath)('id')),
+    __param(1, (0, decorators_1.DBody)()),
+    __param(2, (0, decorators_1.DRequest)()),
+    __param(3, (0, decorators_1.DResponse)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object, Object, Object]),
+    __metadata("design:returntype", Promise)
+], ScopeController.prototype, "put", null);
 __decorate([
     (0, decorators_1.DDelete)('/:id', [middleware_1.ForceLoggedInMiddleware]),
     __param(0, (0, decorators_1.DPath)('id')),

package/dist/http/controllers/scope/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/controllers/scope/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;AAEH,mDAE4B;AAE5B,iDAA2D;AAC3D,yCAMoB;AAIb,IAAM,eAAe,GAArB,MAAM,eAAe;IAElB,AAAN,KAAK,CAAC,OAAO,CACG,GAAQ,EACH,GAAQ;QAEzB,OAAO,IAAA,mCAAwB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CACI,IAAyB,EAClB,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACK,EAAU,EACP,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CACO,EAAU,EACV,IAAyB,EACtB,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CACO,EAAU,EACP,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;CACJ,CAAA;AA7CY,0CAAe;AAElB;IADL,IAAA,iBAAI,EAAC,EAAE,EAAE,EAAE,CAAC;IAER,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACN,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;8CAGnB;AAGK;IADL,IAAA,kBAAK,EAAC,EAAE,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEhC,WAAA,IAAA,kBAAK,GAAE,CAAA;IACH,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;0CAGnB;AAGK;IADL,IAAA,iBAAI,EAAC,MAAM,EAAE,EAAE,CAAC;IAEZ,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;6CAGnB;AAGK;IADL,IAAA,kBAAK,EAAC,MAAM,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEpC,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,kBAAK,GAAE,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;2CAGnB;AAGK;IADL,IAAA,oBAAO,EAAC,MAAM,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEtC,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;2CAGnB;0BA5CQ,eAAe;IAF3B,IAAA,kBAAK,EAAC,OAAO,CAAC;IACd,IAAA,wBAAW,EAAC,SAAS,CAAC;GACV,eAAe,CA6C3B"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/controllers/scope/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;AAEH,mDAE4B;AAE5B,iDAA2D;AAC3D,yCAKoB;AAIb,IAAM,eAAe,GAArB,MAAM,eAAe;IAElB,AAAN,KAAK,CAAC,OAAO,CACG,GAAQ,EACH,GAAQ;QAEzB,OAAO,IAAA,mCAAwB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CACI,IAAyB,EAClB,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,iCAAsB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACK,EAAU,EACP,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CACO,EAAU,EACV,IAAyB,EACtB,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,iCAAsB,EAAC,GAAG,EAAE,GAAG,EAAE;YACpC,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CACQ,EAAU,EACV,IAAyB,EACtB,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,iCAAsB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CACO,EAAU,EACP,GAAQ,EACP,GAAQ;QAEzB,OAAO,IAAA,kCAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;CACJ,CAAA;AAzDY,0CAAe;AAElB;IADL,IAAA,iBAAI,EAAC,EAAE,EAAE,EAAE,CAAC;IAER,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACN,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;8CAGnB;AAGK;IADL,IAAA,kBAAK,EAAC,EAAE,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEhC,WAAA,IAAA,kBAAK,GAAE,CAAA;IACH,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;0CAGnB;AAGK;IADL,IAAA,iBAAI,EAAC,MAAM,EAAE,EAAE,CAAC;IAEZ,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;6CAGnB;AAGK;IADL,IAAA,kBAAK,EAAC,MAAM,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEpC,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,kBAAK,GAAE,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;2CAKnB;AAGK;IADL,IAAA,iBAAI,EAAC,MAAM,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEnC,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,kBAAK,GAAE,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;0CAGnB;AAGK;IADL,IAAA,oBAAO,EAAC,MAAM,EAAE,CAAC,oCAAuB,CAAC,CAAC;IAEtC,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;IACP,WAAA,IAAA,qBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,sBAAS,GAAE,CAAA;;;;2CAGnB;0BAxDQ,eAAe;IAF3B,IAAA,kBAAK,EAAC,OAAO,CAAC;IACd,IAAA,wBAAW,EAAC,SAAS,CAAC;GACV,eAAe,CAyD3B"}