clean up mock handlers

Author: david-crespo

app/pages/settings/AccessTokensPage.tsx

@@ -58,7 +58,7 @@ export default function AccessTokensPage() {
           doDelete: () => deleteToken({ path: { tokenId: token.id } }),
           label: token.id,
           extraContent:
-            'This cannot be undone. Any application or instances of the Oxide CLI that depends on this token will need a new one.',
+            'This cannot be undone. Any application or instance of the Oxide CLI that depends on this token will need a new one.',
         }),
       },
     ],

mock-api/index.ts

@@ -24,6 +24,7 @@ export * from './sled'
 export * from './snapshot'
 export * from './sshKeys'
 export * from './switch'
+export * from './token'
 export * from './user'
 export * from './user-group'
 export * from './vpc'

mock-api/msw/db.ts

@@ -19,7 +19,6 @@ import { commaSeries } from '~/util/str'
 
 import type { Json } from '../json-type'
 import { siloSettings } from '../silo'
-import { deviceTokens } from '../token'
 import { internalError } from './util'
 
 export const notFoundErr = (msg: string) => {
@@ -478,7 +477,7 @@ const initDb = {
   affinityGroupMemberLists: [...mock.affinityGroupMemberLists],
   antiAffinityGroups: [...mock.antiAffinityGroups],
   antiAffinityGroupMemberLists: [...mock.antiAffinityGroupMemberLists],
-  deviceTokens: [...deviceTokens],
+  deviceTokens: [...mock.deviceTokens],
   disks: [...mock.disks],
   diskBulkImportState: new Map<string, DiskBulkImport>(),
   floatingIps: [...mock.floatingIps],

mock-api/msw/handlers.ts

@@ -1419,6 +1419,15 @@ export const handlers = makeHandlers({
 
     return body
   },
+  // assume every silo has a settings entry in both of these
+  authSettingsUpdate({ body }) {
+    const settings = db.siloSettings.find((s) => s.silo_id === defaultSilo.id)!
+    settings.device_token_max_ttl_seconds = body.device_token_max_ttl_seconds
+    return settings
+  },
+  authSettingsView() {
+    return db.siloSettings.find((s) => s.silo_id === defaultSilo.id)!
+  },
   rackList: ({ query, cookies }) => {
     requireFleetViewer(cookies)
     return paginated(query, db.racks)
@@ -1458,14 +1467,10 @@ export const handlers = makeHandlers({
     return 204
   },
   currentUserAccessTokenDelete({ path }) {
-    // Mock delete token - find and remove from mock tokens
     db.deviceTokens = db.deviceTokens.filter((token) => token.id !== path.tokenId)
     return 204
   },
-  currentUserAccessTokenList({ query }) {
-    // Mock token list - return dummy tokens for current user
-    return paginated(query, db.deviceTokens)
-  },
+  currentUserAccessTokenList: ({ query }) => paginated(query, db.deviceTokens),
   sledView({ path, cookies }) {
     requireFleetViewer(cookies)
     return lookup.sled(path)
@@ -1873,22 +1878,6 @@ export const handlers = makeHandlers({
   rackView: NotImplemented,
   roleList: NotImplemented,
   roleView: NotImplemented,
-  authSettingsUpdate({ body }) {
-    // Find settings for default silo (assume it exists)
-    const settingsIndex = db.siloSettings.findIndex((s) => s.silo_id === defaultSilo.id)
-
-    // Update existing settings
-    db.siloSettings[settingsIndex] = {
-      ...db.siloSettings[settingsIndex],
-      device_token_max_ttl_seconds: body.device_token_max_ttl_seconds,
-    }
-    return db.siloSettings[settingsIndex]
-  },
-  authSettingsView() {
-    // Find settings for default silo (assume it exists)
-    const settings = db.siloSettings.find((s) => s.silo_id === defaultSilo.id)!
-    return settings
-  },
   siloPolicyUpdate: NotImplemented,
   siloPolicyView: NotImplemented,
   siloUserList: NotImplemented,

mock-api/token.ts

@@ -11,17 +11,17 @@ import type { Json } from './json-type'
 
 export const deviceTokens: Json<DeviceAccessToken>[] = [
   {
-    id: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+    id: '6e762538-dd89-454e-b6e7-82a199b6e51a',
     time_created: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString(), // 7 days ago
     time_expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(), // 30 days from now
   },
   {
-    id: 'b2c3d4e5-f6g7-8901-bcde-f23456789012',
+    id: '9c858b30-bb11-4596-8c5e-c2bf1a26843e',
     time_created: new Date(Date.now() - 14 * 24 * 60 * 60 * 1000).toISOString(), // 14 days ago
     time_expires: new Date(Date.now() + 60 * 24 * 60 * 60 * 1000).toISOString(), // 60 days from now
   },
   {
-    id: 'c3d4e5f6-g7h8-9012-cdef-345678901234',
+    id: '29b1d980-e0d3-4318-b714-4a1f3e7b191f',
     time_created: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000).toISOString(), // 3 days ago
     time_expires: null, // Never expires
   },