bhetherman/open-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2026-07-26 18:06:03 -04:00
parent e3cce68ef2
commit 1f0dc90abe
11 changed files with 287 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/components/workspace/common/AccessControl.svelte
+60 -28
View File
@@ -16,7 +16,7 @@
type AccessGrant = {
id?: string;
principal_type: 'user' | 'group';
principal_type: 'user' | 'group' | 'anyone';
principal_id: string;
permission: 'read' | 'write';
};
@@ -34,6 +34,7 @@
export let share = true;
export let sharePublic = true;
export let shareOpen = false;
export let shareUsers = true;
export let allowGroups = true;
export let defaultPermission: 'read' | 'write' = 'read';
@@ -162,6 +163,14 @@
grant.principal_type === 'user' && grant.principal_id === '*' && grant.permission === 'read'
);
const hasAnyoneReadGrant = (grants: AccessGrant[]): boolean =>
grants.some(
(grant) =>
grant.principal_type === 'anyone' &&
grant.principal_id === '*' &&
grant.permission === 'read'
);
const hasPublicWriteGrant = (grants: AccessGrant[]): boolean =>
grants.some(
(grant) =>
@@ -170,16 +179,17 @@
grant.permission === 'write'
);
const currentGrants = (): AccessGrant[] =>
Array.isArray(accessGrants) ? (accessGrants as AccessGrant[]) : [];
const currentGrants = (grants: AccessGrant[] | any = accessGrants): AccessGrant[] =>
Array.isArray(grants) ? (grants as AccessGrant[]) : [];
const getPrincipalIdsByPermission = (
principalType: 'user' | 'group',
permission: 'read' | 'write'
permission: 'read' | 'write',
grants: AccessGrant[] | any = accessGrants
): string[] =>
Array.from(
new Set(
currentGrants()
currentGrants(grants)
.filter(
(grant) => grant.principal_type === principalType && grant.permission === permission
)
@@ -188,7 +198,7 @@
);
const hasPrincipalGrant = (
principalType: 'user' | 'group',
principalType: 'user' | 'group' | 'anyone',
principalId: string,
permission: 'read' | 'write'
): boolean =>
@@ -204,17 +214,32 @@
onChange(accessGrants);
};
const setPublic = (isPublic: boolean) => {
// Remove all user:* grants
const getVisibility = (grants: AccessGrant[]): 'private' | 'public' | 'open' => {
if (hasAnyoneReadGrant(grants)) return 'open';
if (hasPublicReadGrant(grants)) return 'public';
return 'private';
};
const setVisibility = (visibility: 'private' | 'public' | 'open') => {
const filtered = currentGrants().filter(
(grant) => !(grant.principal_type === 'user' && grant.principal_id === '*')
(grant) =>
!(
(grant.principal_type === 'user' || grant.principal_type === 'anyone') &&
grant.principal_id === '*'
)
);
if (isPublic) {
if (visibility === 'public') {
filtered.push({
principal_type: 'user',
principal_id: '*',
permission: 'read'
});
} else if (visibility === 'open') {
filtered.push({
principal_type: 'anyone',
principal_id: '*',
permission: 'read'
});
}
commitAccessGrants(filtered);
};
@@ -237,7 +262,7 @@
};
const upsertPrincipalGrant = (
principalType: 'user' | 'group',
principalType: 'user' | 'group' | 'anyone',
principalId: string,
permission: 'read' | 'write',
grants: AccessGrant[]
@@ -263,7 +288,7 @@
};
const removePrincipalGrant = (
principalType: 'user' | 'group',
principalType: 'user' | 'group' | 'anyone',
principalId: string,
permission: 'read' | 'write',
grants: AccessGrant[]
@@ -277,14 +302,14 @@
)
);
const removePrincipal = (principalType: 'user' | 'group', principalId: string) => {
const removePrincipal = (principalType: 'user' | 'group' | 'anyone', principalId: string) => {
let next = [...currentGrants()];
next = removePrincipalGrant(principalType, principalId, 'read', next);
next = removePrincipalGrant(principalType, principalId, 'write', next);
commitAccessGrants(next);
};
const togglePrincipalWrite = (principalType: 'user' | 'group', principalId: string) => {
const togglePrincipalWrite = (principalType: 'user' | 'group' | 'anyone', principalId: string) => {
let next = [...currentGrants()];
const hasWrite = hasPrincipalGrant(principalType, principalId, 'write');
if (hasWrite) {
@@ -379,12 +404,14 @@
$: if (readGroupIds.length > 0 || writeGroupIds.length > 0) {
void ensureGroupsByIds([...readGroupIds, ...writeGroupIds]);
}
$: readGroupIds = (accessGrants, getPrincipalIdsByPermission('group', 'read'));
$: writeGroupIds = (accessGrants, getPrincipalIdsByPermission('group', 'write'));
$: readUserIds =
(accessGrants, getPrincipalIdsByPermission('user', 'read').filter((id) => id !== '*'));
$: writeUserIds =
(accessGrants, getPrincipalIdsByPermission('user', 'write').filter((id) => id !== '*'));
$: readGroupIds = getPrincipalIdsByPermission('group', 'read', accessGrants);
$: writeGroupIds = getPrincipalIdsByPermission('group', 'write', accessGrants);
$: readUserIds = getPrincipalIdsByPermission('user', 'read', accessGrants).filter(
(id) => id !== '*'
);
$: writeUserIds = getPrincipalIdsByPermission('user', 'write', accessGrants).filter(
(id) => id !== '*'
);
$: selectedUserIds = Array.from(new Set([...readUserIds, ...writeUserIds]));
@@ -450,7 +477,7 @@
<div class="flex gap-2 items-center">
<div>
<div class="p-2 bg-black/5 dark:bg-white/5 rounded-full">
{#if !hasPublicReadGrant(accessGrants ?? [])}
{#if getVisibility(accessGrants ?? []) === 'private'}
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
@@ -486,36 +513,41 @@
<div>
<Tooltip
content={!(share && sharePublic) && !hasPublicReadGrant(accessGrants ?? [])
content={!(share && sharePublic) && getVisibility(accessGrants ?? []) === 'private'
? $i18n.t('You do not have permission to make this public')
: ''}
>
<select
id="models"
class="outline-none bg-transparent text-sm font-normal block w-fit pr-8 max-w-full placeholder-gray-400"
value={!hasPublicReadGrant(accessGrants ?? []) ? 'private' : 'public'}
value={getVisibility(accessGrants ?? [])}
on:change={(e) => {
setPublic((e.target as HTMLSelectElement).value === 'public');
setVisibility((e.target as HTMLSelectElement).value as 'private' | 'public' | 'open');
}}
>
<option class=" text-gray-700" value="private">{$i18n.t('Private')}</option>
{#if (share && sharePublic) || hasPublicReadGrant(accessGrants ?? [])}
<option class=" text-gray-700" value="public">{$i18n.t('Public')}</option>
{/if}
{#if (share && shareOpen) || hasAnyoneReadGrant(accessGrants ?? [])}
<option class=" text-gray-700" value="open">{$i18n.t('Open')}</option>
{/if}
</select>
</Tooltip>
<div class=" text-xs text-gray-400 font-normal">
{#if !hasPublicReadGrant(accessGrants ?? [])}
{#if getVisibility(accessGrants ?? []) === 'private'}
{$i18n.t('Only select users and groups with permission can access')}
{:else}
{:else if getVisibility(accessGrants ?? []) === 'public'}
{$i18n.t('Accessible to all users')}
{:else}
{$i18n.t('Anyone with the link can view')}
{/if}
</div>
</div>
</div>
{#if hasPublicReadGrant(accessGrants ?? []) && accessRoles.includes('write')}
{#if hasPublicReadGrant(accessGrants ?? []) && !hasAnyoneReadGrant(accessGrants ?? []) && accessRoles.includes('write')}
<div class="flex w-full justify-between mt-1.5 ml-0.5">
<div class="self-center text-xs">
{$i18n.t('Allow public write access')}
@@ -660,7 +692,7 @@
{/each}
{/if}
{#if !hasPublicReadGrant(accessGrants ?? []) && accessGroups.length === 0 && selectedUsers.length === 0}
{#if getVisibility(accessGrants ?? []) === 'private' && accessGroups.length === 0 && selectedUsers.length === 0}
<div class="text-xs text-gray-500 text-center py-3">
{$i18n.t('No access grants. Private to you.')}
</div>
src/lib/components/workspace/common/AccessControlModal.svelte
+3 -1
View File
@@ -8,7 +8,7 @@
type AccessGrant = {
id?: string;
principal_type: 'user' | 'group';
principal_type: 'user' | 'group' | 'anyone';
principal_id: string;
permission: 'read' | 'write';
};
@@ -20,6 +20,7 @@
export let share = true;
export let sharePublic = true;
export let shareOpen = false;
export let shareUsers = true;
export let onChange = () => {};
@@ -49,6 +50,7 @@
{accessRoles}
{share}
{sharePublic}
{shareOpen}
{shareUsers}
/>
</div>