Revert unnecessary changes

RADAR-base · Jan 12, 2025 · baa9297 · baa9297
1 parent c0b5c01
commit baa9297
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/radar-auth/src/main/java/org/radarbase/auth/kratos/KratosSessionDTO.kt b/radar-auth/src/main/java/org/radarbase/auth/kratos/KratosSessionDTO.kt
@@ -6,7 +6,6 @@ import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import org.radarbase.auth.authorization.AuthorityReference
-import kotlinx.serialization.json.JsonElement
 import org.radarbase.auth.authorization.RoleAuthority
 import org.radarbase.auth.token.DataRadarToken
 import org.radarbase.auth.token.RadarToken
@@ -121,7 +120,6 @@ class KratosSessionDTO(
         val value: Metadata
     )
 
-
     fun toDataRadarToken() : DataRadarToken {
         return DataRadarToken(
             roles = this.identity.parseRoles(),

diff --git a/src/main/java/org/radarbase/management/service/AuthService.kt b/src/main/java/org/radarbase/management/service/AuthService.kt
@@ -33,8 +33,8 @@ class AuthService(
     private val httpClient =
             HttpClient(CIO) {
                 install(HttpTimeout) {
-                    connectTimeoutMillis = Duration.ofSeconds(20).toMillis()
-                    socketTimeoutMillis = Duration.ofSeconds(20).toMillis()
+                    connectTimeoutMillis = Duration.ofSeconds(10).toMillis()
+                    socketTimeoutMillis = Duration.ofSeconds(10).toMillis()
                     requestTimeoutMillis = Duration.ofSeconds(300).toMillis()
                 }
                 install(ContentNegotiation) { json(Json { ignoreUnknownKeys = true }) }

diff --git a/src/main/webapp/app/admin/user-management/user-management-dialog.component.html b/src/main/webapp/app/admin/user-management/user-management-dialog.component.html
@@ -34,6 +34,20 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label class="form-control-label" [translate]="'userManagement.kratosId'"></label>
+            <input type="text" class="form-control" name="kratosId" #kratosIdInput="ngModel"
+                   [(ngModel)]="user.identity" minlength=36 maxlength=36 pattern="^[_'.@A-Za-z0-9- ]*$">
+
+            <div *ngIf="kratosIdInput.dirty && kratosIdInput.invalid">
+                <small class="form-text text-danger"
+                       *ngIf="kratosIdInput.errors.maxlength || kratosIdInput.errors.minlength"
+                       [translate]="'entity.validation.maxlength'"
+                       [translateParams]="{max: 36}">
+                </small>
+            </div>
+        </div>
+
         <div class="form-group">
             <label class="form-control-label" [translate]="'userManagement.firstName'"></label>
             <input type="text" class="form-control" name="firstName" #firstNameInput="ngModel"