fix(credentials): keep a Splunk password's surrounding spaces, and report page 1 when Apollo is asked for page 0

Author: waleedlatif1

apps/sim/lib/credentials/service-account-secret.test.ts

@@ -838,6 +838,59 @@ describe('a ServiceNow login', () => {
   })
 })
 
+describe('a Splunk username and password', () => {
+  const secureFetch = inputValidationMockFns.mockSecureFetchWithPinnedIP
+
+  beforeEach(() => {
+    mockEncryptSecret.mockImplementation(async (value: string) => ({ encrypted: value }))
+    inputValidationMockFns.mockValidateUrlWithDNS.mockReset().mockResolvedValue({
+      isValid: true,
+      resolvedIP: '203.0.113.7',
+      originalHostname: 'splunk.example.com',
+    })
+    secureFetch.mockReset().mockResolvedValue(
+      new Response(JSON.stringify({ entry: [{ content: { username: 'svc-sim' } }] }), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      })
+    )
+  })
+
+  it('verifies and stores a password with surrounding spaces exactly as typed', async () => {
+    const result = await verifyAndBuildServiceAccountSecret('splunk-service-account', {
+      apiToken: ' pass word ',
+      providerWorkspaceId: 'svc-sim',
+      domain: 'splunk.example.com:8089',
+    })
+
+    expect(secureFetch).toHaveBeenCalledWith(
+      expect.any(String),
+      '203.0.113.7',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: `Basic ${Buffer.from('svc-sim: pass word ').toString('base64')}`,
+        }),
+      })
+    )
+    expect(JSON.parse(result.encryptedServiceAccountKey).apiToken).toBe(' pass word ')
+  })
+
+  it('still sends a pasted token without its surrounding whitespace', async () => {
+    await verifyAndBuildServiceAccountSecret('splunk-service-account', {
+      apiToken: ' splunk-token\n',
+      domain: 'splunk.example.com:8089',
+    })
+
+    expect(secureFetch).toHaveBeenCalledWith(
+      expect.any(String),
+      '203.0.113.7',
+      expect.objectContaining({
+        headers: expect.objectContaining({ Authorization: 'Bearer splunk-token' }),
+      })
+    )
+  })
+})
+
 describe('a token provider whose region or host defaults to the one it always used', () => {
   const fetchMock = vi.fn<typeof fetch>()
 

apps/sim/lib/credentials/token-service-accounts/descriptors.ts

@@ -2742,6 +2742,7 @@ export const TOKEN_SERVICE_ACCOUNT_DESCRIPTORS: Record<
         label: 'Authentication token or password',
         placeholder: 'Paste a Splunk authentication token, or the password',
         secret: true,
+        preserveWhitespace: true,
       },
       {
         id: 'providerWorkspaceId',

apps/sim/tools/apollo/people_search.test.ts

@@ -57,6 +57,15 @@ describe('apollo_people_search response mapping', () => {
     expect(result.output.per_page).toBe(100)
   })
 
+  it.concurrent('reports page 1, the page the request sent, when page is 0', async () => {
+    const result = await transform(
+      { total_entries: 5, people: [] },
+      { apiKey: 'token', credentialType: 'oauth', page: 0 }
+    )
+
+    expect(result.output.page).toBe(1)
+  })
+
   it.concurrent('reads the nested pagination the legacy endpoint returns', async () => {
     const result = await transform(
       { people: [{ id: 'p2' }], pagination: { page: 2, per_page: 10, total_entries: 40 } },

apps/sim/tools/apollo/people_search.ts

@@ -196,7 +196,7 @@ export const apolloPeopleSearchTool: ToolConfig<
       success: true,
       output: {
         people: data.people || [],
-        page: pagination.page ?? data.page ?? params?.page ?? 1,
+        page: pagination.page ?? data.page ?? (params?.page || 1),
         per_page: pagination.per_page ?? data.per_page ?? requestedPerPage(params),
         total_entries: pagination.total_entries ?? data.total_entries ?? 0,
       },