Remove slash in endpoint

casdoor · Dec 22, 2023 · 9bbbcd0 · 9bbbcd0
1 parent 77d23a3
commit 9bbbcd0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/library/src/main/java/org/casdoor/Casdoor.kt b/library/src/main/java/org/casdoor/Casdoor.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 import com.squareup.moshi.Moshi
@@ -49,7 +50,7 @@ class Casdoor(private val config: CasdoorConfig) {
      */
     fun getSignInUrl(scope: String? = null, state: String? = null): String {
         this.codeVerifier = Utils.generateCodeVerifier()
-        val url = "${config.endpoint}login/oauth/authorize"
+        val url = "${config.endpoint}/login/oauth/authorize"
         this.nonce = Utils.generateNonce()
         val query = CodeRequestQuery(
             config = config,
@@ -81,7 +82,7 @@ class Casdoor(private val config: CasdoorConfig) {
      */
     fun requestOauthAccessToken(code: String): AccessTokenResponse {
 
-        var httpUrl = "${config.endpoint}login/oauth/access_token".toHttpUrlOrNull()
+        var httpUrl = "${config.endpoint}/login/oauth/access_token".toHttpUrlOrNull()
         httpUrl ?: throw IllegalArgumentException("Invalid URL")
         httpUrl = AccessTokenRequest(
             code = code,
@@ -110,7 +111,7 @@ class Casdoor(private val config: CasdoorConfig) {
      */
     fun renewToken(refreshToken: String, scope: String? = null): AccessTokenResponse {
 
-        var httpUrl = "${config.endpoint}login/oauth/refresh_token".toHttpUrlOrNull()
+        var httpUrl = "${config.endpoint}/login/oauth/refresh_token".toHttpUrlOrNull()
         httpUrl ?: throw IllegalArgumentException("Invalid URL")
         httpUrl = RenewAccessTokenRequest(
             refreshToken = refreshToken,
@@ -138,7 +139,7 @@ class Casdoor(private val config: CasdoorConfig) {
      * Logout.
      */
     fun logout(idToken: String, state: String? = null): Boolean {
-        var httpUrl = "${config.endpoint}login/oauth/logout".toHttpUrlOrNull()
+        var httpUrl = "${config.endpoint}/login/oauth/logout".toHttpUrlOrNull()
         httpUrl ?: throw IllegalArgumentException("Invalid URL")
         httpUrl = httpUrl.newBuilder()
             .addQueryParameter("id_token_hint", idToken)

diff --git a/library/src/main/java/org/casdoor/CasdoorConfig.kt b/library/src/main/java/org/casdoor/CasdoorConfig.kt
@@ -13,30 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 /**
  *
  *
- * Casdoor Config Model
+ * Casdoor Config
  */
 data class CasdoorConfig(
     val clientID: String,
     val organizationName: String,
     val redirectUri: String,
     var endpoint: String,
     val appName: String,
-) {
-
-
-    init {
-        endpoint = formatEndpoint(endpoint)
-    }
-
-    private fun formatEndpoint(url: String): String {
-        val trimmedUrl = url.trim()
-        return if (trimmedUrl.endsWith("/")) trimmedUrl else "$trimmedUrl/"
-    }
-
-
-}
+)
diff --git a/library/src/main/java/org/casdoor/Models.kt b/library/src/main/java/org/casdoor/Models.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 import com.squareup.moshi.Json

diff --git a/library/src/main/java/org/casdoor/Utils.kt b/library/src/main/java/org/casdoor/Utils.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 import android.util.Base64

diff --git a/library/src/test/java/org/casdoor/CasdoorConfigTest.kt b/library/src/test/java/org/casdoor/CasdoorConfigTest.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 import org.junit.Assert.assertEquals

diff --git a/library/src/test/java/org/casdoor/UtilsTest.kt b/library/src/test/java/org/casdoor/UtilsTest.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.casdoor
 
 import org.junit.Assert.assertEquals