Cleanup code and update endpoints.

ls1intum · Jun 13, 2023 · 9585b4b · 9585b4b
1 parent 9a61dc5
commit 9585b4b
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 948 deletions.
diff --git a/...lin/de/tum/informatics/www1/artemis/native_app/core/data/service/impl/LoginServiceImpl.kt b/...lin/de/tum/informatics/www1/artemis/native_app/core/data/service/impl/LoginServiceImpl.kt
@@ -26,7 +26,7 @@ internal class LoginServiceImpl(
         return performNetworkCall {
             val response = ktorProvider.ktorClient.post(serverUrl) {
                 url {
-                    appendPathSegments("api", "authenticate")
+                    appendPathSegments("api", "public", "authenticate")
                 }
 
                 contentType(ContentType.Application.Json)
@@ -48,7 +48,7 @@ internal class LoginServiceImpl(
         return performNetworkCall {
             ktorProvider.ktorClient.post(serverUrl) {
                 url {
-                    appendPathSegments("api", "saml2")
+                    appendPathSegments("api", "public", "saml2")
                 }
                 setBody(rememberMe)
                 contentType(ContentType.Application.Json)

diff --git a/...e/tum/informatics/www1/artemis/native_app/core/data/service/impl/ServerDataServiceImpl.kt b/...e/tum/informatics/www1/artemis/native_app/core/data/service/impl/ServerDataServiceImpl.kt
@@ -34,7 +34,7 @@ internal class ServerDataServiceImpl(private val ktorProvider: KtorProvider) : S
                 .ktorClient
                 .get(serverUrl) {
                     url {
-                        appendPathSegments("api", "account")
+                        appendPathSegments("api", "public", "account")
                     }
 
                     contentType(ContentType.Application.Json)

diff --git a/...c/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/datastore/AccountService.kt b/...c/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/datastore/AccountService.kt
@@ -22,10 +22,7 @@ interface AccountService {
     sealed class AuthenticationData {
         object NotLoggedIn : AuthenticationData()
 
-        data class LoggedIn(val authToken: String, val username: String) :
-            AuthenticationData() {
-            val asBearer = "Bearer $authToken"
-        }
+        data class LoggedIn(val authToken: String, val username: String) : AuthenticationData()
     }
 
     suspend fun login(username: String, password: String, rememberMe: Boolean): LoginResponse

diff --git a/...n/de/tum/informatics/www1/artemis/native_app/core/websocket/impl/ServerTimeServiceImpl.kt b/...n/de/tum/informatics/www1/artemis/native_app/core/websocket/impl/ServerTimeServiceImpl.kt
@@ -134,7 +134,7 @@ internal class ServerTimeServiceImpl(
             performNetworkCall {
                 ktorProvider.ktorClient.get(serverUrl) {
                     url {
-                        appendPathSegments("time")
+                        appendPathSegments("api", "public", "time")
                     }
 
                     contentType(ContentType.Application.Json)