From 97bcdc8e3d8fcc73b0ea5083cd1971ee76ba745d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sat, 10 Dec 2022 12:18:32 +0100
Subject: [PATCH] add microsoft login

---
 backend/oauth_login.json                   | 6 ++++++
 backend/windmill-api/src/oauth2.rs         | 2 +-
 frontend/src/routes/user/login@user.svelte | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/backend/oauth_login.json b/backend/oauth_login.json
index cdcc8c3191..3531aaba64 100644
--- a/backend/oauth_login.json
+++ b/backend/oauth_login.json
@@ -16,5 +16,11 @@
     "token_url": "https://oauth2.googleapis.com/token",
     "userinfo_url": "https://www.googleapis.com/oauth2/v1/userinfo?alt=json",
     "scopes": ["https://www.googleapis.com/auth/userinfo.email"]
+  },
+  "microsoft": {
+    "auth_url": "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
+    "token_url": "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+    "userinfo_url": "https://graph.microsoft.com/oidc/userinfo",
+    "scopes": ["openid", "profile", "email"]
   }
 }
diff --git a/backend/windmill-api/src/oauth2.rs b/backend/windmill-api/src/oauth2.rs
index 988acbc12e..378d0360ea 100644
--- a/backend/windmill-api/src/oauth2.rs
+++ b/backend/windmill-api/src/oauth2.rs
@@ -820,7 +820,7 @@ async fn slack_command(
 }
 
 #[allow(non_snake_case)]
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub struct UserInfo {
     email: Option<String>,
     name: Option<String>,
diff --git a/frontend/src/routes/user/login@user.svelte b/frontend/src/routes/user/login@user.svelte
index 5b6ea95c55..8a5a3f1583 100644
--- a/frontend/src/routes/user/login@user.svelte
+++ b/frontend/src/routes/user/login@user.svelte
@@ -9,7 +9,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation'
 	import { page } from '$app/stores'
-	import { faGithub, faGitlab, faGoogle } from '@fortawesome/free-brands-svg-icons'
+	import { faGithub, faGitlab, faGoogle, faMicrosoft } from '@fortawesome/free-brands-svg-icons'
 	import { onMount } from 'svelte'
 	import { slide } from 'svelte/transition'
 	import { OauthService, UserService, WorkspaceService } from '$lib/gen'
@@ -38,6 +38,11 @@
 			type: 'google',
 			name: 'Google',
 			icon: faGoogle
+		},
+		{
+			type: 'microsoft',
+			name: 'Microsoft',
+			icon: faMicrosoft
 		}
 	] as const