@hellocoop/fastify 1.12.2 → 1.13.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,7 +1,7 @@
 import { FastifyPluginAsync } from 'fastify';
 import { FastifyPluginOptions } from 'fastify';
-import { Auth } from '@hellocoop/types';
-import { Config } from '@hellocoop/router';
+import { Auth } from '@hellocoop/definitions';
+import { Config } from '@hellocoop/api';
 declare module 'fastify' {
     interface FastifyRequest {
         auth?: Auth;

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,kBAAkB,EACpB,MAAM,SAAS,CAAA;AAGjB,OAAO,EAGH,oBAAoB,EACvB,MAAM,SAAS,CAAA;AAIhB,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EASH,MAAM,EACT,MAAO,mBAAmB,CAAA;AAwC3B,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,cAAc;QACtB,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KAC7B;IACD,UAAU,YAAY;QACpB,SAAS,EAAE,MAAM,IAAI,CAAC;KACvB;CACF;AAEH,MAAM,WAAW,WAAY,SAAQ,oBAAoB,EAAE,MAAM;CAAG;AA6BpE,eAAO,MAAM,IAAI,iCAAoB,CAAA"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,kBAAkB,EACpB,MAAM,SAAS,CAAA;AAGjB,OAAO,EAGH,oBAAoB,EACvB,MAAM,SAAS,CAAA;AAIhB,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EASH,MAAM,EACT,MAAO,gBAAgB,CAAA;AAgDxB,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,cAAc;QACtB,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KAC7B;IACD,UAAU,YAAY;QACpB,SAAS,EAAE,MAAM,IAAI,CAAC;KACvB;CACF;AAEH,MAAM,WAAW,WAAY,SAAQ,oBAAoB,EAAE,MAAM;CAAG;AA8BpE,eAAO,MAAM,IAAI,iCAAoB,CAAA"}

package/dist/auth.js

@@ -7,22 +7,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.auth = void 0;
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const cookie_1 = require("cookie");
-const router_1 = require("@hellocoop/router");
-const convertToHelloRequest = (req) => {
+const api_1 = require("@hellocoop/api");
+const convertToHelloRequest = (req, res) => {
     return {
         headers: () => { return req.headers; },
         query: req.query,
-        path: req.routeOptions.url,
+        path: req?.routeOptions?.url || '',
         getAuth: () => { return req.auth; },
         setAuth: (auth) => { req.auth = auth; },
         method: req.method,
-        body: req.body
+        body: req.body,
+        frameWork: 'fastify',
+        loginSyncWrapper: (loginSync, params) => {
+            return loginSync({ ...params, req, res });
+        },
+        logoutSyncWrapper: (logoutSync) => {
+            return logoutSync({ req, res });
+        },
     };
 };
 const convertToHelloResponse = (res) => {
     return {
         clearAuth: () => {
-            const { name, value, options } = (0, router_1.clearAuthCookieParams)();
+            const { name, value, options } = (0, api_1.clearAuthCookieParams)();
             res.header('Set-Cookie', (0, cookie_1.serialize)(name, value, options));
         },
         send: (data) => res.type('text/html').send(data),
@@ -42,27 +49,28 @@ const convertToHelloResponse = (res) => {
     };
 };
 const helloPlugin = async (instance, options) => {
-    if (!router_1.isConfigured)
-        (0, router_1.configure)(options);
+    if (!api_1.isConfigured)
+        (0, api_1.configure)(options);
     instance.decorateRequest('auth', undefined);
     instance.decorateRequest('getAuth', async function () {
-        const helloReq = convertToHelloRequest(this);
-        this.auth = await (0, router_1.getAuthfromCookies)(helloReq);
+        const dummyResponse = {};
+        const helloReq = convertToHelloRequest(this, dummyResponse);
+        this.auth = await (0, api_1.getAuthfromCookies)(helloReq);
         return this.auth;
     });
     instance.decorateReply('clearAuth', function () {
-        const { name, value, options } = (0, router_1.clearAuthCookieParams)();
+        const { name, value, options } = (0, api_1.clearAuthCookieParams)();
         this.header('Set-Cookie', (0, cookie_1.serialize)(name, value, options));
     });
-    instance.get(router_1.configuration.apiRoute, async (req, res) => {
-        const helloReq = convertToHelloRequest(req);
+    instance.get(api_1.configuration.apiRoute, async (req, res) => {
+        const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
-        return await (0, router_1.router)(helloReq, helloRes);
+        return await (0, api_1.router)(helloReq, helloRes);
     });
-    instance.post(router_1.configuration.apiRoute, async (req, res) => {
-        const helloReq = convertToHelloRequest(req);
+    instance.post(api_1.configuration.apiRoute, async (req, res) => {
+        const helloReq = convertToHelloRequest(req, res);
         const helloRes = convertToHelloResponse(res);
-        return await (0, router_1.router)(helloReq, helloRes);
+        return await (0, api_1.router)(helloReq, helloRes);
     });
 };
 exports.auth = (0, fastify_plugin_1.default)(helloPlugin);

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { auth, HelloConfig } from './auth';
 export default auth;
 export { auth as helloAuth, HelloConfig };
-export { LoginSyncParams, LoginSyncResponse, LogoutSyncParams, LogoutSyncResponse } from '@hellocoop/router';
+export { LoginSyncResponse, LogoutSyncResponse } from '@hellocoop/api';
 export { redirect, unauthorized, setAuth } from './middleware';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,WAAW,EAAE,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC5G,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,WAAW,EAAE,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA"}

package/dist/middleware.d.ts

@@ -1,5 +1,5 @@
 import { FastifyRequest, FastifyReply } from 'fastify';
-import { Auth } from '@hellocoop/types';
+import { Auth } from '@hellocoop/definitions';
 declare module 'fastify' {
     interface FastifyRequest {
         getAuth: () => Promise<Auth>;

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAGvC,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,cAAc;QACtB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC9B;CACF;AAED,eAAO,MAAM,QAAQ,WAAY,MAAM,eACd,cAAc,SAAS,YAAY,uBAQ3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,cAAc,SAAS,YAAY,uBAM9E,CAAC;AAEF,eAAO,MAAM,OAAO,YAAmB,cAAc,SAAS,YAAY,kBAEzE,CAAC"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAG7C,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,cAAc;QACtB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC9B;CACF;AAED,eAAO,MAAM,QAAQ,WAAY,MAAM,eACd,cAAc,SAAS,YAAY,uBAQ3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,cAAc,SAAS,YAAY,uBAM9E,CAAC;AAEF,eAAO,MAAM,OAAO,YAAmB,cAAc,SAAS,YAAY,kBAEzE,CAAC"}

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 = (target) => {
     return async (request, reply) => {
         const auth = await request.getAuth();
@@ -17,7 +17,7 @@ exports.redirect = redirect;
 const unauthorized = async (request, reply) => {
     const auth = await request.getAuth();
     if (!auth.isLoggedIn) {
-        reply.header('WWW-Authenticate', `Hello ${router_1.configuration.clientId}`).status(401);
+        reply.header('WWW-Authenticate', `Hello ${api_1.configuration.clientId}`).status(401);
         return reply.send();
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellocoop/fastify",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "description": "Fastify SDK for Hellō https://hello.dev",
   "repository": {
     "type": "git",
@@ -35,9 +35,10 @@
   },
   "scripts": {
     "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",
+    "test": "npm run build && docker compose -f ./spec/docker-compose.yml up --build --abort-on-container-exit",
+    "spec": "wait-on http://mockin:3333/mock && mocha './spec/**/*.spec.mjs'"
   },
   "peerDependencies": {
     "fastify": "^4"
@@ -52,8 +53,9 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@hellocoop/router": "^1.10.0",
+    "@hellocoop/api": "~2.0.0",
     "dotenv": "^16.3.1",
     "fastify-plugin": "^4.5.1"
-  }
+  },
+  "gitHead": "018e57826706471620d6ac09e66121e53877c87e"
 }

package/dist/server.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":""}

package/dist/server.js

@@ -1,73 +0,0 @@
-"use strict";
-// test server
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// import fastly from 'fastify'
-// import auth from './index'
-// import { redirect, unauthorized, setAuth } from './middleware'
-// const app = fastly();
-// const port = 8080; // default port to listen
-// app.register(auth,{client_id:'90804992-8d01-474e-8a0c-59cddeb5a1a3'})
-// app.get( "/", async ( req, res ) => {
-//     res.send( await req.getAuth()) 
-// } );
-// app.get( "/redirect", redirect('/'), async ( req, res ) => {
-//     res.send( await req.getAuth()) 
-// } );
-// app.get( "/unauthorized", unauthorized, async ( req, res ) => {
-//     res.send( await req.getAuth()) 
-// } );
-// app.get( "/setAuth", setAuth, ( req, res ) => {
-//     res.send( req.auth) 
-// } );
-// // start the Express server
-// app.listen( port, () => {
-//     console.log( `server started at http://localhost:${ port }` );
-// } );
-const fastify_1 = __importDefault(require("fastify"));
-const index_1 = require("./index");
-const middleware_1 = require("./middleware");
-const config = require('../hello.config.js');
-const app = (0, fastify_1.default)();
-const port = 8080;
-// Register your auth plugin with Fastify
-app.register(index_1.helloAuth, config);
-// Define your routes, using preHandler hooks to replace Express middleware
-app.get("/", async (request, reply) => {
-    const auth = await request.getAuth();
-    return reply.send(auth);
-});
-app.get("/redirect", {
-    preHandler: (0, middleware_1.redirect)('/'),
-    handler: async (request, reply) => {
-        const auth = await request.getAuth();
-        return reply.send(auth);
-    }
-});
-app.get("/unauthorized", {
-    preHandler: middleware_1.unauthorized,
-    handler: async (request, reply) => {
-        const auth = await request.getAuth();
-        return reply.send(auth);
-    }
-});
-app.get("/setAuth", {
-    preHandler: middleware_1.setAuth,
-    handler: async (request, reply) => {
-        // Assuming setAuth sets something like request.auth
-        return reply.send(request.auth);
-    }
-});
-const startServer = async () => {
-    try {
-        await app.listen({ port: port });
-        console.log(`Server started at http://localhost:${port}`);
-    }
-    catch (err) {
-        console.error(err);
-        process.exit(1);
-    }
-};
-startServer();