Merge pull request #10 from opf/bug/50167-internal-server-error-upon-…

…login-via-microsoft-entra-id [#50167] changed azure client opts to use v2 endpoints
opf · Oct 20, 2023 · c7e2498 · c7e2498
2 parents 7559f44 + 215d614
commit c7e2498
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/
diff --git a/lib/omniauth/openid_connect/azure.rb b/lib/omniauth/openid_connect/azure.rb
@@ -28,9 +28,11 @@ def secret
     end
 
     def client_options
+      v2_switch = tenant == 'common' ? '' : 'v2.0/'
+
       opts = {
-        authorization_endpoint: "/#{tenant}/oauth2/authorize",
-        token_endpoint: "/#{tenant}/oauth2/token",
+        authorization_endpoint: "/#{tenant}/oauth2/#{v2_switch}authorize",
+        token_endpoint: "/#{tenant}/oauth2/#{v2_switch}token",
         userinfo_endpoint: userinfo_endpoint
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ spec/reports @@
     test/tmp
     test/version_tmp
     tmp
+    .idea/