From f6d7a851d16baa30d77823d7a8d9a40a3ffa19cf Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.h@sprinternet.at>
Date: Mon, 17 Feb 2025 08:18:36 +0100
Subject: [PATCH] frontend: fix locked user display (#367)

---
 frontend/src/components/UserEditModal.vue |  1 +
 internal/app/api/v0/model/models_user.go  |  6 ++++++
 internal/app/api/v1/models/models_user.go |  6 ++++++
 internal/domain/base.go                   | 11 +++++------
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/UserEditModal.vue b/frontend/src/components/UserEditModal.vue
index f6e7c22..441cd36 100644
--- a/frontend/src/components/UserEditModal.vue
+++ b/frontend/src/components/UserEditModal.vue
@@ -51,6 +51,7 @@ watch(() => props.visible, async (newValue, oldValue) => {
           formData.value.Notes = selectedUser.value.Notes
           formData.value.Password = ""
           formData.value.Disabled = selectedUser.value.Disabled
+          formData.value.Locked = selectedUser.value.Locked
         }
       }
     }
diff --git a/internal/app/api/v0/model/models_user.go b/internal/app/api/v0/model/models_user.go
index d0afc0c..544bc7b 100644
--- a/internal/app/api/v0/model/models_user.go
+++ b/internal/app/api/v0/model/models_user.go
@@ -97,10 +97,16 @@ func NewDomainUser(src *User) *domain.User {
 
 	if src.Disabled {
 		res.Disabled = &now
+		if src.DisabledReason == "" {
+			res.DisabledReason = domain.DisabledReasonAdmin
+		}
 	}
 
 	if src.Locked {
 		res.Locked = &now
+		if src.LockedReason == "" {
+			res.LockedReason = domain.LockedReasonAdmin
+		}
 	}
 
 	return res
diff --git a/internal/app/api/v1/models/models_user.go b/internal/app/api/v1/models/models_user.go
index 552d615..c04f30d 100644
--- a/internal/app/api/v1/models/models_user.go
+++ b/internal/app/api/v1/models/models_user.go
@@ -115,10 +115,16 @@ func NewDomainUser(src *User) *domain.User {
 
 	if src.Disabled {
 		res.Disabled = &now
+		if src.DisabledReason == "" {
+			res.DisabledReason = domain.DisabledReasonApi
+		}
 	}
 
 	if src.Locked {
 		res.Locked = &now
+		if src.LockedReason == "" {
+			res.LockedReason = domain.LockedReasonApi
+		}
 	}
 
 	return res
diff --git a/internal/domain/base.go b/internal/domain/base.go
index 41a782a..d2a67d8 100644
--- a/internal/domain/base.go
+++ b/internal/domain/base.go
@@ -51,14 +51,13 @@ const (
 	DisabledReasonDeleted          = "deleted"
 	DisabledReasonUserDisabled     = "user disabled"
 	DisabledReasonUserDeleted      = "user deleted"
-	DisabledReasonUserEdit         = "user edit action"
-	DisabledReasonUserCreate       = "user create action"
-	DisabledReasonAdminEdit        = "admin edit action"
-	DisabledReasonAdminCreate      = "admin create action"
-	DisabledReasonApiEdit          = "api edit action"
-	DisabledReasonApiCreate        = "api create action"
+	DisabledReasonAdmin            = "disabled by admin"
+	DisabledReasonApi              = "disabled through api"
 	DisabledReasonLdapMissing      = "missing in ldap"
 	DisabledReasonUserMissing      = "missing user"
 	DisabledReasonMigrationDummy   = "migration dummy user"
 	DisabledReasonInterfaceMissing = "missing WireGuard interface"
+
+	LockedReasonAdmin = "locked by admin"
+	LockedReasonApi   = "locked by admin"
 )