@hellocoop/express 1.14.1 → 1.15.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Hellō
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/auth.d.ts

@@ -1,6 +1,6 @@
 import { Router, Request, Response } from 'express';
-import { Auth, Claims } from '@hellocoop/types';
-import { LoginSyncResponse, LogoutSyncResponse, Config } from '@hellocoop/router';
+import { Auth, Claims } from '@hellocoop/definitions';
+import { LoginSyncResponse, LogoutSyncResponse, Config } from '@hellocoop/api';
 type ExpressLoginParams = {
     token: string;
     payload: Claims;

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAA;AAEvE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAIH,iBAAiB,EACjB,kBAAkB,EAKlB,MAAM,EAET,MAAM,mBAAmB,CAAA;AAG1B,KAAK,kBAAkB,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,KAAK,mBAAmB,GAAG;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAClF,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAErF,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC,GAAG;IACjE,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,EAAE,iBAAiB,CAAC;CACjC,CAAC;AAuDF,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,IAAI,CAAC;YACZ,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,UAAU,QAAQ;YAChB,SAAS,IAAI,IAAI,CAAC;SACnB;KACF;CACF;AAmBH,eAAO,MAAM,IAAI,WAAsB,MAAM,KAAG,MAiC/C,CAAA"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAA;AAEvE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAIH,iBAAiB,EACjB,kBAAkB,EAKlB,MAAM,EAET,MAAM,gBAAgB,CAAA;AAGvB,KAAK,kBAAkB,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,KAAK,mBAAmB,GAAG;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAClF,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAErF,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC,GAAG;IACjE,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,EAAE,iBAAiB,CAAC;CACjC,CAAC;AAuDF,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,IAAI,CAAC;YACZ,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,UAAU,QAAQ;YAChB,SAAS,IAAI,IAAI,CAAC;SACnB;KACF;CACF;AAmBH,eAAO,MAAM,IAAI,WAAsB,MAAM,KAAG,MAiC/C,CAAA"}

package/dist/auth.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.auth = void 0;
 const express_1 = require("express");
 const cookie_1 = require("cookie");
-const router_1 = require("@hellocoop/router");
+const api_1 = require("@hellocoop/api");
 const convertToHelloRequest = (req, res) => {
     return {
         headers: () => req.headers,
@@ -25,7 +25,7 @@ const convertToHelloRequest = (req, res) => {
 const convertToHelloResponse = (res) => {
     return {
         clearAuth: () => {
-            const { name, value, options } = (0, router_1.clearAuthCookieParams)();
+            const { name, value, options } = (0, api_1.clearAuthCookieParams)();
             res.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, value, options));
         },
         send: (data) => res.type('text/html').send(data),
@@ -70,32 +70,32 @@ const convertToHelloResponse = (res) => {
 // })
 // Configure plugin options if needed
 const auth = function (config) {
-    if (!router_1.isConfigured) {
-        (0, router_1.configure)(config);
+    if (!api_1.isConfigured) {
+        (0, api_1.configure)(config);
     }
-    console.log({ isConfigured: router_1.isConfigured, configuration: router_1.configuration });
+    console.log({ isConfigured: api_1.isConfigured, configuration: api_1.configuration });
     const r = (0, express_1.Router)();
     r.use(async (req, res, next) => {
         const helloReq = convertToHelloRequest(req, res);
         req.getAuth = async () => {
-            req.auth = await (0, router_1.getAuthfromCookies)(helloReq);
+            req.auth = await (0, api_1.getAuthfromCookies)(helloReq);
             return req.auth;
         };
         res.clearAuth = () => {
-            const { name, value, options } = (0, router_1.clearAuthCookieParams)();
+            const { name, value, options } = (0, api_1.clearAuthCookieParams)();
             res.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, value, options));
         };
         next();
     });
-    r.post(router_1.configuration.apiRoute, (0, express_1.text)(), async (req, res) => {
+    r.post(api_1.configuration.apiRoute, (0, express_1.text)(), async (req, res) => {
         const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
-        await (0, router_1.router)(helloReq, helloRes);
+        await (0, api_1.router)(helloReq, helloRes);
     });
-    r.get(router_1.configuration.apiRoute, (0, express_1.text)(), async (req, res) => {
+    r.get(api_1.configuration.apiRoute, (0, express_1.text)(), async (req, res) => {
         const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
-        await (0, router_1.router)(helloReq, helloRes);
+        await (0, api_1.router)(helloReq, helloRes);
     });
     return r;
 };

package/dist/middleware.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setAuth = exports.unauthorized = exports.redirect = void 0;
-const router_1 = require("@hellocoop/router");
+const api_1 = require("@hellocoop/api");
 const redirect = function (target) {
     return async (req, res, next) => {
         const auth = await req.getAuth();
@@ -17,7 +17,7 @@ const unauthorized = async (req, res, next) => {
     if (auth.isLoggedIn)
         next();
     else
-        res.setHeader('WWW-Authenticate', `Hello ${router_1.configuration.clientId}`).status(401).send();
+        res.setHeader('WWW-Authenticate', `Hello ${api_1.configuration.clientId}`).status(401).send();
 };
 exports.unauthorized = unauthorized;
 const setAuth = async (req, res, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellocoop/express",
-  "version": "1.14.1",
+  "version": "1.15.0",
   "description": "Express SDK for Hellō https://hello.dev",
   "repository": {
     "type": "git",
@@ -36,21 +36,19 @@
   "scripts": {
     "test": "npm run build && npx playwright test",
     "watch": "tsc --watch --declaration",
-    "build": "npm run build:clean && npm run build:src",
-    "build:clean": "rimraf dist/",
-    "build:src": "tsc --declaration"
+    "prebuild": "rimraf dist node_modules",
+    "build": "tsc --declaration"
   },
   "peerDependencies": {
     "express": "^4"
   },
   "devDependencies": {
     "@hellocoop/mockin": "^1.0.4",
-    "@hellocoop/types": "~1.1.6",
     "@playwright/test": "^1.42.1",
     "@tsconfig/node18": "^18.2.2",
-    "@types/cookie": "^0.5.2",
+    "@types/cookie": "^0.6.0",
     "@types/express": "^4.17.20",
-    "@types/node": "^20.10.7",
+    "@types/node": "*",
     "express": "^4.18.2",
     "rimraf": "^5.0.1",
     "typescript": "^5.2.2"
@@ -59,11 +57,12 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@hellocoop/constants": "~1.1.6",
-    "@hellocoop/core": "~1.4.8",
-    "@hellocoop/router": "1.14",
-    "cookie": "^0.5.0",
+    "@hellocoop/api": "~2.0.0",
+    "@hellocoop/definitions": "1.0.0",
+    "@hellocoop/helper-server": "~2.0.0",
+    "cookie": "^1.0.1",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1"
-  }
+  },
+  "gitHead": "018e57826706471620d6ac09e66121e53877c87e"
 }