Pivotal-176168841: Allow to check inactive user registration

client/bio-webclient/src/main/kotlin/ac/uk/ebi/biostd/client/integration/web/SecurityWebClient.kt

@@ -2,6 +2,7 @@ package ac.uk.ebi.biostd.client.integration.web
 
 import ac.uk.ebi.biostd.client.exception.SecurityWebClientErrorHandler
 import ac.uk.ebi.biostd.client.interceptor.ServerValidationInterceptor
+import ebi.ac.uk.api.security.CheckUserRequest
 import ebi.ac.uk.api.security.LoginRequest
 import ebi.ac.uk.api.security.RegisterRequest
 import ebi.ac.uk.api.security.UserProfile
@@ -26,6 +27,10 @@ class SecurityWebClient private constructor(
         restTemplate.postForLocation("/auth/register", registerRequest)
     }
 
+    override fun checkUser(checkUserRequest: CheckUserRequest) {
+        restTemplate.postForLocation("/auth/check-user", checkUserRequest)
+    }
+
     companion object {
         fun create(baseUrl: String) = SecurityWebClient(
             baseUrl,

client/bio-webclient/src/main/kotlin/ac/uk/ebi/biostd/client/integration/web/SubmissionClient.kt

@@ -9,6 +9,7 @@ import ebi.ac.uk.api.UserFile
 import ebi.ac.uk.api.dto.NonRegistration
 import ebi.ac.uk.api.dto.RegisterConfig
 import ebi.ac.uk.api.dto.SubmissionDto
+import ebi.ac.uk.api.security.CheckUserRequest
 import ebi.ac.uk.api.security.LoginRequest
 import ebi.ac.uk.api.security.RegisterRequest
 import ebi.ac.uk.api.security.UserProfile
@@ -78,6 +79,7 @@ interface SecurityOperations {
     fun getAuthenticatedClient(user: String, password: String, onBehalf: String): BioWebClient
     fun login(loginRequest: LoginRequest): UserProfile
     fun registerUser(registerRequest: RegisterRequest)
+    fun checkUser(checkUserRequest: CheckUserRequest)
 }
 
 interface GeneralOperations {

commons/commons-bio/src/main/kotlin/ebi/ac/uk/api/security/CheckUserRequest.kt

@@ -0,0 +1,6 @@
+package ebi.ac.uk.api.security
+
+class CheckUserRequest(
+    val userEmail: String,
+    val userName: String
+)

submission/submission-security/src/main/kotlin/ebi/ac/uk/security/integration/components/ISecurityService.kt

@@ -1,6 +1,7 @@
 package ebi.ac.uk.security.integration.components
 
 import ebi.ac.uk.api.security.ChangePasswordRequest
+import ebi.ac.uk.api.security.CheckUserRequest
 import ebi.ac.uk.api.security.GetOrRegisterUserRequest
 import ebi.ac.uk.api.security.LoginRequest
 import ebi.ac.uk.api.security.RegisterRequest
@@ -22,5 +23,6 @@ interface ISecurityService {
     fun getUserProfile(authToken: String): UserInfo
     fun getOrCreateInactive(email: String, username: String): SecurityUser
     fun getOrRegisterUser(request: GetOrRegisterUserRequest): SecurityUser
+    fun checkUserRegistration(register: CheckUserRequest): SecurityUser
     fun refreshUser(email: String): SecurityUser
 }

submission/submission-security/src/main/kotlin/ebi/ac/uk/security/service/SecurityService.kt

@@ -5,6 +5,7 @@ import ac.uk.ebi.biostd.persistence.model.DbUser
 import ac.uk.ebi.biostd.persistence.repositories.UserDataRepository
 import arrow.core.getOrElse
 import ebi.ac.uk.api.security.ChangePasswordRequest
+import ebi.ac.uk.api.security.CheckUserRequest
 import ebi.ac.uk.api.security.GetOrRegisterUserRequest
 import ebi.ac.uk.api.security.LoginRequest
 import ebi.ac.uk.api.security.RegisterRequest
@@ -76,6 +77,10 @@ class SecurityService(
         }
     }
 
+    override fun checkUserRegistration(register: CheckUserRequest): SecurityUser {
+        return getOrCreateInactive(register.userEmail, register.userName)
+    }
+
     override fun refreshUser(email: String): SecurityUser {
         val user = userRepository.findByEmailAndActive(email, true)
             .map { activate(it) }

submission/submission-webapp/src/main/kotlin/ac/uk/ebi/biostd/security/web/SecurityResource.kt

@@ -1,6 +1,7 @@
 package ac.uk.ebi.biostd.security.web
 
 import ebi.ac.uk.api.security.ChangePasswordRequest
+import ebi.ac.uk.api.security.CheckUserRequest
 import ebi.ac.uk.api.security.LoginRequest
 import ebi.ac.uk.api.security.LogoutRequest
 import ebi.ac.uk.api.security.RegisterRequest
@@ -45,6 +46,19 @@ class SecurityResource(
         securityService.registerUser(register)
     }
 
+    @PostMapping(value = ["/check-registration"])
+    @ApiOperation("""
+       Checks if a user with the given email is registered in the system. 
+       In case it's not, a new user will be created using such email and the given user name.
+       The new user will be inactive and should be activated via activation link.
+    """")
+    fun checkUser(
+        @ApiParam(name = "User Info", value = "Information for the new user")
+        @Valid @RequestBody register: CheckUserRequest
+    ) {
+        securityService.checkUserRegistration(register)
+    }
+
     @PostMapping(value = ["/signin", "/login"])
     @ResponseBody
     @ApiOperation("Authenticate")