O365: fix #92 failover for null query with non https URI

git-svn-id: https://svn.code.sf.net/p/davmail/code/trunk@3281 3d1905a2-6b24-0410-a738-b14d5a86fcbd
mguessan · Mar 4, 2020 · 91e14c9 · 91e14c9
1 parent 8bcfe38
commit 91e14c9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/java/davmail/exchange/auth/O365Authenticator.java b/src/java/davmail/exchange/auth/O365Authenticator.java
@@ -308,6 +308,10 @@ private String authenticateADFS(HttpClientAdapter httpClientAdapter, String resp
             location = processDeviceLogin(httpClientAdapter, location);
         }
         String query = location.getQuery();
+        if (query == null) {
+            // failover for null query with non https URI like urn:ietf:wg:oauth:2.0:oob?code=...
+            query = location.getSchemeSpecificPart();
+        }
 
         if (query.contains("code=") && query.contains("&session_state=")) {
             String code = query.substring(query.indexOf("code=") + 5, query.indexOf("&session_state="));