From adc9689950c2e4975370b6dd66a4bfaaee94d3d4 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sat, 26 Nov 2022 15:57:55 +0100
Subject: [PATCH] fix getting email from github

---
 backend/windmill-api/src/oauth2.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/windmill-api/src/oauth2.rs b/backend/windmill-api/src/oauth2.rs
index fd3a91fd98..ce9216e7a5 100644
--- a/backend/windmill-api/src/oauth2.rs
+++ b/backend/windmill-api/src/oauth2.rs
@@ -785,7 +785,7 @@ async fn slack_command(
 #[allow(non_snake_case)]
 #[derive(Deserialize)]
 pub struct UserInfo {
-    email: String,
+    email: Option<String>,
     name: Option<String>,
     company: Option<String>,
     displayName: Option<String>,
@@ -829,7 +829,9 @@ async fn login_callback(
             )))?
             .email
             .to_string(),
-            _ => user.email,
+            _ => user.email.ok_or_else(|| {
+                error::Error::BadRequest("email address not fetchable from user info".to_string())
+            })?,
         };
 
         if let Some(domains) = &client_w_config.allowed_domains {