@lowdefy/api 4.0.0-rc.9 → 4.0.0

package/dist/routes/auth/events/createSignOutEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,15 +13,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createSignOutEvent(context, { authConfig , plugins  }) {
-    const signInPlugins = createEventPlugins({
+function createSignOutEvent({ authConfig, logger, plugins }) {
+    const signOutPlugins = createEventPlugins({
         authConfig,
         plugins,
         type: 'signOut'
     });
-    if (signInPlugins.length === 0) return undefined;
-    async function signInEvent({ session , token  }) {
-        for (const plugin of signInPlugins){
+    async function signOutEvent({ session, token }) {
+        const user = session?.user ?? token;
+        logger.info({
+            event: 'auth_sign_out',
+            user: {
+                id: user.id,
+                roles: user.roles,
+                sub: user.sub,
+                session_id: user.session_id
+            }
+        });
+        for (const plugin of signOutPlugins){
             await plugin.fn({
                 properties: plugin.properties ?? {},
                 session,
@@ -29,6 +38,6 @@ function createSignOutEvent(context, { authConfig , plugins  }) {
             });
         }
     }
-    return signInEvent;
+    return signOutEvent;
 }
 export default createSignOutEvent;

package/dist/routes/auth/events/createUpdateUserEvent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,14 +13,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createUpdateUserEvent(context, { authConfig , plugins  }) {
+function createUpdateUserEvent({ authConfig, logger, plugins }) {
     const updateUserPlugins = createEventPlugins({
         authConfig,
         plugins,
         type: 'updateUser'
     });
-    if (updateUserPlugins.length === 0) return undefined;
-    async function updateUserEvent({ user  }) {
+    async function updateUserEvent({ user }) {
+        logger.info({
+            event: 'auth_update_user',
+            user: {
+                id: user.id,
+                roles: user.roles,
+                sub: user.sub,
+                session_id: user.session_id
+            }
+        });
         for (const plugin of updateUserPlugins){
             await plugin.fn({
                 properties: plugin.properties ?? {},

package/dist/routes/auth/getNextAuthConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,18 +13,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ServerParser } from '@lowdefy/operators';
-import { getSecretsFromEnv } from '@lowdefy/node-utils';
 import { _secret } from '@lowdefy/operators-js/operators/server';
 import createAdapter from './createAdapter.js';
 import createCallbacks from './callbacks/createCallbacks.js';
 import createEvents from './events/createEvents.js';
+import createLogger from './createLogger.js';
 import createProviders from './createProviders.js';
 const nextAuthConfig = {};
 let initialized = false;
-function getNextAuthConfig(context, { authJson , plugins  }) {
+function getNextAuthConfig({ authJson, logger, plugins, secrets }) {
     if (initialized) return nextAuthConfig;
-    const secrets = getSecretsFromEnv();
-    // TODO: Add logger
     const operatorsParser = new ServerParser({
         operators: {
             _secret
@@ -33,33 +31,42 @@ function getNextAuthConfig(context, { authJson , plugins  }) {
         secrets,
         user: {}
     });
-    const { output: authConfig , errors: operatorErrors  } = operatorsParser.parse({
+    const { output: authConfig, errors: operatorErrors } = operatorsParser.parse({
         input: authJson,
         location: 'auth'
     });
     if (operatorErrors.length > 0) {
         throw new Error(operatorErrors[0]);
     }
-    nextAuthConfig.adapter = createAdapter(context, {
+    nextAuthConfig.adapter = createAdapter({
         authConfig,
+        logger,
         plugins
     });
-    nextAuthConfig.callbacks = createCallbacks(context, {
+    nextAuthConfig.callbacks = createCallbacks({
         authConfig,
+        logger,
         plugins
     });
-    nextAuthConfig.events = createEvents(context, {
+    nextAuthConfig.events = createEvents({
         authConfig,
+        logger,
         plugins
     });
-    nextAuthConfig.providers = createProviders(context, {
+    nextAuthConfig.logger = createLogger({
+        logger
+    });
+    nextAuthConfig.providers = createProviders({
         authConfig,
+        logger,
         plugins
     });
+    nextAuthConfig.debug = authConfig.debug ?? logger?.isLevelEnabled('debug') === true;
+    nextAuthConfig.pages = authConfig.authPages;
     nextAuthConfig.session = authConfig.session;
     nextAuthConfig.theme = authConfig.theme;
-    nextAuthConfig.pages = authConfig.authPages;
     nextAuthConfig.cookies = authConfig?.advanced?.cookies;
+    nextAuthConfig.originalRedirectCallback = nextAuthConfig.callbacks.redirect;
     initialized = true;
     return nextAuthConfig;
 }

package/dist/routes/page/getPageConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,11 +12,11 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ async function getPageConfig({ authorize , readConfigFile  }, { pageId  }) {
+*/ async function getPageConfig({ authorize, readConfigFile }, { pageId }) {
     const pageConfig = await readConfigFile(`pages/${pageId}/${pageId}.json`);
     if (pageConfig && authorize(pageConfig)) {
         // eslint-disable-next-line no-unused-vars
-        const { auth , ...rest } = pageConfig;
+        const { auth, ...rest } = pageConfig;
         return {
             ...rest
         };

package/dist/routes/request/authorizeRequest.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,16 +13,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-function authorizeRequest({ authorize , logger  }, { requestConfig  }) {
+function authorizeRequest({ authorize, logger }, { requestConfig }) {
     if (!authorize(requestConfig)) {
-        logger.warn({
-            authorized: false
-        }, 'Unauthorized Request');
+        logger.debug({
+            event: 'debug_request_authorize',
+            authorized: false,
+            auth_config: requestConfig.auth
+        });
         // Throw does not exist error to avoid leaking information that request exists to unauthorized users
         throw new ConfigurationError(`Request "${requestConfig.requestId}" does not exist.`);
     }
     logger.debug({
-        authorized: true
-    }, 'Authorize Request');
+        event: 'debug_request_authorize',
+        authorized: true,
+        auth_config: requestConfig.auth
+    });
 }
 export default authorizeRequest;

package/dist/routes/request/callRequest.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -23,17 +23,15 @@ import getConnectionConfig from './getConnectionConfig.js';
 import getRequestConfig from './getRequestConfig.js';
 import getRequestResolver from './getRequestResolver.js';
 import validateSchemas from './validateSchemas.js';
-async function callRequest(context, { blockId , pageId , payload , requestId  }) {
-    const { logger  } = context;
+async function callRequest(context, { blockId, pageId, payload, requestId }) {
+    const { logger } = context;
     logger.debug({
-        route: 'request',
-        params: {
-            blockId,
-            pageId,
-            payload,
-            requestId
-        }
-    }, 'Started request');
+        event: 'debug_request',
+        blockId,
+        pageId,
+        payload,
+        requestId
+    });
     const requestConfig = await getRequestConfig(context, {
         pageId,
         requestId
@@ -52,7 +50,7 @@ async function callRequest(context, { blockId , pageId , payload , requestId  })
         requestConfig
     });
     const deserializedPayload = serializer.deserialize(payload);
-    const { connectionProperties , requestProperties  } = evaluateOperators(context, {
+    const { connectionProperties, requestProperties } = evaluateOperators(context, {
         connectionConfig,
         payload: deserializedPayload,
         requestConfig

package/dist/routes/request/callRequestResolver.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,11 +13,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { RequestError } from '../../context/errors.js';
-async function callRequestResolver({ logger  }, { blockId , connectionProperties , payload , requestConfig , requestProperties , requestResolver  }) {
+async function callRequestResolver({ logger }, { blockId, connectionProperties, payload, requestConfig, requestProperties, requestResolver }) {
     try {
         const response = await requestResolver({
             blockId,
             connection: connectionProperties,
+            connectionId: requestConfig.connectionId,
             pageId: requestConfig.pageId,
             payload,
             request: requestProperties,

package/dist/routes/request/checkConnectionRead.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-function checkConnectionRead({ logger  }, { connectionConfig , connectionProperties , requestConfig , requestResolver  }) {
+function checkConnectionRead({ logger }, { connectionConfig, connectionProperties, requestConfig, requestResolver }) {
     if (requestResolver.meta.checkRead && connectionProperties.read === false) {
         const err = new ConfigurationError(`Connection "${connectionConfig.connectionId}" does not allow reads.`);
         logger.debug({

package/dist/routes/request/checkConnectionWrite.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-function checkConnectionWrite({ logger  }, { connectionConfig , connectionProperties , requestConfig , requestResolver  }) {
+function checkConnectionWrite({ logger }, { connectionConfig, connectionProperties, requestConfig, requestResolver }) {
     if (requestResolver.meta.checkWrite && connectionProperties.write !== true) {
         const err = new ConfigurationError(`Connection "${connectionConfig.connectionId}" does not allow writes.`);
         logger.debug({

package/dist/routes/request/evaluateOperators.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
   limitations under the License.
 */ import { ServerParser } from '@lowdefy/operators';
 import { RequestError } from '../../context/errors.js';
-function evaluateOperators({ operators , secrets , user  }, { connectionConfig , payload , requestConfig  }) {
+function evaluateOperators({ operators, secrets, session }, { connectionConfig, payload, requestConfig }) {
     const operatorsParser = new ServerParser({
         operators,
         payload,
         secrets,
-        user
+        user: session?.user
     });
-    const { output: connectionProperties , errors: connectionErrors  } = operatorsParser.parse({
+    const { output: connectionProperties, errors: connectionErrors } = operatorsParser.parse({
         input: connectionConfig.properties || {},
         location: connectionConfig.connectionId
     });
     if (connectionErrors.length > 0) {
         throw new RequestError(connectionErrors[0]);
     }
-    const { output: requestProperties , errors: requestErrors  } = operatorsParser.parse({
+    const { output: requestProperties, errors: requestErrors } = operatorsParser.parse({
         input: requestConfig.properties || {},
         location: requestConfig.requestId
     });

package/dist/routes/request/getConnection.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-function getConnection({ connections , logger  }, { connectionConfig  }) {
+function getConnection({ connections, logger }, { connectionConfig }) {
     const connection = connections[connectionConfig.type];
     if (!connection) {
         const err = new ConfigurationError(`Connection type "${connectionConfig.type}" can not be found.`);

package/dist/routes/request/getConnectionConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-async function getConnectionConfig({ logger , readConfigFile  }, { requestConfig  }) {
-    const { connectionId , requestId  } = requestConfig;
+async function getConnectionConfig({ logger, readConfigFile }, { requestConfig }) {
+    const { connectionId, requestId } = requestConfig;
     let err;
     if (!connectionId) {
         err = new ConfigurationError(`Request "${requestId}" does not specify a connection.`);

package/dist/routes/request/getRequestConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-async function getRequestConfig({ logger , readConfigFile  }, { pageId , requestId  }) {
+async function getRequestConfig({ logger, readConfigFile }, { pageId, requestId }) {
     const request = await readConfigFile(`pages/${pageId}/requests/${requestId}.json`);
     if (!request) {
         const err = new ConfigurationError(`Request "${requestId}" does not exist.`);

package/dist/routes/request/getRequestResolver.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ConfigurationError } from '../../context/errors.js';
-function getRequestResolver({ logger  }, { connection , requestConfig  }) {
+function getRequestResolver({ logger }, { connection, requestConfig }) {
     const requestResolver = connection.requests[requestConfig.type];
     if (!requestResolver) {
         const err = new ConfigurationError(`Request type "${requestConfig.type}" can not be found.`);

package/dist/routes/request/validateSchemas.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
   limitations under the License.
 */ import { validate } from '@lowdefy/ajv';
 import { ConfigurationError } from '../../context/errors.js';
-function validateSchemas({ logger  }, { connection , connectionProperties , requestConfig , requestResolver , requestProperties  }) {
+function validateSchemas({ logger }, { connection, connectionProperties, requestConfig, requestResolver, requestProperties }) {
     try {
         validate({
             schema: connection.schema,

package/dist/routes/rootConfig/getHomeAndMenus.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/routes/rootConfig/getLowdefyGlobal.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ async function getLowdefyGlobal({ readConfigFile  }) {
+*/ async function getLowdefyGlobal({ readConfigFile }) {
     const lowdefyGlobal = await readConfigFile('global.json');
     return lowdefyGlobal || {};
 }

package/dist/routes/rootConfig/getRootConfig.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */ import getHomeAndMenus from './getHomeAndMenus.js';
 import getLowdefyGlobal from './getLowdefyGlobal.js';
 async function getRootConfig(context) {
-    const [lowdefyGlobal, { home , menus  }] = await Promise.all([
+    const [lowdefyGlobal, { home, menus }] = await Promise.all([
         getLowdefyGlobal(context),
         getHomeAndMenus(context)
     ]);

package/dist/routes/rootConfig/menus/filterMenuList.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { get } from '@lowdefy/helpers';
-function filterMenuList(context, { menuList  }) {
-    const { authorize  } = context;
+function filterMenuList(context, { menuList }) {
+    const { authorize } = context;
     return menuList.map((item)=>{
         if (item.type === 'MenuLink') {
             if (authorize(item)) {

package/dist/routes/rootConfig/menus/filterMenus.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
   limitations under the License.
 */ import { get } from '@lowdefy/helpers';
 import filterMenuList from './filterMenuList.js';
-function filterMenus(context, { menus  }) {
+function filterMenus(context, { menus }) {
     return menus.map((menu)=>{
         return {
             ...menu,

package/dist/routes/rootConfig/menus/getMenus.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/test/testContext.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2023 Lowdefy, Inc
+  Copyright 2020-2024 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createAuthorize from '../context/createAuthorize.js';
-function testContext({ config ={} , connections ={} , headers ={} , host ='host' , logger ={
+function testContext({ config = {}, connections = {}, headers = {}, logger = {
     debug: ()=>{},
     error: ()=>{},
     info: ()=>{},
     warn: ()=>{}
-} , operators ={
+}, operators = {
     _test: ()=>'test'
-} , readConfigFile , secrets ={} , setHeader , session , protocol ='https'  } = {}) {
+}, readConfigFile, secrets = {}, session } = {}) {
     return {
         authorize: createAuthorize({
             session
@@ -28,14 +28,11 @@ function testContext({ config ={} , connections ={} , headers ={} , host ='host'
         config,
         connections,
         headers,
-        host,
         logger,
         operators,
-        protocol,
         readConfigFile,
         secrets,
-        setHeader,
-        user: session?.user
+        session
     };
 }
 export default testContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/api",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -33,29 +33,27 @@
   "files": [
     "dist/*"
   ],
-  "scripts": {
-    "build": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "clean": "rm -rf dist",
-    "prepublishOnly": "pnpm build",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
-  },
   "dependencies": {
-    "@lowdefy/ajv": "4.0.0-rc.9",
-    "@lowdefy/helpers": "4.0.0-rc.9",
-    "@lowdefy/node-utils": "4.0.0-rc.9",
-    "@lowdefy/nunjucks": "4.0.0-rc.9",
-    "@lowdefy/operators": "4.0.0-rc.9",
-    "@lowdefy/operators-js": "4.0.0-rc.9"
+    "@lowdefy/ajv": "4.0.0",
+    "@lowdefy/helpers": "4.0.0",
+    "@lowdefy/node-utils": "4.0.0",
+    "@lowdefy/nunjucks": "4.0.0",
+    "@lowdefy/operators": "4.0.0",
+    "@lowdefy/operators-js": "4.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "28.1.0",
-    "@swc/cli": "0.1.59",
-    "@swc/core": "1.3.24",
-    "@swc/jest": "0.2.24",
-    "jest": "28.1.0"
+    "@jest/globals": "28.1.3",
+    "@swc/cli": "0.1.63",
+    "@swc/core": "1.3.99",
+    "@swc/jest": "0.2.29",
+    "jest": "28.1.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d20e6ac424643feca527a732dc2b0710713c8243"
-}
+  "scripts": {
+    "build": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
+    "clean": "rm -rf dist",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+  }
+}