Merge pull request #1469 from RocketChat/fix/oauth-path

[FIX] Custom OAuth url

Merge pull request #1469 from RocketChat/fix/oauth-path
[FIX] Custom OAuth url
8c7899c3 · Filipe de Lima Brito · GitHub · 3f2148d1 · 57c042ab · 8c7899c3
Unverified Commit 8c7899c3 authored Jul 13, 2018 by Filipe de Lima Brito Committed by GitHub Jul 13, 2018
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

OauthHelper.kt app/src/main/java/chat/rocket/android/helper/OauthHelper.kt +10 -4

No files found.
--- a/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt
@@ -113,12 +113,18 @@ object OauthHelper {
        state: String,
        scope: String
    ): String {
-        return host +
-                authorizePath +
+        (authorizePath +
                "?client_id=$clientId" +
                "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/$serviceName" +
                "&state=$state" +
                "&scope=$scope" +
                "&response_type=code"
+                ).let {
+            return if (it.contains(host)) {
+                it
+            } else {
+                host + it
+            }
+        }
    }
 }
\ No newline at end of file