Build 2602260214: invites profiles and expiry admin controls

2026-02-26 02:15:21 +13:00
parent 9be0ec75ec
commit f78382c019
14 changed files with 2795 additions and 31 deletions
--- a/frontend/app/users/[id]/page.tsx
+++ b/frontend/app/users/[id]/page.tsx
@@ -26,6 +26,15 @@ type AdminUser = {
  is_blocked?: boolean
  auto_search_enabled?: boolean
  jellyseerr_user_id?: number | null
+  profile_id?: number | null
+  expires_at?: string | null
+  is_expired?: boolean
+}
+
+type UserProfileOption = {
+  id: number
+  name: string
+  is_active?: boolean
 }

 const formatDateTime = (value?: string | null) => {
@@ -35,6 +44,22 @@ const formatDateTime = (value?: string | null) => {
  return date.toLocaleString()
 }

+const toLocalDateTimeInput = (value?: string | null) => {
+  if (!value) return ''
+  const date = new Date(value)
+  if (Number.isNaN(date.valueOf())) return ''
+  const offsetMs = date.getTimezoneOffset() * 60_000
+  const local = new Date(date.getTime() - offsetMs)
+  return local.toISOString().slice(0, 16)
+}
+
+const fromLocalDateTimeInput = (value: string) => {
+  if (!value.trim()) return null
+  const date = new Date(value)
+  if (Number.isNaN(date.valueOf())) return null
+  return date.toISOString()
+}
+
 const normalizeStats = (stats: any): UserStats => ({
  total: Number(stats?.total ?? 0),
  ready: Number(stats?.ready ?? 0),
@@ -55,6 +80,36 @@ export default function UserDetailPage() {
  const [stats, setStats] = useState<UserStats | null>(null)
  const [error, setError] = useState<string | null>(null)
  const [loading, setLoading] = useState(true)
+  const [profiles, setProfiles] = useState<UserProfileOption[]>([])
+  const [profileSelection, setProfileSelection] = useState('')
+  const [expiryInput, setExpiryInput] = useState('')
+  const [savingProfile, setSavingProfile] = useState(false)
+  const [savingExpiry, setSavingExpiry] = useState(false)
+  const [actionStatus, setActionStatus] = useState<string | null>(null)
+
+  const loadProfiles = async () => {
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(`${baseUrl}/admin/profiles`)
+      if (!response.ok) {
+        return
+      }
+      const data = await response.json()
+      if (!Array.isArray(data?.profiles)) {
+        setProfiles([])
+        return
+      }
+      setProfiles(
+        data.profiles.map((profile: any) => ({
+          id: Number(profile.id ?? 0),
+          name: String(profile.name ?? 'Unnamed profile'),
+          is_active: Boolean(profile.is_active ?? true),
+        }))
+      )
+    } catch (err) {
+      console.error(err)
+    }
+  }

  const loadUser = async () => {
    if (!idParam) return
@@ -80,8 +135,15 @@ export default function UserDetailPage() {
        throw new Error('Could not load user.')
      }
      const data = await response.json()
-      setUser(data?.user ?? null)
+      const nextUser = data?.user ?? null
+      setUser(nextUser)
      setStats(normalizeStats(data?.stats))
+      setProfileSelection(
+        nextUser?.profile_id == null || Number.isNaN(Number(nextUser?.profile_id))
+          ? ''
+          : String(nextUser.profile_id)
+      )
+      setExpiryInput(toLocalDateTimeInput(nextUser?.expires_at))
      setError(null)
    } catch (err) {
      console.error(err)
@@ -94,6 +156,7 @@ export default function UserDetailPage() {
  const toggleUserBlock = async (blocked: boolean) => {
    if (!user) return
    try {
+      setActionStatus(null)
      const baseUrl = getApiBase()
      const response = await authFetch(
        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/${blocked ? 'block' : 'unblock'}`,
@@ -103,6 +166,7 @@ export default function UserDetailPage() {
        throw new Error('Update failed')
      }
      await loadUser()
+      setActionStatus(blocked ? 'User blocked.' : 'User unblocked.')
    } catch (err) {
      console.error(err)
      setError('Could not update user access.')
@@ -112,6 +176,7 @@ export default function UserDetailPage() {
  const updateUserRole = async (role: string) => {
    if (!user) return
    try {
+      setActionStatus(null)
      const baseUrl = getApiBase()
      const response = await authFetch(
        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/role`,
@@ -125,6 +190,7 @@ export default function UserDetailPage() {
        throw new Error('Update failed')
      }
      await loadUser()
+      setActionStatus(`Role updated to ${role}.`)
    } catch (err) {
      console.error(err)
      setError('Could not update user role.')
@@ -134,6 +200,7 @@ export default function UserDetailPage() {
  const updateAutoSearchEnabled = async (enabled: boolean) => {
    if (!user) return
    try {
+      setActionStatus(null)
      const baseUrl = getApiBase()
      const response = await authFetch(
        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/auto-search`,
@@ -147,18 +214,114 @@ export default function UserDetailPage() {
        throw new Error('Update failed')
      }
      await loadUser()
+      setActionStatus(`Auto search/download ${enabled ? 'enabled' : 'disabled'}.`)
    } catch (err) {
      console.error(err)
      setError('Could not update auto search access.')
    }
  }

+  const applyProfileToUser = async (profileOverride?: string | null) => {
+    if (!user) return
+    const profileValue = profileOverride ?? profileSelection
+    setSavingProfile(true)
+    setError(null)
+    setActionStatus(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(
+        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/profile`,
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ profile_id: profileValue || null }),
+        }
+      )
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Profile update failed')
+      }
+      await loadUser()
+      setActionStatus(profileValue ? 'Profile applied to user.' : 'Profile assignment cleared.')
+    } catch (err) {
+      console.error(err)
+      setError('Could not update user profile.')
+    } finally {
+      setSavingProfile(false)
+    }
+  }
+
+  const saveUserExpiry = async () => {
+    if (!user) return
+    const expiresAt = fromLocalDateTimeInput(expiryInput)
+    if (expiryInput.trim() && !expiresAt) {
+      setError('Invalid expiry date/time.')
+      return
+    }
+    setSavingExpiry(true)
+    setError(null)
+    setActionStatus(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(
+        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/expiry`,
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ expires_at: expiresAt }),
+        }
+      )
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Expiry update failed')
+      }
+      await loadUser()
+      setActionStatus(expiresAt ? 'User expiry updated.' : 'User expiry cleared.')
+    } catch (err) {
+      console.error(err)
+      setError('Could not update user expiry.')
+    } finally {
+      setSavingExpiry(false)
+    }
+  }
+
+  const clearUserExpiry = async () => {
+    if (!user) return
+    setSavingExpiry(true)
+    setError(null)
+    setActionStatus(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(
+        `${baseUrl}/admin/users/${encodeURIComponent(user.username)}/expiry`,
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ clear: true }),
+        }
+      )
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Expiry clear failed')
+      }
+      setExpiryInput('')
+      await loadUser()
+      setActionStatus('User expiry cleared.')
+    } catch (err) {
+      console.error(err)
+      setError('Could not clear user expiry.')
+    } finally {
+      setSavingExpiry(false)
+    }
+  }
+
  useEffect(() => {
    if (!getToken()) {
      router.push('/login')
      return
    }
    void loadUser()
+    void loadProfiles()
  }, [router, idParam])

  if (loading) {
@@ -177,6 +340,7 @@ export default function UserDetailPage() {
    >
      <section className="admin-section">
        {error && <div className="error-banner">{error}</div>}
+        {actionStatus && <div className="status-banner">{actionStatus}</div>}
        {!user ? (
          <div className="status-banner">No user data found.</div>
        ) : (
@@ -196,6 +360,10 @@ export default function UserDetailPage() {
                    </span>
                    <span className="user-detail-chip">Role: {user.role}</span>
                    <span className="user-detail-chip">Login type: {user.auth_provider || 'local'}</span>
+                    <span className="user-detail-chip">Profile: {user.profile_id ?? 'None'}</span>
+                    <span className={`user-detail-chip ${user.is_expired ? 'is-blocked' : ''}`}>
+                      Expiry: {user.expires_at ? formatDateTime(user.expires_at) : 'Never'}
+                    </span>
                    <span className="user-detail-chip">Last login: {formatDateTime(user.last_login_at)}</span>
                  </div>
                </div>
@@ -227,6 +395,63 @@ export default function UserDetailPage() {
                      {user.is_blocked ? 'Allow access' : 'Block access'}
                    </button>
                  </div>
+                  <div className="user-detail-actions user-detail-actions--stacked">
+                    <label className="admin-select">
+                      <span>Assigned profile</span>
+                      <select
+                        value={profileSelection}
+                        onChange={(event) => setProfileSelection(event.target.value)}
+                        disabled={savingProfile}
+                      >
+                        <option value="">None</option>
+                        {profiles.map((profile) => (
+                          <option key={profile.id} value={profile.id}>
+                            {profile.name}{profile.is_active === false ? ' (disabled)' : ''}
+                          </option>
+                        ))}
+                      </select>
+                    </label>
+                    <div className="admin-inline-actions">
+                      <button type="button" onClick={() => void applyProfileToUser()} disabled={savingProfile}>
+                        {savingProfile ? 'Applying...' : 'Apply profile defaults'}
+                      </button>
+                      <button
+                        type="button"
+                        className="ghost-button"
+                        onClick={() => {
+                          setProfileSelection('')
+                          void applyProfileToUser('')
+                        }}
+                        disabled={savingProfile}
+                      >
+                        Clear profile
+                      </button>
+                    </div>
+                  </div>
+                  <div className="user-detail-actions user-detail-actions--stacked">
+                    <label>
+                      <span className="user-bulk-label">Account expiry</span>
+                      <input
+                        type="datetime-local"
+                        value={expiryInput}
+                        onChange={(event) => setExpiryInput(event.target.value)}
+                        disabled={savingExpiry}
+                      />
+                    </label>
+                    <div className="admin-inline-actions">
+                      <button type="button" onClick={saveUserExpiry} disabled={savingExpiry}>
+                        {savingExpiry ? 'Saving...' : 'Save expiry'}
+                      </button>
+                      <button
+                        type="button"
+                        className="ghost-button"
+                        onClick={clearUserExpiry}
+                        disabled={savingExpiry}
+                      >
+                        Clear expiry
+                      </button>
+                    </div>
+                  </div>
                  {user.role === 'admin' && (
                    <div className="user-detail-helper">
                      Admins always have auto search/download access.
--- a/frontend/app/users/page.tsx
+++ b/frontend/app/users/page.tsx
@@ -14,9 +14,18 @@ type AdminUser = {
  lastLoginAt?: string | null
  isBlocked?: boolean
  autoSearchEnabled?: boolean
+  profileId?: number | null
+  expiresAt?: string | null
+  isExpired?: boolean
  stats?: UserStats
 }

+type UserProfileOption = {
+  id: number
+  name: string
+  isActive?: boolean
+}
+
 type UserStats = {
  total: number
  ready: number
@@ -43,6 +52,13 @@ const formatLastRequest = (value?: string | null) => {
  return date.toLocaleString()
 }

+const formatExpiry = (value?: string | null) => {
+  if (!value) return 'Never'
+  const date = new Date(value)
+  if (Number.isNaN(date.valueOf())) return value
+  return date.toLocaleString()
+}
+
 const emptyStats: UserStats = {
  total: 0,
  ready: 0,
@@ -76,6 +92,35 @@ export default function UsersPage() {
  const [jellyseerrSyncBusy, setJellyseerrSyncBusy] = useState(false)
  const [jellyseerrResyncBusy, setJellyseerrResyncBusy] = useState(false)
  const [bulkAutoSearchBusy, setBulkAutoSearchBusy] = useState(false)
+  const [profiles, setProfiles] = useState<UserProfileOption[]>([])
+  const [bulkProfileId, setBulkProfileId] = useState('')
+  const [bulkProfileBusy, setBulkProfileBusy] = useState(false)
+  const [bulkExpiryDays, setBulkExpiryDays] = useState('')
+  const [bulkExpiryBusy, setBulkExpiryBusy] = useState(false)
+
+  const loadProfiles = async () => {
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(`${baseUrl}/admin/profiles`)
+      if (!response.ok) {
+        return
+      }
+      const data = await response.json()
+      if (!Array.isArray(data?.profiles)) {
+        setProfiles([])
+        return
+      }
+      setProfiles(
+        data.profiles.map((profile: any) => ({
+          id: Number(profile.id ?? 0),
+          name: String(profile.name ?? 'Unnamed profile'),
+          isActive: Boolean(profile.is_active ?? true),
+        }))
+      )
+    } catch (err) {
+      console.error(err)
+    }
+  }

  const loadUsers = async () => {
    try {
@@ -103,6 +148,12 @@ export default function UsersPage() {
            lastLoginAt: user.last_login_at ?? null,
            isBlocked: Boolean(user.is_blocked),
            autoSearchEnabled: Boolean(user.auto_search_enabled ?? true),
+            profileId:
+              user.profile_id == null || Number.isNaN(Number(user.profile_id))
+                ? null
+                : Number(user.profile_id),
+            expiresAt: user.expires_at ?? null,
+            isExpired: Boolean(user.is_expired),
            id: Number(user.id ?? 0),
            stats: normalizeStats(user.stats ?? emptyStats),
          }))
@@ -238,12 +289,110 @@ export default function UsersPage() {
    }
  }

+  const bulkApplyProfile = async () => {
+    setBulkProfileBusy(true)
+    setJellyseerrSyncStatus(null)
+    setError(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(`${baseUrl}/admin/users/profile/bulk`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          profile_id: bulkProfileId || null,
+          scope: 'non-admin-users',
+        }),
+      })
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Bulk profile update failed')
+      }
+      const data = await response.json()
+      setJellyseerrSyncStatus(
+        bulkProfileId
+          ? `Applied profile ${bulkProfileId} to ${data?.updated ?? 0} non-admin users.`
+          : `Cleared profile assignment for ${data?.updated ?? 0} non-admin users.`
+      )
+      await loadUsers()
+    } catch (err) {
+      console.error(err)
+      setError('Could not apply profile to all users.')
+    } finally {
+      setBulkProfileBusy(false)
+    }
+  }
+
+  const bulkSetExpiryDays = async () => {
+    if (!bulkExpiryDays.trim()) {
+      setError('Enter expiry days before applying bulk expiry.')
+      return
+    }
+    setBulkExpiryBusy(true)
+    setJellyseerrSyncStatus(null)
+    setError(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(`${baseUrl}/admin/users/expiry/bulk`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          days: bulkExpiryDays,
+          scope: 'non-admin-users',
+        }),
+      })
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Bulk expiry update failed')
+      }
+      const data = await response.json()
+      setJellyseerrSyncStatus(
+        `Set expiry for ${data?.updated ?? 0} non-admin users (${bulkExpiryDays} days).`
+      )
+      await loadUsers()
+    } catch (err) {
+      console.error(err)
+      setError('Could not set expiry for all users.')
+    } finally {
+      setBulkExpiryBusy(false)
+    }
+  }
+
+  const bulkClearExpiry = async () => {
+    setBulkExpiryBusy(true)
+    setJellyseerrSyncStatus(null)
+    setError(null)
+    try {
+      const baseUrl = getApiBase()
+      const response = await authFetch(`${baseUrl}/admin/users/expiry/bulk`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          clear: true,
+          scope: 'non-admin-users',
+        }),
+      })
+      if (!response.ok) {
+        const text = await response.text()
+        throw new Error(text || 'Bulk expiry clear failed')
+      }
+      const data = await response.json()
+      setJellyseerrSyncStatus(`Cleared expiry for ${data?.updated ?? 0} non-admin users.`)
+      await loadUsers()
+    } catch (err) {
+      console.error(err)
+      setError('Could not clear expiry for all users.')
+    } finally {
+      setBulkExpiryBusy(false)
+    }
+  }
+
  useEffect(() => {
    if (!getToken()) {
      router.push('/login')
      return
    }
    void loadUsers()
+    void loadProfiles()
  }, [router])

  if (loading) {
@@ -274,11 +423,11 @@ export default function UsersPage() {
      <section className="admin-section">
        {error && <div className="error-banner">{error}</div>}
        {jellyseerrSyncStatus && <div className="status-banner">{jellyseerrSyncStatus}</div>}
-        <div className="user-bulk-toolbar">
-          <div className="user-bulk-summary">
-            <strong>Auto search/download</strong>
-            <span>
-              {autoSearchEnabledCount} of {nonAdminUsers.length} non-admin users enabled
+          <div className="user-bulk-toolbar">
+            <div className="user-bulk-summary">
+              <strong>Auto search/download</strong>
+              <span>
+                {autoSearchEnabledCount} of {nonAdminUsers.length} non-admin users enabled
            </span>
          </div>
          <div className="user-bulk-actions">
@@ -299,6 +448,57 @@ export default function UsersPage() {
            </button>
          </div>
        </div>
+        <div className="user-bulk-toolbar user-bulk-toolbar--stacked">
+          <div className="user-bulk-summary">
+            <strong>Profiles and expiry</strong>
+            <span>Apply invite profile defaults and account expiry to all non-admin users.</span>
+          </div>
+          <div className="user-bulk-groups">
+            <div className="user-bulk-group">
+              <label className="admin-select">
+                <span>Profile</span>
+                <select
+                  value={bulkProfileId}
+                  onChange={(e) => setBulkProfileId(e.target.value)}
+                  disabled={bulkProfileBusy}
+                >
+                  <option value="">None / clear assignment</option>
+                  {profiles.map((profile) => (
+                    <option key={profile.id} value={profile.id}>
+                      {profile.name}{profile.isActive === false ? ' (disabled)' : ''}
+                    </option>
+                  ))}
+                </select>
+              </label>
+              <button type="button" onClick={bulkApplyProfile} disabled={bulkProfileBusy}>
+                {bulkProfileBusy ? 'Applying...' : 'Apply profile to all users'}
+              </button>
+            </div>
+            <div className="user-bulk-group">
+              <label>
+                <span className="user-bulk-label">Expiry days</span>
+                <input
+                  value={bulkExpiryDays}
+                  onChange={(e) => setBulkExpiryDays(e.target.value)}
+                  inputMode="numeric"
+                  placeholder="e.g. 30"
+                  disabled={bulkExpiryBusy}
+                />
+              </label>
+              <button type="button" onClick={bulkSetExpiryDays} disabled={bulkExpiryBusy}>
+                {bulkExpiryBusy ? 'Working...' : 'Set expiry for all users'}
+              </button>
+              <button
+                type="button"
+                className="ghost-button"
+                onClick={bulkClearExpiry}
+                disabled={bulkExpiryBusy}
+              >
+                {bulkExpiryBusy ? 'Working...' : 'Clear expiry for all users'}
+              </button>
+            </div>
+          </div>
+        </div>
        {users.length === 0 ? (
          <div className="status-banner">No users found yet.</div>
        ) : (
@@ -322,6 +522,14 @@ export default function UsersPage() {
                  <span className={`user-grid-pill ${user.autoSearchEnabled === false ? 'is-disabled' : ''}`}>
                    Auto search {user.autoSearchEnabled === false ? 'Off' : 'On'}
                  </span>
+                  <span className={`user-grid-pill ${user.isExpired ? 'is-blocked' : ''}`}>
+                    {user.expiresAt
+                      ? `Expiry ${user.isExpired ? 'expired' : formatExpiry(user.expiresAt)}`
+                      : 'Expiry Never'}
+                  </span>
+                  <span className="user-grid-pill">
+                    Profile {user.profileId ?? 'None'}
+                  </span>
                </div>
                <div className="user-grid-stats">
                  <div>