@authup/server-core 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/http/oauth2/grant-types/password.d.ts

@@ -1,10 +1,11 @@
 import type { OAuth2TokenGrantResponse } from '@authup/core';
 import type { Request } from 'routup';
-import type { UserEntity } from '../../../domains';
+import { UserEntity } from '../../../domains';
 import { AbstractGrant } from './abstract';
 import type { Grant } from './type';
 export declare class PasswordGrantType extends AbstractGrant implements Grant {
     run(request: Request): Promise<OAuth2TokenGrantResponse>;
     validate(request: Request): Promise<UserEntity>;
+    protected verifyCredentialsByLDAP(user: string, password: string, realmId?: string): Promise<UserEntity>;
 }
 //# sourceMappingURL=password.d.ts.map

package/dist/http/oauth2/grant-types/password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAsBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,UAAU,CAAC;CA0BzD"}
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA2B,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAKtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAEuB,UAAU,EAEvC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAsBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,UAAU,CAAC;cAgCtC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,UAAU,CAAC;CA2DlH"}

package/dist/http/oauth2/grant-types/password.js

@@ -12,8 +12,8 @@ const body_1 = require("@routup/basic/body");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../domains");
-const abstract_1 = require("./abstract");
 const response_1 = require("../response");
+const abstract_1 = require("./abstract");
 class PasswordGrantType extends abstract_1.AbstractGrant {
     async run(request) {
         const user = await this.validate(request);
@@ -28,17 +28,21 @@ class PasswordGrantType extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         });
     }
     async validate(request) {
-        const { username, password, realm_id: realmId } = (0, body_1.useRequestBody)(request);
-        const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') || realmId);
+        const { username, password, realm_id: requestRealmId } = (0, body_1.useRequestBody)(request);
+        const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') || requestRealmId);
         const dataSource = await (0, typeorm_extension_1.useDataSource)();
         const repository = new domains_1.UserRepository(dataSource);
-        const entity = await repository.verifyCredentials(username, password, (0, core_1.extractObjectProperty)(realm, 'id'));
+        const realmId = (0, core_1.extractObjectProperty)(realm, 'id');
+        let entity = await repository.verifyCredentials(username, password, realmId);
+        if (!entity) {
+            entity = await this.verifyCredentialsByLDAP(username, password, realmId);
+        }
         if (!entity) {
             throw core_1.UserError.credentialsInvalid();
         }
@@ -47,6 +51,55 @@ class PasswordGrantType extends abstract_1.AbstractGrant {
         }
         return entity;
     }
+    async verifyCredentialsByLDAP(user, password, realmId) {
+        const dataSource = await (0, typeorm_extension_1.useDataSource)();
+        const repository = new domains_1.IdentityProviderRepository(dataSource);
+        let entities = [];
+        if (realmId) {
+            entities = await repository.createQueryBuilder('provider')
+                .where('provider.realm_id = :realmId', { realmId })
+                .andWhere('provider.protocol = :protocol', { protocol: core_1.IdentityProviderProtocol.LDAP })
+                .getMany();
+        }
+        else {
+            entities = await repository.createQueryBuilder('provider')
+                .andWhere('provider.protocol = :protocol', { protocol: core_1.IdentityProviderProtocol.LDAP })
+                .getMany();
+        }
+        let account;
+        let identity;
+        for (let i = 0; i < entities.length; i++) {
+            const entity = await repository.extendEntity(entities[i]);
+            if (entity.protocol !== core_1.IdentityProviderProtocol.LDAP) {
+                continue;
+            }
+            const flow = new domains_1.LdapIdentityProviderFlow(entity);
+            try {
+                identity = await flow.getIdentityForCredentials(user, password);
+                await flow.unbind();
+            }
+            catch (e) {
+                await flow.unbind();
+                continue;
+            }
+            account = await (0, domains_1.createIdentityProviderAccount)(entity, identity);
+            break;
+        }
+        if (!account) {
+            return undefined;
+        }
+        if (account.user &&
+            account.user.realm) {
+            return account.user;
+        }
+        const userRepository = dataSource.getRepository(domains_1.UserEntity);
+        return userRepository.findOne({
+            where: {
+                id: account.user_id,
+            },
+            relations: ['realm'],
+        });
+    }
 }
 exports.PasswordGrantType = PasswordGrantType;
 //# sourceMappingURL=password.js.map

package/dist/http/oauth2/grant-types/password.js.map

@@ -1 +1 @@
-{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAuD;AACvD,yDAAkD;AAElD,8CAAgE;AAChE,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,OAAO,EAAE,oBAAa,CAAC,IAAI;YAC3B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;SAC7B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE1E,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAC5B,IAAA,wBAAe,EAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CACjD,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAC7C,QAAQ,EACR,QAAQ,EACR,IAAA,4BAAqB,EAAC,KAAK,EAAE,IAAI,CAAC,CACrC,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,gBAAS,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjDD,8CAiDC"}
+{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"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"}

package/dist/http/oauth2/grant-types/refresh-token.js

@@ -31,9 +31,9 @@ class RefreshTokenGrantType extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         });
     }
     async validate(request) {

package/dist/http/oauth2/grant-types/refresh-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAClD,8CAA4D;AAC5D,yCAA2C;AAC3C,0CAA6D;AAE7D,oCAAkD;AAElD,MAAa,qBAAsB,SAAQ,wBAAa;IACpD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAA,+BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,2BAAoB,EAAC,KAAK,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG;YACH,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,GAAG;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,aAAa,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,MAAM,iBAAU,CAAC,OAAO,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArDD,sDAqDC"}
+{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAClD,8CAA4D;AAC5D,yCAA2C;AAC3C,0CAA6D;AAE7D,oCAAkD;AAElD,MAAa,qBAAsB,SAAQ,wBAAa;IACpD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAA,+BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,2BAAoB,EAAC,KAAK,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG;YACH,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,GAAG;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,aAAa,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,MAAM,iBAAU,CAAC,OAAO,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArDD,sDAqDC"}

package/dist/http/oauth2/grant-types/robot-credentials.js

@@ -27,8 +27,8 @@ class RobotCredentialsGrantType extends abstract_1.AbstractGrant {
         });
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         });
     }
     async validate(request) {

package/dist/http/oauth2/grant-types/robot-credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,oBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB;YACrD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,iBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}
+{"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,oBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,iBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}

package/dist/http/oauth2/token/permissions.d.ts

@@ -1,4 +1,4 @@
-import type { AbilityDescriptor } from '@authup/core';
+import type { Ability } from '@authup/core';
 import { OAuth2SubKind } from '@authup/core';
-export declare function loadOAuth2SubPermissions(kind: `${OAuth2SubKind}`, id: string, scope?: string | string[]): Promise<AbilityDescriptor[]>;
+export declare function loadOAuth2SubPermissions(kind: `${OAuth2SubKind}`, id: string, scope?: string | string[]): Promise<Ability[]>;
 //# sourceMappingURL=permissions.d.ts.map

package/dist/http/oauth2/token/permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/token/permissions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,aAAa,EAA0C,MAAM,cAAc,CAAC;AAIrF,wBAAsB,wBAAwB,CAC1C,IAAI,EAAE,GAAG,aAAa,EAAE,EACxB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GACzB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAwB/B"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/token/permissions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAA0C,MAAM,cAAc,CAAC;AAIrF,wBAAsB,wBAAwB,CAC1C,IAAI,EAAE,GAAG,aAAa,EAAE,EACxB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GACzB,OAAO,CAAC,OAAO,EAAE,CAAC,CAwBrB"}

package/dist/http/utils/owner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"owner.d.ts","sourceRoot":"","sources":["../../../src/http/utils/owner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAI,OAAO,CAmBxD"}
+{"version":3,"file":"owner.d.ts","sourceRoot":"","sources":["../../../src/http/utils/owner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAI,OAAO,CAgBxD"}

package/dist/http/utils/owner.js

@@ -17,13 +17,12 @@ function isRequestSubOwner(req) {
     }
     const config = (0, config_1.useConfig)();
     const user = (0, env_1.useRequestEnv)(req, 'user');
-    if (user &&
-        user.name === config.adminUsername) {
+    if (user && user.name === config.userAdminName) {
         return true;
     }
     const robot = (0, env_1.useRequestEnv)(req, 'robot');
     return robot &&
-        robot.name === core_1.ROBOT_SYSTEM_NAME;
+        robot.name.toLowerCase() === config.robotAdminName.toLowerCase();
 }
 exports.isRequestSubOwner = isRequestSubOwner;
 //# sourceMappingURL=owner.js.map

package/dist/http/utils/owner.js.map

@@ -1 +1 @@
-{"version":3,"file":"owner.js","sourceRoot":"","sources":["../../../src/http/utils/owner.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAoE;AAEpE,yCAAyC;AACzC,+BAAsC;AAEtC,SAAgB,iBAAiB,CAAC,GAAY;IAC1C,MAAM,KAAK,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,IAAI,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxC,IACI,IAAI;QACJ,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,aAAa,EACpC,CAAC;QACC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,KAAK;QACR,KAAK,CAAC,IAAI,KAAK,wBAAiB,CAAC;AACzC,CAAC;AAnBD,8CAmBC"}
+{"version":3,"file":"owner.js","sourceRoot":"","sources":["../../../src/http/utils/owner.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAiD;AAEjD,yCAAyC;AACzC,+BAAsC;AAEtC,SAAgB,iBAAiB,CAAC,GAAY;IAC1C,MAAM,KAAK,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,IAAI,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,aAAa,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,KAAK;QACR,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;AACzE,CAAC;AAhBD,8CAgBC"}

package/dist/http/validation/utils.d.ts

@@ -1,8 +1,10 @@
 import type { MatchedDataOptions } from 'express-validator';
 import type { Request } from 'routup';
 import type { EntityTarget } from 'typeorm';
+import type { ZodError } from 'zod';
 import type { ExpressValidationExtendKeys, ExpressValidationResult } from './type';
 export declare function buildRequestValidationErrorMessage<T extends Record<string, any> = Record<string, any>>(name: keyof T | (keyof T)[]): string;
+export declare function buildRequestValidationErrorMessageForZodError(error: ZodError): string;
 export declare function matchedValidationData(req: Request, options?: Partial<MatchedDataOptions>): Record<string, any>;
 export declare function initExpressValidationResult<R extends Record<string, any>, M extends Record<string, any> = Record<string, any>>(): ExpressValidationResult<R, M>;
 export declare function extendExpressValidationResultWithRelation<R extends Record<string, any>>(result: ExpressValidationResult<R>, target: EntityTarget<any>, keys: Partial<ExpressValidationExtendKeys<R>>): Promise<ExpressValidationResult<R>>;

package/dist/http/validation/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAC;AAEnF,wBAAgB,kCAAkC,CAC9C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,UAOhC;AAED,wBAAgB,qBAAqB,CACjC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAErB;AAED,wBAAgB,2BAA2B,CACvC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAMlC;AAED,wBAAsB,yCAAyC,CAC3D,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAE7B,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAClC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAkBtC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAC;AAEnF,wBAAgB,kCAAkC,CAC9C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,UAOhC;AAED,wBAAgB,6CAA6C,CAAC,KAAK,EAAE,QAAQ,UAY5E;AAED,wBAAgB,qBAAqB,CACjC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAErB;AAED,wBAAgB,2BAA2B,CACvC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAMlC;AAED,wBAAsB,yCAAyC,CAC3D,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAE7B,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAClC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAkBtC"}

package/dist/http/validation/utils.js

@@ -6,7 +6,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendExpressValidationResultWithRelation = exports.initExpressValidationResult = exports.matchedValidationData = exports.buildRequestValidationErrorMessage = void 0;
+exports.extendExpressValidationResultWithRelation = exports.initExpressValidationResult = exports.matchedValidationData = exports.buildRequestValidationErrorMessageForZodError = exports.buildRequestValidationErrorMessage = void 0;
 const express_validator_1 = require("express-validator");
 const core_1 = require("@authup/core");
 const smob_1 = require("smob");
@@ -15,11 +15,24 @@ const typeorm_extension_1 = require("typeorm-extension");
 function buildRequestValidationErrorMessage(name) {
     const names = (0, smob_1.distinctArray)(Array.isArray(name) ? name : [name]);
     if (names.length > 1) {
-        return `The parameters ${names.join(', ')} is invalid.`;
+        return `The parameters ${names.join(', ')} are invalid.`;
     }
     return `The parameter ${String(names[0])} is invalid.`;
 }
 exports.buildRequestValidationErrorMessage = buildRequestValidationErrorMessage;
+function buildRequestValidationErrorMessageForZodError(error) {
+    const names = [];
+    for (let i = 0; i < error.issues.length; i++) {
+        for (let j = 0; j < error.issues[i].path.length; j++) {
+            names.push(`${error.issues[i].path[j]}`);
+        }
+    }
+    if (names.length > 1) {
+        return `The parameters ${names.join(', ')} are invalid.`;
+    }
+    return `The parameter ${String(names[0])} is invalid.`;
+}
+exports.buildRequestValidationErrorMessageForZodError = buildRequestValidationErrorMessageForZodError;
 function matchedValidationData(req, options) {
     return (0, core_1.deleteUndefinedObjectProperties)((0, express_validator_1.matchedData)(req, options));
 }

package/dist/http/validation/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAgD;AAChD,uCAA+D;AAE/D,+BAAqC;AAErC,qCAA6C;AAC7C,yDAAkD;AAGlD,SAAgB,kCAAkC,CAE5C,IAA2B;IAC7B,MAAM,KAAK,GAAG,IAAA,oBAAa,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAC5D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC;AATD,gFASC;AAED,SAAgB,qBAAqB,CACjC,GAAY,EACZ,OAAqC;IAErC,OAAO,IAAA,sCAA+B,EAAC,IAAA,+BAAW,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC;AALD,sDAKC;AAED,SAAgB,2BAA2B;IAIvC,OAAO;QACH,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,EAAO;KAChB,CAAC;AACN,CAAC;AATD,kEASC;AAEM,KAAK,UAAU,yCAAyC,CAG3D,MAAkC,EAClC,MAAyB,EACzB,IAA6C;IAE7C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QAEzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aAC3B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,sBAAe,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAsD,CAAC,GAAG,MAAM,CAAC;IAC1F,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,8FAwBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAgD;AAChD,uCAA+D;AAE/D,+BAAqC;AAErC,qCAA6C;AAC7C,yDAAkD;AAIlD,SAAgB,kCAAkC,CAE5C,IAA2B;IAC7B,MAAM,KAAK,GAAG,IAAA,oBAAa,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IAC7D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC;AATD,gFASC;AAED,SAAgB,6CAA6C,CAAC,KAAe;IACzE,MAAM,KAAK,GAAc,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;IACL,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IAC7D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC;AAZD,sGAYC;AAED,SAAgB,qBAAqB,CACjC,GAAY,EACZ,OAAqC;IAErC,OAAO,IAAA,sCAA+B,EAAC,IAAA,+BAAW,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC;AALD,sDAKC;AAED,SAAgB,2BAA2B;IAIvC,OAAO;QACH,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,EAAO;KAChB,CAAC;AACN,CAAC;AATD,kEASC;AAEM,KAAK,UAAU,yCAAyC,CAG3D,MAAkC,EAClC,MAAyB,EACzB,IAA6C;IAE7C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QAEzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aAC3B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,sBAAe,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAsD,CAAC,GAAG,MAAM,CAAC;IAC1F,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,8FAwBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@authup/server-core",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.5",
     "description": "This is a standalone application.",
     "main": "dist/index.js",
     "scripts": {
@@ -8,7 +8,7 @@
         "cli": "node dist/cli/index.js",
         "cli-dev": "ts-node src/cli/index.ts",
         "build": "rm -rf ./dist && tsc -p tsconfig.build.json",
-        "test": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_ENV=test jest --config ./test/jest.config.js --detectOpenHandles --runInBand --testTimeout=10000",
+        "test": "cross-env NODE_ENV=test jest --config ./test/jest.config.js --detectOpenHandles --runInBand --testTimeout=10000",
         "test:coverage": "npm run test -- --coverage"
     },
     "files": [
@@ -34,7 +34,7 @@
         "email": "contact@tada5hi.net",
         "url": "https://github.com/tada5hi"
     },
-    "license": "MIT",
+    "license": "Apache-2.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/authup/authup.git",
@@ -45,9 +45,9 @@
     },
     "homepage": "https://github.com/authup/authup#readme",
     "dependencies": {
-        "@authup/config": "^1.0.0-beta.3",
-        "@authup/core": "^1.0.0-beta.3",
-        "@authup/server-kit": "^1.0.0-beta.3",
+        "@authup/config": "^1.0.0-beta.5",
+        "@authup/core": "^1.0.0-beta.5",
+        "@authup/server-kit": "^1.0.0-beta.5",
         "@ebec/http": "^2.3.0",
         "@hapic/oauth2": "^2.4.1",
         "@hapic/vault": "^2.3.2",
@@ -55,13 +55,15 @@
         "@routup/decorators": "^3.3.1",
         "@routup/prometheus": "^2.3.0",
         "@routup/rate-limit": "^2.3.0",
-        "@routup/swagger": "^2.3.4",
-        "better-sqlite3": "^9.3.0",
+        "@routup/swagger": "^2.3.5",
+        "better-sqlite3": "^9.4.3",
         "cors": "^2.8.5",
-        "dotenv": "^16.4.1",
+        "dotenv": "^16.4.5",
         "dycraft": "^1.1.0",
+        "envix": "^1.5.0",
         "express-validator": "^7.0.1",
         "hapic": "^2.5.0",
+        "ldapjs": "^3.0.7",
         "locter": "^2.0.2",
         "morgan": "^1.10.0",
         "mysql": "^2.18.1",
@@ -72,19 +74,21 @@
         "routup": "^3.2.0",
         "smob": "^1.4.1",
         "typeorm": "^0.3.20",
-        "typeorm-extension": "^3.4.0",
+        "typeorm-extension": "^3.5.0",
         "winston": "^3.11.0",
         "yargs": "^17.7.2",
         "zod": "^3.22.4"
     },
     "devDependencies": {
         "@types/cors": "^2.8.17",
+        "@types/ldapjs": "^3.0.6",
         "@types/morgan": "^1.9.9",
         "@types/node-cron": "^3.0.11",
         "@types/supertest": "^6.0.2",
         "@types/yargs": "^17.0.32",
         "jest-serial-runner": "^1.2.1",
         "supertest": "^6.3.4",
+        "testcontainers": "^10.7.1",
         "ts-node": "^10.8.2"
     },
     "publishConfig": {

package/dist/config/type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/config/type.ts"],"names":[],"mappings":"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"}

package/dist/config/type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/config/type.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}