Skip to content

Commit

Permalink
Fix and experimental changes to httpfetchrequest
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelGHSeg
MichaelGHSeg committed Sep 20, 2023
1 parent 75789e0 commit b790e21
Show file tree
Hide file tree
Showing 4 changed files with 179 additions and 194 deletions.
360 changes: 174 additions & 186 deletions packages/node/src/__tests__/oauth.integration.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,177 @@
// import { HTTPResponse } from '../lib/http-client'
// import { TokenManager, TokenManagerProps } from '../lib/token-manager'
// import {
// TestFetchClient,
// createTestAnalytics,
// } from './test-helpers/create-test-analytics'
// import { resolveCtx } from './test-helpers/resolve-ctx'

// const privateKey = Buffer.from(`-----BEGIN PRIVATE KEY-----
// MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDVll7uJaH322IN
// PQsH2aOXZJ2r1q+6hpVK1R5JV1p41PUzn8pOxyXFHWB+53dUd4B8qywKS36XQjp0
// VmhR1tQ22znQ9ZCM6y4LGeOJBjAZiFZLcGQNNrDFC0WGWTrK1ZTS2K7p5qy4fIXG
// laNkMXiGGCawkgcHAdOvPTy8m1d9a6YSetYVmBP/tEYN95jPyZFIoHQfkQPBPr9W
// cWPpdEBzasHV5d957akjurPpleDiD5as66UW4dkWXvS7Wu7teCLCyDApcyJKTb2Z
// SXybmWjhIZuctZMAx3wT/GgW3FbkGaW5KLQgBUMzjpL0fCtMatlqckMD92ll1FuK
// R+HnXu05AgMBAAECggEBAK4o2il4GDUh9zbyQo9ZIPLuwT6AZXRED3Igi3ykNQp4
// I6S/s9g+vQaY6LkyBnSiqOt/K/8NBiFSiJWaa5/n+8zrP56qzf6KOlYk+wsdN5Vq
// PWtwLrUzljpl8YAWPEFunNa8hwwE42vfZbnDBKNLT4qQIOQzfnVxQOoQlfj49gM2
// iSrblvsnQTyucFy3UyTeioHbh8q2Xqcxry5WUCOrFDd3IIwATTpLZGw0IPeuFJbJ
// NfBizLEcyJaM9hujQU8PRCRd16MWX+bbYM6Mh4dkT40QXWsVnHBHwsgPdQgDgseF
// Na4ajtHoC0DlwYCXpCm3IzJfKfq/LR2q8NDUgKeF4AECgYEA9nD4czza3SRbzhpZ
// bBoK77CSNqCcMAqyuHB0hp/XX3yB7flF9PIPb2ReO8wwmjbxn+bm7PPz2Uwd2SzO
// pU+FXmyKJr53Jxw/hmDWZCoh42gsGDlVqpmytzsj74KlaYiMyZmEGbD7t/FGfNGV
// LdLDJaHIYxEimFviOTXKCeKvPAECgYEA3d8tv4jdp1uAuRZiU9Z/tfw5mJOi3oXF
// 8AdFFDwaPzcTorEAxjrt9X6IjPbLIDJNJtuXYpe+dG6720KyuNnhLhWW9oZEJTwT
// dUgqZ2fTCOS9uH0jSn+ZFlgTWI6UDQXRwE7z8avlhMIrQVmPsttGTo7V6sQVtGRx
// bNj2RSVekTkCgYAJvy4UYLPHS0jWPfSLcfw8vp8JyhBjVgj7gncZW/kIrcP1xYYe
// yfQSU8XmV40UjFfCGz/G318lmP0VOdByeVKtCV3talsMEPHyPqI8E+6DL/uOebYJ
// qUqINK6XKnOgWOY4kvnGillqTQCcry1XQp61PlDOmj7kB75KxPXYrj6AAQKBgQDa
// +ixCv6hURuEyy77cE/YT/Q4zYnL6wHjtP5+UKwWUop1EkwG6o+q7wtiul90+t6ah
// 1VUCP9X/QFM0Qg32l0PBohlO0pFrVnG17TW8vSHxwyDkds1f97N19BOT8ZR5jebI
// sKPfP9LVRnY+l1BWLEilvB+xBzqMwh2YWkIlWI6PMQKBgGi6TBnxp81lOYrxVRDj
// /3ycRnVDmBdlQKFunvfzUBmG1mG/G0YHeVSUKZJGX7w2l+jnDwIA383FcUeA8X6A
// l9q+amhtkwD/6fbkAu/xoWNl+11IFoxd88y2ByBFoEKB6UVLuCTSKwXDqzEZet7x
// mDyRxq7ohIzLkw8b8buDeuXZ
// -----END PRIVATE KEY-----`)

// jest.setTimeout(10000)
// const timestamp = new Date()

// const oauthTestClient = new TestFetchClient()
// const oauthFetcher = jest.spyOn(oauthTestClient, 'makeRequest')

// const getTokenManagerProps = () => {
// const tokenManagerProps = {
// httpClient: oauthTestClient,
// maxRetries: 3,
// clientId: 'clientId',
// clientKey: privateKey,
// keyId: 'keyId',
// scope: 'scope',
// authServer: 'http://127.0.0.1:1234',
// } as TokenManagerProps
// return tokenManagerProps
// }

// const createOAuthSuccess = (body?: any) => {
// return Promise.resolve({
// json: () => Promise.resolve(body),
// ok: true,
// status: 200,
// statusText: 'OK',
// }) as unknown as Promise<HTTPResponse>
// }

// const createOAuthError = (overrides: Partial<HTTPResponse> = {}) => {
// return Promise.resolve({
// ok: false,
// status: 400,
// statusText: 'Foo',
// ...overrides,
// }) as Promise<HTTPResponse>
// }

describe('Placeholder', () => {
it('needs a test to pass but everything is broken', async () => {
expect(true).toBeTruthy()
import { HTTPResponse } from '../lib/http-client'
import { TokenManager, TokenManagerProps } from '../lib/token-manager'
import {
TestFetchClient,
createTestAnalytics,
} from './test-helpers/create-test-analytics'
import { resolveCtx } from './test-helpers/resolve-ctx'

const privateKey = Buffer.from(`-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDVll7uJaH322IN
PQsH2aOXZJ2r1q+6hpVK1R5JV1p41PUzn8pOxyXFHWB+53dUd4B8qywKS36XQjp0
VmhR1tQ22znQ9ZCM6y4LGeOJBjAZiFZLcGQNNrDFC0WGWTrK1ZTS2K7p5qy4fIXG
laNkMXiGGCawkgcHAdOvPTy8m1d9a6YSetYVmBP/tEYN95jPyZFIoHQfkQPBPr9W
cWPpdEBzasHV5d957akjurPpleDiD5as66UW4dkWXvS7Wu7teCLCyDApcyJKTb2Z
SXybmWjhIZuctZMAx3wT/GgW3FbkGaW5KLQgBUMzjpL0fCtMatlqckMD92ll1FuK
R+HnXu05AgMBAAECggEBAK4o2il4GDUh9zbyQo9ZIPLuwT6AZXRED3Igi3ykNQp4
I6S/s9g+vQaY6LkyBnSiqOt/K/8NBiFSiJWaa5/n+8zrP56qzf6KOlYk+wsdN5Vq
PWtwLrUzljpl8YAWPEFunNa8hwwE42vfZbnDBKNLT4qQIOQzfnVxQOoQlfj49gM2
iSrblvsnQTyucFy3UyTeioHbh8q2Xqcxry5WUCOrFDd3IIwATTpLZGw0IPeuFJbJ
NfBizLEcyJaM9hujQU8PRCRd16MWX+bbYM6Mh4dkT40QXWsVnHBHwsgPdQgDgseF
Na4ajtHoC0DlwYCXpCm3IzJfKfq/LR2q8NDUgKeF4AECgYEA9nD4czza3SRbzhpZ
bBoK77CSNqCcMAqyuHB0hp/XX3yB7flF9PIPb2ReO8wwmjbxn+bm7PPz2Uwd2SzO
pU+FXmyKJr53Jxw/hmDWZCoh42gsGDlVqpmytzsj74KlaYiMyZmEGbD7t/FGfNGV
LdLDJaHIYxEimFviOTXKCeKvPAECgYEA3d8tv4jdp1uAuRZiU9Z/tfw5mJOi3oXF
8AdFFDwaPzcTorEAxjrt9X6IjPbLIDJNJtuXYpe+dG6720KyuNnhLhWW9oZEJTwT
dUgqZ2fTCOS9uH0jSn+ZFlgTWI6UDQXRwE7z8avlhMIrQVmPsttGTo7V6sQVtGRx
bNj2RSVekTkCgYAJvy4UYLPHS0jWPfSLcfw8vp8JyhBjVgj7gncZW/kIrcP1xYYe
yfQSU8XmV40UjFfCGz/G318lmP0VOdByeVKtCV3talsMEPHyPqI8E+6DL/uOebYJ
qUqINK6XKnOgWOY4kvnGillqTQCcry1XQp61PlDOmj7kB75KxPXYrj6AAQKBgQDa
+ixCv6hURuEyy77cE/YT/Q4zYnL6wHjtP5+UKwWUop1EkwG6o+q7wtiul90+t6ah
1VUCP9X/QFM0Qg32l0PBohlO0pFrVnG17TW8vSHxwyDkds1f97N19BOT8ZR5jebI
sKPfP9LVRnY+l1BWLEilvB+xBzqMwh2YWkIlWI6PMQKBgGi6TBnxp81lOYrxVRDj
/3ycRnVDmBdlQKFunvfzUBmG1mG/G0YHeVSUKZJGX7w2l+jnDwIA383FcUeA8X6A
l9q+amhtkwD/6fbkAu/xoWNl+11IFoxd88y2ByBFoEKB6UVLuCTSKwXDqzEZet7x
mDyRxq7ohIzLkw8b8buDeuXZ
-----END PRIVATE KEY-----`)

jest.setTimeout(10000)
const timestamp = new Date()

const oauthTestClient = new TestFetchClient()
const oauthFetcher = jest.spyOn(oauthTestClient, 'makeRequest')

const getTokenManagerProps = () => {
const tokenManagerProps = {
httpClient: oauthTestClient,
maxRetries: 3,
clientId: 'clientId',
clientKey: privateKey,
keyId: 'keyId',
scope: 'scope',
authServer: 'http://127.0.0.1:1234',
} as TokenManagerProps
return tokenManagerProps
}

const createOAuthSuccess = (body?: any) => {
return Promise.resolve({
json: () => Promise.resolve(body),
ok: true,
status: 200,
statusText: 'OK',
}) as unknown as Promise<HTTPResponse>
}

const createOAuthError = (overrides: Partial<HTTPResponse> = {}) => {
return Promise.resolve({
ok: false,
status: 400,
statusText: 'Foo',
...overrides,
}) as Promise<HTTPResponse>
}

describe('OAuth Success', () => {
it('track event with OAuth', async () => {
const analytics = createTestAnalytics({
tokenManagerProps: getTokenManagerProps(),
})
const eventName = 'Test Event'

oauthFetcher.mockReturnValue(
createOAuthSuccess({
access_token: 'token',
expires_in: 100,
})
)

analytics.track({
event: eventName,
anonymousId: 'unknown',
userId: 'known',
timestamp: timestamp,
})

const ctx1 = await resolveCtx(analytics, 'track')

expect(ctx1.event.type).toEqual('track')
expect(ctx1.event.event).toEqual(eventName)
expect(ctx1.event.properties).toEqual({})
expect(ctx1.event.anonymousId).toEqual('unknown')
expect(ctx1.event.userId).toEqual('known')
expect(ctx1.event.timestamp).toEqual(timestamp)

expect(oauthFetcher).toHaveBeenCalledTimes(1)

await analytics.closeAndFlush()
})
})
describe('OAuth Retry Success', () => {
it('track event with OAuth', async () => {
const analytics = createTestAnalytics({
tokenManagerProps: getTokenManagerProps(),
})
oauthFetcher
.mockReturnValueOnce(createOAuthError({ status: 425 }))
.mockReturnValueOnce(
createOAuthSuccess({
access_token: 'token',
expires_in: 100,
})
)

const eventName = 'Test Event'

analytics.track({
event: eventName,
anonymousId: 'unknown',
userId: 'known',
timestamp: timestamp,
})

const ctx1 = await resolveCtx(analytics, 'track')

expect(ctx1.event.type).toEqual('track')
expect(ctx1.event.event).toEqual(eventName)
expect(ctx1.event.properties).toEqual({})
expect(ctx1.event.anonymousId).toEqual('unknown')
expect(ctx1.event.userId).toEqual('known')
expect(ctx1.event.timestamp).toEqual(timestamp)

expect(oauthFetcher).toHaveBeenCalledTimes(2)

await analytics.closeAndFlush()
})
})

describe('OAuth Failure', () => {
it('surfaces error', async () => {
const analytics = createTestAnalytics({
tokenManagerProps: getTokenManagerProps(),
})
oauthFetcher.mockReturnValue(createOAuthError({ status: 425 }))

const eventName = 'Test Event'

analytics.track({
event: eventName,
anonymousId: 'unknown',
userId: 'known',
timestamp: timestamp,
})

// describe('OAuth Success', () => {
// it('generates track events', async () => {
// const analytics = createTestAnalytics({
// tokenManagerProps: getTokenManagerProps(),
// })
// ;async () => {
// oauthFetcher.mockReturnValueOnce(
// createOAuthSuccess({
// access_token: 'token',
// expires_in: 100,
// })
// )
// }

// const eventName = 'Test Event'

// analytics.track({
// event: eventName,
// anonymousId: 'unknown',
// userId: 'known',
// timestamp: timestamp,
// })

// const ctx1 = await resolveCtx(analytics, 'track')

// expect(ctx1.event.type).toEqual('track')
// expect(ctx1.event.event).toEqual(eventName)
// expect(ctx1.event.properties).toEqual({})
// expect(ctx1.event.anonymousId).toEqual('unknown')
// expect(ctx1.event.userId).toEqual('known')
// expect(ctx1.event.timestamp).toEqual(timestamp)

// expect(oauthFetcher).toHaveBeenCalledTimes(1)

// await analytics.closeAndFlush()
// })
// })
// describe('OAuth Retry Success', () => {
// it('generates track events', async () => {
// const analytics = createTestAnalytics({
// tokenManagerProps: getTokenManagerProps(),
// })
// ;async () => {
// oauthFetcher
// .mockReturnValueOnce(createOAuthError({ status: 425 }))
// .mockReturnValueOnce(
// createOAuthSuccess({
// access_token: 'token',
// expires_in: 100,
// })
// )
// }

// const eventName = 'Test Event'

// analytics.track({
// event: eventName,
// anonymousId: 'unknown',
// userId: 'known',
// timestamp: timestamp,
// })

// const ctx1 = await resolveCtx(analytics, 'track')

// expect(ctx1.event.type).toEqual('track')
// expect(ctx1.event.event).toEqual(eventName)
// expect(ctx1.event.properties).toEqual({})
// expect(ctx1.event.anonymousId).toEqual('unknown')
// expect(ctx1.event.userId).toEqual('known')
// expect(ctx1.event.timestamp).toEqual(timestamp)

// expect(oauthFetcher).toHaveBeenCalledTimes(2)

// await analytics.closeAndFlush()
// })
// })

// describe('OAuth Failure', () => {
// it('generates track events', async () => {
// const analytics = createTestAnalytics({
// tokenManagerProps: getTokenManagerProps(),
// })
// ;async () => {
// oauthFetcher.mockReturnValue(createOAuthError({ status: 425 }))
// }

// const eventName = 'Test Event'

// analytics.track({
// event: eventName,
// anonymousId: 'unknown',
// userId: 'known',
// timestamp: timestamp,
// })

// const ctx1 = await resolveCtx(analytics, 'track')

// expect(ctx1.event.type).toEqual('track')
// expect(ctx1.event.event).toEqual(eventName)
// expect(ctx1.event.properties).toEqual({})
// expect(ctx1.event.anonymousId).toEqual('unknown')
// expect(ctx1.event.userId).toEqual('known')
// expect(ctx1.event.timestamp).toEqual(timestamp)

// expect(oauthFetcher).toHaveBeenCalledTimes(3)

// await analytics.closeAndFlush()
// })
// })
const ctx1 = await resolveCtx(analytics, 'track')

expect(ctx1.event.type).toEqual('track')
expect(ctx1.event.event).toEqual(eventName)
expect(ctx1.event.properties).toEqual({})
expect(ctx1.event.anonymousId).toEqual('unknown')
expect(ctx1.event.userId).toEqual('known')
expect(ctx1.event.timestamp).toEqual(timestamp)

expect(oauthFetcher).toHaveBeenCalledTimes(3)

await analytics.closeAndFlush()
})
})
4 changes: 2 additions & 2 deletions packages/node/src/lib/http-client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface HTTPFetchFn {
*/
export interface HTTPFetchRequest {
headers: Record<string, string>
body: string
body?: string | ReadableStream<Uint8Array>
method: HTTPClientRequest['method']
signal: any // AbortSignal type does not play nicely with node-fetch
}
Expand All @@ -27,7 +27,7 @@ export interface HTTPFetchRequest {
*/
export interface HTTPResponse {
headers: Record<string, any>
json(): Promise<any>
body: string
status: number
statusText: string
}
Expand Down
4 changes: 2 additions & 2 deletions packages/node/src/lib/token-manager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class TokenManager {
if (response.status === 200) {
let body: any
try {
body = await response.json() // TODO: Replace with actual method to get body - needs discussion since different HTTP clients expose this differently (buffers, streams, strings, objects)
body = await response.body // TODO: Replace with actual method to get body - needs discussion since different HTTP clients expose this differently (buffers, streams, strings, objects)
} catch (err) {
// Errors reading the body (not parsing) are likely networking issues, we can retry
retryCount++
Expand All @@ -127,7 +127,7 @@ export class TokenManager {
}
let token: AccessToken
try {
const parsedBody = /*JSON.parse(*/ body /*)*/
const parsedBody = JSON.parse(body)
// TODO: validate JSON
token = parsedBody
this.tokenEmitter.emit('access_token', { token })
Expand Down
Loading

0 comments on commit b790e21

Please sign in to comment.