@lowdefy/api 4.0.0-alpha.15 → 4.0.0-alpha.18

package/dist/routes/auth/callbacks/addUserFieldsToSession.js

@@ -0,0 +1,20 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  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.
+*/ function addUserFieldsToSession(context, { session , token , authConfig  }) {
+    Object.keys(authConfig.userFields).forEach((fieldName)=>{
+        session.user[fieldName] = token[fieldName];
+    });
+}
+export default addUserFieldsToSession;

package/dist/routes/auth/callbacks/addUserFieldsToToken.js

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  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.
+*/ import { get } from '@lowdefy/helpers';
+function addUserFieldsToToken(context, { account , authConfig , profile , token  }) {
+    // const { debug } = context.logger;
+    const objects = {
+        account,
+        profile
+    };
+    // TODO: Add when debug is fixed.
+    // debug('Adding userFields to user. Available provider data is:');
+    // debug(objects);
+    Object.entries(authConfig.userFields).forEach(([lowdefyFieldName, providerFieldName])=>{
+        const value = get(objects, providerFieldName);
+        // debug(
+        //   `Adding provider field "${providerFieldName}" with value ${JSON.stringify(
+        //     value
+        //   )} as "${lowdefyFieldName}"`
+        // );
+        token[lowdefyFieldName] = value;
+    });
+}
+export default addUserFieldsToToken;

package/dist/routes/auth/callbacks/createCallbacks.js

@@ -16,24 +16,24 @@
 import createRedirectCallback from './createRedirectCallback.js';
 import createSessionCallback from './createSessionCallback.js';
 import createSignInCallback from './createSignInCallback.js';
-function createCallbacks({ authConfig , plugins  }) {
+function createCallbacks(context, { authConfig , plugins  }) {
     const callbacks = {
-        session: createSessionCallback({
+        session: createSessionCallback(context, {
             authConfig,
             plugins
         })
     };
-    const jwt = createJWTCallback({
+    const jwt = createJWTCallback(context, {
         authConfig,
         plugins
     });
     if (jwt) callbacks.jwt = jwt;
-    const redirect = createRedirectCallback({
+    const redirect = createRedirectCallback(context, {
         authConfig,
         plugins
     });
     if (redirect) callbacks.redirect = redirect;
-    const signIn = createSignInCallback({
+    const signIn = createSignInCallback(context, {
         authConfig,
         plugins
     });

package/dist/routes/auth/callbacks/createJWTCallback.js

@@ -12,8 +12,9 @@
   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.
-*/ import createCallbackPlugins from './createCallbackPlugins.js';
-function createJWTCallback({ authConfig , plugins  }) {
+*/ import addUserFieldsToToken from './addUserFieldsToToken.js';
+import createCallbackPlugins from './createCallbackPlugins.js';
+function createJWTCallback(context, { authConfig , plugins  }) {
     const jwtCallbackPlugins = createCallbackPlugins({
         authConfig,
         plugins,
@@ -45,6 +46,14 @@ function createJWTCallback({ authConfig , plugins  }) {
                 updated_at,
                 ...token
             };
+            if (authConfig.userFields) {
+                addUserFieldsToToken(context, {
+                    authConfig,
+                    account,
+                    profile,
+                    token
+                });
+            }
         }
         for (const plugin of jwtCallbackPlugins){
             token = await plugin.fn({

package/dist/routes/auth/callbacks/createRedirectCallback.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createCallbackPlugins from './createCallbackPlugins.js';
-function createRedirectCallback({ authConfig , plugins  }) {
+function createRedirectCallback(context, { authConfig , plugins  }) {
     const redirectCallbackPlugins = createCallbackPlugins({
         authConfig,
         plugins,

package/dist/routes/auth/callbacks/createSessionCallback.js

@@ -12,15 +12,15 @@
   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.
-*/ import createCallbackPlugins from './createCallbackPlugins.js';
-function createSessionCallback({ authConfig , plugins  }) {
+*/ import addUserFieldsToSession from './addUserFieldsToSession.js';
+import createCallbackPlugins from './createCallbackPlugins.js';
+function createSessionCallback(context, { authConfig , plugins  }) {
     const sessionCallbackPlugins = createCallbackPlugins({
         authConfig,
         plugins,
         type: 'session'
     });
     async function sessionCallback({ session , token , user  }) {
-        // console.log({ session, token, user });
         if (token) {
             const { sub , name , given_name , family_name , middle_name , nickname , preferred_username , profile , picture , website , email , email_verified , gender , birthdate , zoneinfo , locale , phone_number , phone_number_verified , address , updated_at ,  } = token;
             session.user = {
@@ -46,8 +46,16 @@ function createSessionCallback({ authConfig , plugins  }) {
                 updated_at,
                 ...session.user
             };
+            if (authConfig.userFields) {
+                addUserFieldsToSession(context, {
+                    authConfig,
+                    session,
+                    token
+                });
+            }
         }
         for (const plugin of sessionCallbackPlugins){
+            // eslint-disable-next-line no-param-reassign
             session = await plugin.fn({
                 properties: plugin.properties ?? {},
                 session,

package/dist/routes/auth/callbacks/createSignInCallback.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createCallbackPlugins from './createCallbackPlugins.js';
-function createSignInCallback({ authConfig , plugins  }) {
+function createSignInCallback(context, { authConfig , plugins  }) {
     const signInCallbackPlugins = createCallbackPlugins({
         authConfig,
         plugins,

package/dist/routes/auth/createProviders.js

@@ -16,7 +16,7 @@
 // Callback url to configure with provider will be: {{ protocol }}{{ host }}/api/auth/callback/{{ providerId }}
 // This depends on providerId, which might cause some issues if users copy an example and change the id.
 // We need to allow users to configure ids, since they might have more than one of the same type.
-function createProviders({ authConfig , plugins  }) {
+function createProviders(context, { authConfig , plugins  }) {
     return authConfig.providers.map((providerConfig)=>plugins.providers[providerConfig.type]({
             ...providerConfig.properties,
             id: providerConfig.id

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createCreateUserEvent({ authConfig , plugins  }) {
+function createCreateUserEvent(context, { authConfig , plugins  }) {
     const createUserPlugins = createEventPlugins({
         authConfig,
         plugins,

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

@@ -18,34 +18,34 @@ import createSessionEvent from './createSessionEvent.js';
 import createSignInEvent from './createSignInEvent.js';
 import createSignOutEvent from './createSignOutEvent.js';
 import createUpdateUserEvent from './createUpdateUserEvent.js';
-function createEvents({ authConfig , plugins  }) {
+function createEvents(context, { authConfig , plugins  }) {
     const events = {};
-    const createUser = createCreateUserEvent({
+    const createUser = createCreateUserEvent(context, {
         authConfig,
         plugins
     });
     if (createUser) events.createUser = createUser;
-    const linkAccount = createLinkAccountEvent({
+    const linkAccount = createLinkAccountEvent(context, {
         authConfig,
         plugins
     });
     if (linkAccount) events.linkAccount = linkAccount;
-    const session = createSessionEvent({
+    const session = createSessionEvent(context, {
         authConfig,
         plugins
     });
     if (session) events.session = session;
-    const signIn = createSignInEvent({
+    const signIn = createSignInEvent(context, {
         authConfig,
         plugins
     });
     if (signIn) events.signIn = signIn;
-    const signOut = createSignOutEvent({
+    const signOut = createSignOutEvent(context, {
         authConfig,
         plugins
     });
     if (signOut) events.signOut = signOut;
-    const updateUser = createUpdateUserEvent({
+    const updateUser = createUpdateUserEvent(context, {
         authConfig,
         plugins
     });

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createLinkAccountEvent({ authConfig , plugins  }) {
+function createLinkAccountEvent(context, { authConfig , plugins  }) {
     const linkAccountPlugins = createEventPlugins({
         authConfig,
         plugins,

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createSessionEvent({ authConfig , plugins  }) {
+function createSessionEvent(context, { authConfig , plugins  }) {
     const sessionPlugins = createEventPlugins({
         authConfig,
         plugins,

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createSignInEvent({ authConfig , plugins  }) {
+function createSignInEvent(context, { authConfig , plugins  }) {
     const signInPlugins = createEventPlugins({
         authConfig,
         plugins,

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createSignOutEvent({ authConfig , plugins  }) {
+function createSignOutEvent(context, { authConfig , plugins  }) {
     const signInPlugins = createEventPlugins({
         authConfig,
         plugins,

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

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createEventPlugins from './createEventPlugins.js';
-function createUpdateUserEvent({ authConfig , plugins  }) {
+function createUpdateUserEvent(context, { authConfig , plugins  }) {
     const updateUserPlugins = createEventPlugins({
         authConfig,
         plugins,

package/dist/routes/auth/getNextAuthConfig.js

@@ -20,9 +20,10 @@ import createEvents from './events/createEvents.js';
 import createProviders from './createProviders.js';
 const nextAuthConfig = {};
 let initialized = false;
-function getNextAuthConfig({ authJson , plugins  }) {
+function getNextAuthConfig(context, { authJson , plugins  }) {
     if (initialized) return nextAuthConfig;
     const secrets = getSecretsFromEnv();
+    // TODO: Add logger
     const operatorsParser = new NodeParser({
         operators: {
             _secret
@@ -38,15 +39,15 @@ function getNextAuthConfig({ authJson , plugins  }) {
     if (operatorErrors.length > 0) {
         throw new Error(operatorErrors[0]);
     }
-    nextAuthConfig.callbacks = createCallbacks({
+    nextAuthConfig.callbacks = createCallbacks(context, {
         authConfig,
         plugins
     });
-    nextAuthConfig.events = createEvents({
+    nextAuthConfig.events = createEvents(context, {
         authConfig,
         plugins
     });
-    nextAuthConfig.providers = createProviders({
+    nextAuthConfig.providers = createProviders(context, {
         authConfig,
         plugins
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/api",
-  "version": "4.0.0-alpha.15",
+  "version": "4.0.0-alpha.18",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -41,15 +41,15 @@
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/ajv": "4.0.0-alpha.15",
-    "@lowdefy/helpers": "4.0.0-alpha.15",
-    "@lowdefy/node-utils": "4.0.0-alpha.15",
-    "@lowdefy/nunjucks": "4.0.0-alpha.15",
-    "@lowdefy/operators": "4.0.0-alpha.15"
+    "@lowdefy/ajv": "4.0.0-alpha.18",
+    "@lowdefy/helpers": "4.0.0-alpha.18",
+    "@lowdefy/node-utils": "4.0.0-alpha.18",
+    "@lowdefy/nunjucks": "4.0.0-alpha.18",
+    "@lowdefy/operators": "4.0.0-alpha.18",
+    "@lowdefy/operators-js": "4.0.0-alpha.18"
   },
   "devDependencies": {
     "@jest/globals": "28.1.0",
-    "@lowdefy/operators-js": "4.0.0-alpha.15",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.194",
     "@swc/jest": "0.2.21",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4e4538475e997f95baa37f01f39689240e6f01c"
+  "gitHead": "9ba94a9ab39be2a165b3a58043fbb33f26b48ae3"
 }