Actually use new email and return immediately

cloudron-io · Jun 5, 2024 · b1ca589 · b1ca589
1 parent dad1401
commit b1ca589
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -104,3 +104,5 @@
 [1.11.1]
 * Update user email if changed at the OpenID provider
 
+[1.11.2]
+* Update user email if changed at the OpenID provider
diff --git a/CloudronManifest.json b/CloudronManifest.json
@@ -9,8 +9,8 @@
     "releases",
     "github"
   ],
-  "version": "1.11.1",
-  "upstreamVersion": "1.11.1",
+  "version": "1.11.2",
+  "upstreamVersion": "1.11.2",
   "healthCheckPath": "/api/v1/status",
   "httpPort": 3000,
   "manifestVersion": 2,

diff --git a/backend/routes.js b/backend/routes.js
@@ -61,7 +61,8 @@ async function auth(req, res, next) {
     // update email if changed
     if (user.email !== req.oidc.user.email) {
         try {
-            await database.users.update(user.id, user.githubToken, user.email);
+            await database.users.update(user.id, user.githubToken, req.oidc.user.email);
+            user.email = req.oidc.user.email;
         } catch (e) {
             console.error('Failed to update email for user.', user, e);
         }