Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: stringifying session ID for airship #3896

Merged
merged 10 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/v0/destinations/airship/data/airshipTrackConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
{
"destKey": "session_id",
"sourceKeys": ["properties.sessionId", "context.sessionId"],
"required": false
"required": false,
"metadata": {
"type": "toString"
}
},
{
"destKey": "transaction",
Expand Down
12 changes: 11 additions & 1 deletion src/v0/destinations/airship/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,20 @@
extractCustomFields,
isEmptyObject,
simpleProcessRouterDest,
convertToUuid,
} = require('../../util');
const { JSON_MIME_TYPE } = require('../../util/constant');
const { transformSessionId } = require('./utils');

const DEFAULT_ACCEPT_HEADER = 'application/vnd.urbanairship+json; version=3';

const transformSessionId = (rawSessionId) => {
try {
return convertToUuid(rawSessionId);
} catch (error) {
throw new InstrumentationError(`Failed to transform session ID: ${error.message}`);

Check warning on line 35 in src/v0/destinations/airship/transform.js

View check run for this annotation

Codecov / codecov/patch

src/v0/destinations/airship/transform.js#L35

Added line #L35 was not covered by tests
}
};

const identifyResponseBuilder = (message, { Config }) => {
const tagPayload = constructPayload(message, identifyMapping);
const { apiKey, dataCenter } = Config;
Expand Down Expand Up @@ -129,6 +137,8 @@

name = name.toLowerCase();
const payload = constructPayload(message, trackMapping);

// ref : https://docs.airship.com/api/ua/#operation-api-custom-events-post
if (isDefinedAndNotNullAndNotEmpty(payload.session_id)) {
payload.session_id = transformSessionId(payload.session_id);
}
Expand Down
12 changes: 0 additions & 12 deletions src/v0/destinations/airship/utils.js

This file was deleted.

20 changes: 20 additions & 0 deletions src/v0/util/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const uaParser = require('ua-parser-js');
const moment = require('moment-timezone');
const sha256 = require('sha256');
const crypto = require('crypto');
const { v5 } = require('uuid');
const {
InstrumentationError,
BaseError,
Expand Down Expand Up @@ -2330,6 +2331,24 @@ const isEventSentByVDMV1Flow = (event) => event?.message?.context?.mappedToDesti

const isEventSentByVDMV2Flow = (event) =>
event?.connection?.config?.destination?.schemaVersion === VDM_V2_SCHEMA_VERSION;

const convertToUuid = (input) => {
const NAMESPACE = v5.DNS;
try {
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
// Stringify and trim the input
const trimmedInput = String(input).trim();

// Check for empty input after trimming
if (!trimmedInput) {
throw new InstrumentationError('Input is empty or invalid.');
}
// Generate and return UUID
return v5(trimmedInput, NAMESPACE);
} catch (error) {
const errorMessage = `Failed to transform input to uuid: ${error.message}`;
throw new InstrumentationError(errorMessage);
}
};
// ========================================================================
// EXPORTS
// ========================================================================
Expand Down Expand Up @@ -2456,4 +2475,5 @@ module.exports = {
getRelativePathFromURL,
removeEmptyKey,
isAxiosError,
convertToUuid,
};
64 changes: 64 additions & 0 deletions src/v0/util/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const { InstrumentationError } = require('@rudderstack/integrations-lib');
const utilities = require('.');
const { getFuncTestData } = require('../../../test/testHelper');
const { FilteredEventsError } = require('./errorTypes');
const { v5 } = require('uuid');
const {
hasCircularReference,
flattenJson,
Expand All @@ -11,6 +12,7 @@ const {
groupRouterTransformEvents,
isAxiosError,
removeHyphens,
convertToUuid,
} = require('./index');
const exp = require('constants');

Expand Down Expand Up @@ -985,3 +987,65 @@ describe('removeHyphens', () => {
});
});
});

describe('convertToUuid', () => {
const NAMESPACE = v5.DNS;

test('should generate UUID for valid string input', () => {
const input = 'testInput';
const expectedUuid = v5(input, NAMESPACE);
const result = convertToUuid(input);
expect(result).toBe(expectedUuid);
});

test('should generate UUID for valid numeric input', () => {
const input = 123456;
const expectedUuid = v5(String(input), NAMESPACE);
const result = convertToUuid(input);
expect(result).toBe(expectedUuid);
});

test('should trim spaces and generate UUID', () => {
const input = ' testInput ';
const expectedUuid = v5('testInput', NAMESPACE);
const result = convertToUuid(input);
expect(result).toBe(expectedUuid);
});

test('should throw an error for empty input', () => {
const input = '';
expect(() => convertToUuid(input)).toThrow(InstrumentationError);
expect(() => convertToUuid(input)).toThrow('Input is empty or invalid.');
});

test('does not throw an error for null input', () => {
shrouti1507 marked this conversation as resolved.
Show resolved Hide resolved
const input = null;
const result = convertToUuid(input);
expect(result).toBe('14fe171b-730d-5a16-8d75-fccfea2e4267');
});

test('does not throw an error for undefined input', () => {
const input = undefined;
const result = convertToUuid(input);
expect(result).toBe('fb6fdadc-7f92-59fe-9a2c-87b5b3b62522');
});

test('should throw an error for input that is whitespace only', () => {
const input = ' ';
expect(() => convertToUuid(input)).toThrow(InstrumentationError);
expect(() => convertToUuid(input)).toThrow('Input is empty or invalid.');
});

test('should handle long string input gracefully', () => {
const input = 'a'.repeat(1000);
const expectedUuid = v5(input, NAMESPACE);
const result = convertToUuid(input);
expect(result).toBe(expectedUuid);
});

test('any invalid input if stringified does not throw error', () => {
const input = {};
const result = convertToUuid(input);
expect(result).toBe('672ca00c-37f4-5d71-b8c3-6ae0848080ec');
});
});
Loading
Loading