fix: Fix addUserFieldsToSession when using auth adapter.

lowdefy · Aug 3, 2022 · 850ee69 · 850ee69
1 parent e6261fe
commit 850ee69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/api/src/routes/auth/callbacks/addUserFieldsToSession.js b/packages/api/src/routes/auth/callbacks/addUserFieldsToSession.js
@@ -14,10 +14,17 @@
   limitations under the License.
 */
 
-function addUserFieldsToSession(context, { session, token, authConfig }) {
-  Object.keys(authConfig.userFields).forEach((fieldName) => {
-    session.user[fieldName] = token[fieldName];
-  });
+function addUserFieldsToSession(context, { session, token, authConfig, user }) {
+  if (token) {
+    Object.keys(authConfig.userFields).forEach((fieldName) => {
+      session.user[fieldName] = token[fieldName];
+    });
+  }
+  if (user) {
+    Object.keys(authConfig.userFields).forEach((fieldName) => {
+      session.user[fieldName] = user[fieldName];
+    });
+  }
 }
 
 export default addUserFieldsToSession;
diff --git a/packages/api/src/routes/auth/callbacks/createSessionCallback.js b/packages/api/src/routes/auth/callbacks/createSessionCallback.js
@@ -71,9 +71,10 @@ function createSessionCallback(context, { authConfig, plugins }) {
         updated_at,
         ...session.user,
       };
-      if (authConfig.userFields) {
-        addUserFieldsToSession(context, { authConfig, session, token });
-      }
+    }
+
+    if (authConfig.userFields) {
+      addUserFieldsToSession(context, { authConfig, session, token, user });
     }
 
     for (const plugin of sessionCallbackPlugins) {