Skip to content

Modern Docker Management, Designed for Everyone

fix: only allow role changes for oidc users

Kyle Mendellf5a3302f846b
diff --git a/backend/internal/api/auth_handler.go b/backend/internal/api/auth_handler.go
index 773024401..08ab67b4a 100644
--- a/backend/internal/api/auth_handler.go
+++ b/backend/internal/api/auth_handler.go
@@ -89,11 +89,12 @@ func (h *AuthHandler) Login(c *gin.Context) {
Success: true,
RequirePasswordChange: true,
User: &dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId,
},
})
return
@@ -139,11 +140,12 @@ func (h *AuthHandler) Login(c *gin.Context) {
RefreshToken: tokenPair.RefreshToken,
ExpiresAt: tokenPair.ExpiresAt,
User: &dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId, // add
},
})
}
@@ -170,11 +172,12 @@ func (h *AuthHandler) GetCurrentUser(c *gin.Context) {
}
c.JSON(http.StatusOK, dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId, // add
})
}
diff --git a/backend/internal/api/oidc_handler.go b/backend/internal/api/oidc_handler.go
index 7c9a2d057..507cc4095 100644
--- a/backend/internal/api/oidc_handler.go
+++ b/backend/internal/api/oidc_handler.go
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/ofkm/arcane-backend/internal/config"
+ "github.com/ofkm/arcane-backend/internal/dto"
"github.com/ofkm/arcane-backend/internal/services"
)
@@ -128,13 +129,17 @@ func (h *OidcHandler) HandleOidcCallback(c *gin.Context) {
c.SetCookie("token", tokenPair.AccessToken, maxAge, "/", "", secure, true)
c.JSON(http.StatusOK, gin.H{
- "success": true,
- "user": gin.H{
- "id": user.ID,
- "username": user.Username,
- "displayName": user.DisplayName,
- "email": user.Email,
- "roles": user.Roles,
+ "success": true,
+ "token": tokenPair.AccessToken,
+ "refreshToken": tokenPair.RefreshToken,
+ "expiresAt": tokenPair.ExpiresAt,
+ "user": dto.UserResponseDto{
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId,
},
})
}
diff --git a/backend/internal/api/user_handler.go b/backend/internal/api/user_handler.go
index 507228ffa..5e0b905b3 100644
--- a/backend/internal/api/user_handler.go
+++ b/backend/internal/api/user_handler.go
@@ -53,11 +53,12 @@ func (h *UserHandler) ListUsers(c *gin.Context) {
var userResponses []dto.UserResponseDto
for _, user := range users {
userResponses = append(userResponses, dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId,
})
}
@@ -131,11 +132,12 @@ func (h *UserHandler) CreateUser(c *gin.Context) {
c.JSON(http.StatusCreated, gin.H{
"success": true,
"user": dto.UserResponseDto{
- ID: createdUser.ID,
- Username: createdUser.Username,
- DisplayName: createdUser.DisplayName,
- Email: createdUser.Email,
- Roles: createdUser.Roles,
+ ID: createdUser.ID,
+ Username: createdUser.Username,
+ DisplayName: createdUser.DisplayName,
+ Email: createdUser.Email,
+ Roles: createdUser.Roles,
+ OidcSubjectId: createdUser.OidcSubjectId,
},
})
}
@@ -155,11 +157,12 @@ func (h *UserHandler) GetUser(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{
"success": true,
"user": dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId,
},
})
}
@@ -210,11 +213,12 @@ func (h *UserHandler) UpdateUser(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{
"success": true,
"user": dto.UserResponseDto{
- ID: updatedUser.ID,
- Username: updatedUser.Username,
- DisplayName: updatedUser.DisplayName,
- Email: updatedUser.Email,
- Roles: updatedUser.Roles,
+ ID: updatedUser.ID,
+ Username: updatedUser.Username,
+ DisplayName: updatedUser.DisplayName,
+ Email: updatedUser.Email,
+ Roles: updatedUser.Roles,
+ OidcSubjectId: updatedUser.OidcSubjectId,
},
})
}
diff --git a/backend/internal/dto/user_dto.go b/backend/internal/dto/user_dto.go
index d1b1e4c3a..89c645146 100644
--- a/backend/internal/dto/user_dto.go
+++ b/backend/internal/dto/user_dto.go
@@ -15,11 +15,12 @@ type UpdateUserDto struct {
}
type UserResponseDto struct {
- ID string `json:"id"`
- Username string `json:"username"`
- DisplayName *string `json:"displayName,omitempty"`
- Email *string `json:"email,omitempty"`
- Roles []string `json:"roles"`
- CreatedAt string `json:"createdAt,omitempty"`
- UpdatedAt string `json:"updatedAt,omitempty"`
+ ID string `json:"id"`
+ Username string `json:"username"`
+ DisplayName *string `json:"displayName,omitempty"`
+ Email *string `json:"email,omitempty"`
+ Roles []string `json:"roles"`
+ OidcSubjectId *string `json:"oidcSubjectId,omitempty"`
+ CreatedAt string `json:"createdAt,omitempty"`
+ UpdatedAt string `json:"updatedAt,omitempty"`
}
diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.go
index e1ac278e2..23c24c75e 100644
--- a/backend/internal/services/user_service.go
+++ b/backend/internal/services/user_service.go
@@ -281,13 +281,14 @@ func (s *UserService) ListUsersPaginated(ctx context.Context, req utils.SortedPa
var result []dto.UserResponseDto
for _, user := range users {
userResponse := dto.UserResponseDto{
- ID: user.ID,
- Username: user.Username,
- DisplayName: user.DisplayName,
- Email: user.Email,
- Roles: user.Roles,
- CreatedAt: user.CreatedAt.Format("2006-01-02T15:04:05.999999Z"),
- UpdatedAt: user.UpdatedAt.Format("2006-01-02T15:04:05.999999Z"),
+ ID: user.ID,
+ Username: user.Username,
+ DisplayName: user.DisplayName,
+ Email: user.Email,
+ Roles: user.Roles,
+ OidcSubjectId: user.OidcSubjectId,
+ CreatedAt: user.CreatedAt.Format("2006-01-02T15:04:05.999999Z"),
+ UpdatedAt: user.UpdatedAt.Format("2006-01-02T15:04:05.999999Z"),
}
result = append(result, userResponse)
}
diff --git a/frontend/src/lib/components/sheets/user-form-sheet.svelte b/frontend/src/lib/components/sheets/user-form-sheet.svelte
index 2e5e9a4e4..e520e857a 100644
--- a/frontend/src/lib/components/sheets/user-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/user-form-sheet.svelte
@@ -34,11 +34,14 @@
let canEditUsername = $derived(!isEditMode || allowUsernameEdit);
let SubmitIcon = $derived(isEditMode ? Save : UserPlus);
+ // Disable most fields for OIDC users
+ let isOidcUser = $derived(!!userToEdit?.oidcSubjectId);
+
const formSchema = z.object({
username: z.string().min(1, 'Username is required'),
password: z.string().optional(),
displayName: z.string().optional(),
- email: z.string().email('Invalid email format').optional().or(z.literal('')),
+ email: z.email('Invalid email format').optional().or(z.literal('')),
isAdmin: z.boolean().default(false)
});
@@ -56,6 +59,16 @@
const data = form.validate();
if (!data) return;
+ // For OIDC users, only allow role changes
+ if (isOidcUser) {
+ onSubmit({
+ user: { roles: [data.isAdmin ? 'admin' : 'user'] },
+ isEditMode,
+ userId: userToEdit?.id
+ });
+ return;
+ }
+
const userData: Partial<User> & { password?: string } = {
username: data.username,
displayName: data.displayName,
@@ -104,16 +117,23 @@
label="Username *"
type="text"
description="Unique username for the user"
- disabled={!canEditUsername}
+ disabled={!canEditUsername || isOidcUser}
bind:input={$inputs.username}
/>
<FormInput
label={isEditMode ? 'Password' : 'Password *'}
type="password"
- placeholder={isEditMode ? 'Leave empty to keep current password' : 'Enter password'}
- description={isEditMode
- ? 'Leave empty to keep current password'
- : 'Password for the user account'}
+ placeholder={isOidcUser
+ ? 'Managed by your identity provider'
+ : isEditMode
+ ? 'Leave empty to keep current password'
+ : 'Enter password'}
+ description={isOidcUser
+ ? 'Password is managed by your OIDC provider'
+ : isEditMode
+ ? 'Leave empty to keep current password'
+ : 'Password for the user account'}
+ disabled={isOidcUser}
bind:input={$inputs.password}
/>
<FormInput
@@ -121,6 +141,7 @@
type="text"
placeholder="Full name or display name"
description="Optional display name for the user"
+ disabled={isOidcUser}
bind:input={$inputs.displayName}
/>
<FormInput
@@ -128,6 +149,7 @@
type="email"
placeholder="[email protected]"
description="Email address for the user"
+ disabled={isOidcUser}
bind:input={$inputs.email}
/>
<SwitchWithLabel
diff --git a/frontend/src/routes/settings/users/user-table.svelte b/frontend/src/routes/settings/users/user-table.svelte
index de212d1df..8e2c5e380 100644
--- a/frontend/src/routes/settings/users/user-table.svelte
+++ b/frontend/src/routes/settings/users/user-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import { Trash2, Users, Ellipsis, Edit } from '@lucide/svelte';
+ import { Trash2, Users, Ellipsis, Edit, ShieldEllipsis } from '@lucide/svelte';
import * as Card from '$lib/components/ui/card/index.js';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -195,12 +195,10 @@
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
- {#if !item.oidcSubjectId}
- <DropdownMenu.Item onclick={() => onEditUser(item)}>
- <Edit class="size-4" />
- Edit
- </DropdownMenu.Item>
- {/if}
+ <DropdownMenu.Item onclick={() => onEditUser(item)}>
+ <Edit class="size-4" />
+ Edit
+ </DropdownMenu.Item>
<DropdownMenu.Item
variant="destructive"
onclick={() => handleDeleteUser(item.id, item.username)}