Drop Pac4j integration

7 files changed, 0 insertions, 442 deletions

diff --git a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
deleted file mode 100644
index 16deb350..00000000
--- a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.remote
-
-/**
- * A user profile.
- */
-expect class Profile
diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
deleted file mode 100644
index 47026f7f..00000000
--- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.remote
-
-import kotlinx.serialization.Serializable
-
-/**
- * A user profile.
- */
-@Serializable
-actual data class Profile(
-    val id: String? = null,
-    val attributes: MutableMap<String, String> = mutableMapOf(),
-    val authenticationAttributes: MutableMap<String, String> = mutableMapOf(),
-    val roles: MutableSet<String> = mutableSetOf(),
-    val permissions: MutableSet<String> = mutableSetOf(),
-    val linkedId: String? = null,
-    val remembered: Boolean = false,
-    val clientName: String? = null
-) {
-    var username: String?
-        get() = attributes["username"]
-        set(value) {
-            if (value != null) {
-                attributes["username"] = value
-            } else {
-                attributes.remove("username")
-            }
-        }
-    var firstName: String?
-        get() = attributes["first_name"]
-        set(value) {
-            if (value != null) {
-                attributes["first_name"] = value
-            } else {
-                attributes.remove("first_name")
-            }
-        }
-    var familyName: String?
-        get() = attributes["family_name"]
-        set(value) {
-            if (value != null) {
-                attributes["family_name"] = value
-            } else {
-                attributes.remove("family_name")
-            }
-        }
-    var displayName: String?
-        get() = attributes["display_name"]
-        set(value) {
-            if (value != null) {
-                attributes["display_name"] = value
-            } else {
-                attributes.remove("display_name")
-            }
-        }
-    var email: String?
-        get() = attributes["email"]
-        set(value) {
-            if (value != null) {
-                attributes["email"] = value
-            } else {
-                attributes.remove("email")
-            }
-        }
-    var pictureUrl: String?
-        get() = attributes["picture_url"]
-        set(value) {
-            if (value != null) {
-                attributes["picture_url"] = value
-            } else {
-                attributes.remove("picture_url")
-            }
-        }
-    var profileUrl: String?
-        get() = attributes["profile_url"]
-        set(value) {
-            if (value != null) {
-                attributes["profile_url"] = value
-            } else {
-                attributes.remove("profile_url")
-            }
-        }
-}
diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
deleted file mode 100644
index ee5c59fc..00000000
--- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.remote
-
-import org.jooby.Request
-import org.pac4j.core.profile.CommonProfile
-
-/**
- * A user profile.
- */
-actual typealias Profile = CommonProfile
-
-/**
- * A helper extension function for processing with authenticated user profile.
- */
-suspend fun <RESP> Request.withProfile(block: suspend (Profile) -> RESP): RESP {
-    val profile = this.require(CommonProfile::class.java) as CommonProfile?
-    return profile?.let {
-        block(profile)
-    } ?: throw IllegalStateException("Profile not set!")
-}
diff --git a/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
deleted file mode 100644
index cc77f341..00000000
--- a/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.remote
-
-import io.ktor.application.ApplicationCall
-import io.ktor.sessions.get
-import io.ktor.sessions.sessions
-import kotlinx.serialization.Serializable
-
-/**
- * A user profile.
- */
-@Serializable
-actual data class Profile(
-    val id: String? = null,
-    val attributes: MutableMap<String, String> = mutableMapOf(),
-    val authenticationAttributes: MutableMap<String, String> = mutableMapOf(),
-    val roles: MutableSet<String> = mutableSetOf(),
-    val permissions: MutableSet<String> = mutableSetOf(),
-    val linkedId: String? = null,
-    val remembered: Boolean = false,
-    val clientName: String? = null
-) {
-    var username: String?
-        get() = attributes["username"]
-        set(value) {
-            if (value != null) {
-                attributes["username"] = value
-            } else {
-                attributes.remove("username")
-            }
-        }
-    var firstName: String?
-        get() = attributes["first_name"]
-        set(value) {
-            if (value != null) {
-                attributes["first_name"] = value
-            } else {
-                attributes.remove("first_name")
-            }
-        }
-    var familyName: String?
-        get() = attributes["family_name"]
-        set(value) {
-            if (value != null) {
-                attributes["family_name"] = value
-            } else {
-                attributes.remove("family_name")
-            }
-        }
-    var displayName: String?
-        get() = attributes["display_name"]
-        set(value) {
-            if (value != null) {
-                attributes["display_name"] = value
-            } else {
-                attributes.remove("display_name")
-            }
-        }
-    var email: String?
-        get() = attributes["email"]
-        set(value) {
-            if (value != null) {
-                attributes["email"] = value
-            } else {
-                attributes.remove("email")
-            }
-        }
-    var pictureUrl: String?
-        get() = attributes["picture_url"]
-        set(value) {
-            if (value != null) {
-                attributes["picture_url"] = value
-            } else {
-                attributes.remove("picture_url")
-            }
-        }
-    var profileUrl: String?
-        get() = attributes["profile_url"]
-        set(value) {
-            if (value != null) {
-                attributes["profile_url"] = value
-            } else {
-                attributes.remove("profile_url")
-            }
-        }
-}
-
-suspend fun <RESP> ApplicationCall.withProfile(block: suspend (Profile) -> RESP): RESP {
-    val profile = this.sessions.get<Profile>()
-    return profile?.let {
-        block(profile)
-    } ?: throw IllegalStateException("Profile not set!")
-}
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 05e009a4..34fb02db 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -110,12 +110,6 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
             val principal = req.principal().awaitSingle()
             service.principal = principal
         }
-        if (service is WithProfile) {
-            val profile = req.principal().ofType(Authentication::class.java).map {
-                it.principal as Profile
-            }.awaitSingle()
-            service.profile = profile
-        }
     }
 
     /**
@@ -471,12 +465,6 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                 val principal = webSocketSession.handshakeInfo.principal.awaitSingle()
                 service.principal = principal
             }
-            if (service is WithProfile) {
-                val profile = webSocketSession.handshakeInfo.principal.ofType(Authentication::class.java).map {
-                    it.principal as Profile
-                }.awaitSingle()
-                service.profile = profile
-            }
             val requestChannel = Channel<PAR1>()
             val responseChannel = Channel<PAR2>()
             coroutineScope {
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
deleted file mode 100644
index 2831b220..00000000
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.remote
-
-import com.fasterxml.jackson.annotation.JsonIgnore
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import org.springframework.security.core.GrantedAuthority
-import org.springframework.security.core.userdetails.UserDetails
-
-/**
- * A user profile.
- */
-@Serializable
-actual data class Profile(
-    val id: String? = null,
-    val attributes: MutableMap<String, String> = mutableMapOf(),
-    val authenticationAttributes: MutableMap<String, String> = mutableMapOf(),
-    val roles: MutableSet<String> = mutableSetOf(),
-    val permissions: MutableSet<String> = mutableSetOf(),
-    val linkedId: String? = null,
-    val remembered: Boolean = false,
-    val clientName: String? = null
-) : UserDetails {
-
-    @Transient
-    @JsonIgnore
-    private var password: String? = null
-
-    override fun getUsername(): String? {
-        return attributes["username"]
-    }
-
-    fun setUsername(username: String?) {
-        if (username != null) {
-            attributes["username"] = username
-        } else {
-            attributes.remove("username")
-        }
-    }
-
-    override fun getPassword(): String? {
-        return password
-    }
-
-    fun setPassword(password: String?) {
-        this.password = password
-    }
-
-    override fun getAuthorities(): MutableCollection<out GrantedAuthority> {
-        return mutableListOf()
-    }
-
-    override fun isEnabled(): Boolean {
-        return true
-    }
-
-    override fun isCredentialsNonExpired(): Boolean {
-        return true
-    }
-
-    override fun isAccountNonExpired(): Boolean {
-        return true
-    }
-
-    override fun isAccountNonLocked(): Boolean {
-        return true
-    }
-
-    var firstName: String?
-        get() = attributes["first_name"]
-        set(value) {
-            if (value != null) {
-                attributes["first_name"] = value
-            } else {
-                attributes.remove("first_name")
-            }
-        }
-    var familyName: String?
-        get() = attributes["family_name"]
-        set(value) {
-            if (value != null) {
-                attributes["family_name"] = value
-            } else {
-                attributes.remove("family_name")
-            }
-        }
-    var displayName: String?
-        get() = attributes["display_name"]
-        set(value) {
-            if (value != null) {
-                attributes["display_name"] = value
-            } else {
-                attributes.remove("display_name")
-            }
-        }
-    var email: String?
-        get() = attributes["email"]
-        set(value) {
-            if (value != null) {
-                attributes["email"] = value
-            } else {
-                attributes.remove("email")
-            }
-        }
-    var pictureUrl: String?
-        get() = attributes["picture_url"]
-        set(value) {
-            if (value != null) {
-                attributes["picture_url"] = value
-            } else {
-                attributes.remove("picture_url")
-            }
-        }
-    var profileUrl: String?
-        get() = attributes["profile_url"]
-        set(value) {
-            if (value != null) {
-                attributes["profile_url"] = value
-            } else {
-                attributes.remove("profile_url")
-            }
-        }
-}
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt
index d35cc97a..63c5a9d1 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt
@@ -38,10 +38,6 @@ interface WithPrincipal {
     var principal: Principal
 }
 
-interface WithProfile {
-    var profile: Profile
-}
-
 interface WithWebSocketSession {
     var webSocketSession: WebSocketSession
 }