@hellocoop/express 1.12.2 → 1.14.0

package/dist/auth.d.ts

@@ -1,7 +1,23 @@
-import { Router } from 'express';
-import { Auth } from '@hellocoop/types';
-import { Config } from '@hellocoop/router';
-export type HelloConfig = Config;
+import { Router, Request, Response } from 'express';
+import { Auth, Claims } from '@hellocoop/types';
+import { LoginSyncResponse, LogoutSyncResponse, Config } from '@hellocoop/router';
+type ExpressLoginParams = {
+    token: string;
+    payload: Claims;
+    target_uri: string;
+    req: Request;
+    res: Response;
+};
+type ExpressLogoutParams = {
+    req: Request;
+    res: Response;
+};
+type ExpressLoginSync = (params: ExpressLoginParams) => Promise<LoginSyncResponse>;
+type ExpressLogoutSync = (params: ExpressLogoutParams) => Promise<LogoutSyncResponse>;
+export type HelloConfig = Omit<Config, 'loginSync' | 'logoutSync'> & {
+    loginSync: ExpressLoginSync;
+    logoutSync: ExpressLogoutSync;
+};
 declare global {
     namespace Express {
         interface Request {
@@ -14,4 +30,5 @@ declare global {
     }
 }
 export declare const auth: (config: Config) => Router;
+export {};
 //# sourceMappingURL=auth.d.ts.map

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,EAAyC,MAAM,SAAS,CAAA;AAEvE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAQH,MAAM,EAET,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,WAAW,GAAG,MAAM,CAAA;AAgDhC,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,MAmC/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,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,MAmC/C,CAAA"}

package/dist/auth.js

@@ -4,7 +4,7 @@ exports.auth = void 0;
 const express_1 = require("express");
 const cookie_1 = require("cookie");
 const router_1 = require("@hellocoop/router");
-const convertToHelloRequest = (req) => {
+const convertToHelloRequest = (req, res) => {
     return {
         headers: () => req.headers,
         query: req.query,
@@ -12,7 +12,14 @@ const convertToHelloRequest = (req) => {
         getAuth: () => req.auth,
         setAuth: (auth) => { req.auth = auth; },
         method: req.method,
-        body: req.body
+        body: req.body,
+        frameWork: 'express',
+        loginSyncWrapper: (loginSync, params) => {
+            return loginSync({ ...params, req, res });
+        },
+        logoutSyncWrapper: (logoutSync) => {
+            return logoutSync({ req, res });
+        },
     };
 };
 const convertToHelloResponse = (res) => {
@@ -69,7 +76,7 @@ const auth = function (config) {
     console.log({ isConfigured: router_1.isConfigured, configuration: router_1.configuration });
     const r = (0, express_1.Router)();
     r.use(async (req, res, next) => {
-        const helloReq = convertToHelloRequest(req);
+        const helloReq = convertToHelloRequest(req, res);
         req.getAuth = async () => {
             req.auth = await (0, router_1.getAuthfromCookies)(helloReq);
             return req.auth;
@@ -82,12 +89,12 @@ const auth = function (config) {
     });
     r.use((0, express_1.text)()); // for parsing text/plain
     r.post(router_1.configuration.apiRoute, async (req, res) => {
-        const helloReq = convertToHelloRequest(req);
+        const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
         await (0, router_1.router)(helloReq, helloRes);
     });
     r.get(router_1.configuration.apiRoute, async (req, res) => {
-        const helloReq = convertToHelloRequest(req);
+        const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
         await (0, router_1.router)(helloReq, helloRes);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellocoop/express",
-  "version": "1.12.2",
+  "version": "1.14.0",
   "description": "Express SDK for Hellō https://hello.dev",
   "repository": {
     "type": "git",
@@ -61,7 +61,7 @@
   "dependencies": {
     "@hellocoop/constants": "~1.1.6",
     "@hellocoop/core": "~1.4.8",
-    "@hellocoop/router": "~1.11.1",
+    "@hellocoop/router": "1.14",
     "cookie": "^0.5.0",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1"