@privateaim/server-http-kit 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.8.0](https://github.com/PrivateAIM/hub/compare/v0.7.0...v0.8.0) (2024-07-02)
+
+
+### Features
+
+* expose all middlewares ([4681e3f](https://github.com/PrivateAIM/hub/commit/4681e3f5b4ce030e3651c00854d3db9c941e336f))
+* simplified and adjusted permission usage across codespace ([1839f5e](https://github.com/PrivateAIM/hub/commit/1839f5eb768f120e268e57e0a496fef5eb0eca41))
+
+
+### Bug Fixes
+
+* **deps:** bump @routup/basic from 1.3.2 to 1.4.0 ([#523](https://github.com/PrivateAIM/hub/issues/523)) ([409a594](https://github.com/PrivateAIM/hub/commit/409a59460fbce2934ba489e7fde579063e2fc6d4))
+* **deps:** bump @routup/decorators from 3.3.2 to 3.4.0 ([#531](https://github.com/PrivateAIM/hub/issues/531)) ([295f692](https://github.com/PrivateAIM/hub/commit/295f6926b8492aa58856ec2e0ea469e9b19388d3))
+* **deps:** bump @routup/prometheus from 2.3.0 to 2.4.0 ([#525](https://github.com/PrivateAIM/hub/issues/525)) ([b98e5f1](https://github.com/PrivateAIM/hub/commit/b98e5f1020f2363c5074f98408e4786cdde24e0d))
+* **deps:** bump @routup/swagger from 2.3.6 to 2.4.0 ([#530](https://github.com/PrivateAIM/hub/issues/530)) ([cef8d2c](https://github.com/PrivateAIM/hub/commit/cef8d2c2de5d29c0cc7cf84abf8ef980b05c5fe9))
+* **deps:** bump authup to v1.0.0.beta-19 ([3410786](https://github.com/PrivateAIM/hub/commit/34107860d7f810cea7b2024b0f303cd70d32a5fe))
+* **deps:** bump routup to v4.x ([787bb7c](https://github.com/PrivateAIM/hub/commit/787bb7cb6951f32fed29ac77467dcdec76683672))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @privateaim/kit bumped from ^0.7.0 to ^0.8.0
+    * @privateaim/server-kit bumped from ^0.7.0 to ^0.8.0
+
 ## [0.7.0](https://github.com/PrivateAIM/hub/compare/v0.6.0...v0.7.0) (2024-06-26)
 
 

package/dist/middlewares/index.d.ts

@@ -1,4 +1,6 @@
+export * from './basic';
 export * from './cors';
+export * from './decorators';
 export * from './error';
 export * from './force-logged-in';
 export * from './module';

package/dist/middlewares/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":"AAOA,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":"AAOA,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/middlewares/index.js

@@ -20,7 +20,9 @@ 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("./basic"), exports);
 __exportStar(require("./cors"), exports);
+__exportStar(require("./decorators"), exports);
 __exportStar(require("./error"), exports);
 __exportStar(require("./force-logged-in"), exports);
 __exportStar(require("./module"), exports);

package/dist/middlewares/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,yCAAuB;AACvB,0CAAwB;AACxB,oDAAkC;AAClC,2CAAyB;AACzB,+CAA6B;AAC7B,+CAA6B;AAC7B,4CAA0B;AAC1B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB;AACxB,yCAAuB;AACvB,+CAA6B;AAC7B,0CAAwB;AACxB,oDAAkC;AAClC,2CAAyB;AACzB,+CAA6B;AAC7B,+CAA6B;AAC7B,4CAA0B;AAC1B,0CAAwB"}

package/dist/middlewares/swagger.d.ts

@@ -1,4 +1,4 @@
 import type { Router } from 'routup';
 import type { MiddlewareSwaggerOptions } from './types';
-export declare function mountSwaggerMiddleware(router: Router, options: MiddlewareSwaggerOptions): void;
+export declare function mountSwaggerMiddleware(router: Router, options?: MiddlewareSwaggerOptions): void;
 //# sourceMappingURL=swagger.d.ts.map

package/dist/middlewares/swagger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swagger.d.ts","sourceRoot":"","sources":["../../src/middlewares/swagger.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,QAWvF"}
+{"version":3,"file":"swagger.d.ts","sourceRoot":"","sources":["../../src/middlewares/swagger.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B,QAW5F"}

package/dist/middlewares/swagger.js

@@ -14,7 +14,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const swagger_1 = require("@routup/swagger");
 const locter_1 = require("locter");
 const node_process_1 = __importDefault(require("node:process"));
-function mountSwaggerMiddleware(router, options) {
+function mountSwaggerMiddleware(router, options = {}) {
     let document;
     if (options.cwd) {
         document = (0, locter_1.loadSync)(node_path_1.default.join(options.cwd, 'swagger.json'));

package/dist/middlewares/swagger.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../src/middlewares/swagger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AASH,wDAWC;AAlBD,0DAA6B;AAC7B,6CAA4C;AAC5C,mCAAkC;AAClC,gEAAmC;AAInC,SAAgB,sBAAsB,CAAC,MAAc,EAAE,OAAiC;IACpF,IAAI,QAAc,CAAC;IACnB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,QAAQ,GAAG,IAAA,iBAAQ,EAAC,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,IAAA,iBAAQ,EAAC,mBAAI,CAAC,IAAI,CAAC,sBAAO,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAA,mBAAS,EAAC,QAAQ,EAAE;QACpC,OAAO,EAAE,OAAO,CAAC,OAAO;KAC3B,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../src/middlewares/swagger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AASH,wDAWC;AAlBD,0DAA6B;AAC7B,6CAA4C;AAC5C,mCAAkC;AAClC,gEAAmC;AAInC,SAAgB,sBAAsB,CAAC,MAAc,EAAE,UAAoC,EAAE;IACzF,IAAI,QAAc,CAAC;IACnB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,QAAQ,GAAG,IAAA,iBAAQ,EAAC,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,IAAA,iBAAQ,EAAC,mBAAI,CAAC,IAAI,CAAC,sBAAO,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAA,mBAAS,EAAC,QAAQ,EAAE;QACpC,OAAO,EAAE,OAAO,CAAC,OAAO;KAC3B,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/services/authup/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,KAAK,4BAA4B,GAAG,IAAI,CACxC,qBAAqB,EACrB,aAAa,GACb,UAAU,GACV,YAAY,GACZ,KAAK,GACL,UAAU,GACV,UAAU,CACT,CAAC;AAQF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAW9E;AAED,wBAAgB,0BAA0B,CACtC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,4BAA4B,EAClC,aAAa,CAAC,EAAE,OAAO,QA+B1B"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,KAAK,4BAA4B,GAAG,IAAI,CACxC,qBAAqB,EACrB,aAAa,GACb,UAAU,GACV,YAAY,GACZ,KAAK,GACL,UAAU,GACV,UAAU,CACT,CAAC;AAWF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAW9E;AAED,wBAAgB,0BAA0B,CACtC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,4BAA4B,EAClC,aAAa,CAAC,EAAE,OAAO,QA+B1B"}

package/dist/services/authup/utils.js

@@ -13,7 +13,10 @@ const core_kit_1 = require("@authup/core-kit");
 const kit_2 = require("@privateaim/kit");
 const request_1 = require("../../request");
 function generateAbilities() {
-    return Object.values(kit_2.PermissionID).map((name) => ({
+    return Object.values({
+        ...kit_2.PermissionName,
+        ...core_kit_1.PermissionName,
+    }).map((name) => ({
         name,
     }));
 }

package/dist/services/authup/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA0BH,0EAWC;AAED,gEAkCC;AAtED,qCAAwC;AACxC,+CAAqD;AAErD,yCAA+C;AAE/C,2CAA8C;AAY9C,SAAS,iBAAiB;IACtB,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAY,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI;KACY,CAAA,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,+BAA+B;IAC3C,OAAO;QACH,QAAQ,EAAE,sCAAsC;QAChD,UAAU,EAAE,4BAAiB;QAE7B,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,sCAAsC;QAC3C,QAAQ,EAAE,OAAO;QAEjB,WAAW,EAAE,iBAAiB,EAAE;KACnC,CAAC;AACN,CAAC;AAED,SAAgB,0BAA0B,CACtC,GAAY,EACZ,IAAkC,EAClC,aAAuB;IAEvB,IAAI,SAAoB,CAAC;IACzB,IAAI,aAAa,EAAE,CAAC;QAChB,SAAS,GAAG,iBAAiB,EAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,eAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEzC,IAAA,uBAAa,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,IAAA,uBAAa,EAAC,GAAG,EAAE,OAAO,EAAE;QACxB,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,IAAI,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,IAAA,uBAAa,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACvC,IAAA,uBAAa,EAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM;QACV,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACX,IAAA,uBAAa,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM;QACV,CAAC;IACL,CAAC;AACL,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA6BH,0EAWC;AAED,gEAkCC;AAzED,qCAAwC;AACxC,+CAA6F;AAE7F,yCAAiD;AAEjD,2CAA8C;AAY9C,SAAS,iBAAiB;IACtB,OAAO,MAAM,CAAC,MAAM,CAAC;QACjB,GAAG,oBAAc;QACjB,GAAG,yBAAoB;KAC1B,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,IAAI;KACY,CAAA,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,+BAA+B;IAC3C,OAAO;QACH,QAAQ,EAAE,sCAAsC;QAChD,UAAU,EAAE,4BAAiB;QAE7B,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,sCAAsC;QAC3C,QAAQ,EAAE,OAAO;QAEjB,WAAW,EAAE,iBAAiB,EAAE;KACnC,CAAC;AACN,CAAC;AAED,SAAgB,0BAA0B,CACtC,GAAY,EACZ,IAAkC,EAClC,aAAuB;IAEvB,IAAI,SAAoB,CAAC;IACzB,IAAI,aAAa,EAAE,CAAC;QAChB,SAAS,GAAG,iBAAiB,EAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,eAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEzC,IAAA,uBAAa,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,IAAA,uBAAa,EAAC,GAAG,EAAE,OAAO,EAAE;QACxB,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,IAAI,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,IAAA,uBAAa,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACvC,IAAA,uBAAa,EAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM;QACV,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACX,IAAA,uBAAa,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM;QACV,CAAC;IACL,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@privateaim/server-http-kit",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "author": {
@@ -11,19 +11,19 @@
     "license": "Apache-2.0",
     "description": "This package contains the realtime application which connects the API with socket based clients.",
     "dependencies": {
-        "@authup/kit": "^1.0.0-beta.18",
-        "@authup/core-kit": "^1.0.0-beta.18",
-        "@authup/core-http-kit": "^1.0.0-beta.18",
+        "@authup/kit": "^1.0.0-beta.19",
+        "@authup/core-kit": "^1.0.0-beta.19",
+        "@authup/core-http-kit": "^1.0.0-beta.19",
         "@authup/server-core-plugin-kit": "^1.0.0-beta.18",
         "@authup/server-core-plugin-http": "^1.0.0-beta.18",
         "@ebec/http": "^2.3.0",
-        "@privateaim/kit": "^0.7.0",
-        "@privateaim/server-kit": "^0.7.0",
-        "@routup/basic": "^1.3.1",
-        "@routup/decorators": "^3.3.1",
-        "@routup/prometheus": "^2.3.0",
-        "@routup/rate-limit": "^2.3.0",
-        "@routup/swagger": "^2.3.6",
+        "@privateaim/kit": "^0.8.0",
+        "@privateaim/server-kit": "^0.8.0",
+        "@routup/basic": "^1.4.0",
+        "@routup/decorators": "^3.4.0",
+        "@routup/prometheus": "^2.4.0",
+        "@routup/rate-limit": "^2.4.0",
+        "@routup/swagger": "^2.4.0",
         "cors": "^2.8.5",
         "hapic": "^2.5.1",
         "locter": "^2.1.0"
@@ -32,13 +32,13 @@
         "@types/cors": "^2.8.17",
         "express-validator": "^7.1.0",
         "redis-extension": "^1.5.0",
-        "routup": "^3.3.0",
+        "routup": "^4.0.0",
         "typeorm-extension": "^3.5.1"
     },
     "peerDependencies": {
         "express-validator": "^7.1.0",
         "redis-extension": "^1.5.0",
-        "routup": "^3.3.0",
+        "routup": "^4.0.0",
         "typeorm-extension": "^3.5.1"
     },
     "scripts": {

package/src/middlewares/index.ts

@@ -5,7 +5,9 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+export * from './basic';
 export * from './cors';
+export * from './decorators';
 export * from './error';
 export * from './force-logged-in';
 export * from './module';

package/src/middlewares/swagger.ts

@@ -12,7 +12,7 @@ import process from 'node:process';
 import type { Router } from 'routup';
 import type { MiddlewareSwaggerOptions } from './types';
 
-export function mountSwaggerMiddleware(router: Router, options: MiddlewareSwaggerOptions) {
+export function mountSwaggerMiddleware(router: Router, options: MiddlewareSwaggerOptions = {}) {
     let document : any;
     if (options.cwd) {
         document = loadSync(path.join(options.cwd, 'swagger.json'));

package/src/services/authup/utils.ts

@@ -7,9 +7,9 @@
 
 import type { Ability } from '@authup/kit';
 import { Abilities } from '@authup/kit';
-import { REALM_MASTER_NAME } from '@authup/core-kit';
+import { PermissionName as AuthupPermissionName, REALM_MASTER_NAME } from '@authup/core-kit';
 import type { TokenVerificationData } from '@authup/server-core-plugin-kit';
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request } from 'routup';
 import { setRequestEnv } from '../../request';
 
@@ -24,7 +24,10 @@ TokenVerificationData,
 >;
 
 function generateAbilities(): Ability[] {
-    return Object.values(PermissionID).map((name) => ({
+    return Object.values({
+        ...PermissionName,
+        ...AuthupPermissionName,
+    }).map((name) => ({
         name,
     } satisfies Ability));
 }