move v3 decoding into main lib

Author: ryanmccrary

src/index.js

@@ -3,6 +3,18 @@ import { setCookie, getCookie, getAnalyticsCookie, generateId } from './cookie.j
 import { sendEvent } from './http.js';
 import { version } from '../package.json';
 
+function decodeV3Cookie(value) {
+    if (value && value.startsWith('RS_ENC_v3_')) {
+        const encoded = value.replace('RS_ENC_v3_', '');
+        try {
+            return JSON.parse(atob(encoded));
+        } catch (e) {
+            return null;
+        }
+    }
+    return value;
+}
+
 // Define TinyTag class
 function TinyTag() {
   this.queue = new EventQueue();
@@ -135,7 +147,7 @@ TinyTag.prototype.group = function (groupId, traits = {}) {
 };
 
 TinyTag.prototype.getAnonymousId = function () {
-  let anonId = getAnalyticsCookie('anonymous_id', 'anonymousId');
+  let anonId = decodeV3Cookie(getAnalyticsCookie('anonymous_id', 'anonymousId'));
   if (!anonId) {
     anonId = generateId();
     setCookie('anonymousId', anonId);
@@ -144,11 +156,11 @@ TinyTag.prototype.getAnonymousId = function () {
 };
 
 TinyTag.prototype.getUserId = function () {
-  return getAnalyticsCookie('user_id', 'userId');
+  return decodeV3Cookie(getAnalyticsCookie('user_id', 'userId'));
 };
 
 TinyTag.prototype.getTraits = function () {
-  const traitsCookie = getAnalyticsCookie('trait', 'traits');
+  const traitsCookie = decodeV3Cookie(getAnalyticsCookie('trait', 'traits'));
   return traitsCookie ? JSON.parse(traitsCookie) : {};
 };
 

src/rudder-compat.js

@@ -6,52 +6,36 @@ import { getCookie } from './cookie.js'; // Reuse TinyTag's getCookie
 // RudderStack v1 decryption key (placeholder, needs actual key)
 const V1_ENCRYPTION_KEY = 'Rudder'; // Replace with real key from RudderStack
 
-// Decode v3 encoded cookie (base64 JSON)
-function decodeV3Cookie(value) {
-  if (value && value.startsWith('RS_ENC_v3_')) {
-    const encoded = value.replace('RS_ENC_v3_', '');
-    try {
-      return JSON.parse(atob(encoded));
-    } catch (e) {
-      return null; // Invalid encoding
-    }
-  }
-  return value; // Not v3, return as-is
-}
-
-// Decrypt v1 encrypted cookie
 function decryptV1Cookie(value) {
     if (value && !value.startsWith('RS_ENC_v3_')) {
       try {
         const bytes = AES.decrypt(value, V1_ENCRYPTION_KEY);
         const decrypted = bytes.toString(CryptoJS.enc.Utf8);
-        return decrypted || value; // Return original if decryption fails or is empty
+        return decrypted || value;
       } catch (e) {
-        return value; // Return original on exception
+        return value;
       }
     }
-    return value; // Not v3 or encrypted, return as-is
+    return value;
   }
-
-// Enhance window.tt methods with RudderStack compatibility
-const originalGetUserId = window.tt.getUserId;
-window.tt.getUserId = function () {
-  const value = getCookie('rl_user_id');
-  return decodeV3Cookie(decryptV1Cookie(value)) || originalGetUserId();
-};
-
-const originalGetAnonymousId = window.tt.getAnonymousId;
-window.tt.getAnonymousId = function () {
-  const value = getCookie('rl_anonymous_id');
-  return decodeV3Cookie(decryptV1Cookie(value)) || originalGetAnonymousId();
-};
-
-const originalGetTraits = window.tt.getTraits;
-window.tt.getTraits = function () {
-  const value = getCookie('rl_trait');
-  const decoded = decodeV3Cookie(decryptV1Cookie(value));
-  return decoded ? JSON.parse(decoded) : originalGetTraits();
-};
-
-// Export for testing (optional, not used in IIFE)
-export { decodeV3Cookie, decryptV1Cookie };
+  
+  const originalGetUserId = window.tt.getUserId;
+  window.tt.getUserId = function () {
+    const value = getCookie('rl_user_id');
+    return decryptV1Cookie(value) || originalGetUserId();
+  };
+  
+  const originalGetAnonymousId = window.tt.getAnonymousId;
+  window.tt.getAnonymousId = function () {
+    const value = getCookie('rl_anonymous_id');
+    return decryptV1Cookie(value) || originalGetAnonymousId();
+  };
+  
+  const originalGetTraits = window.tt.getTraits;
+  window.tt.getTraits = function () {
+    const value = getCookie('rl_trait');
+    const decoded = decryptV1Cookie(value);
+    return decoded ? JSON.parse(decoded) : originalGetTraits();
+  };
+  
+  export { decryptV1Cookie };

tests/rudder-compat.test.js

@@ -13,32 +13,11 @@ describe('RudderStack Compatibility', () => {
     });
   });
 
-  test('decodeV3Cookie decodes base64 v3 RudderStack cookie', () => {
-    const v3Value = 'RS_ENC_v3_' + btoa(JSON.stringify('user123'));
-    setCookie('rl_user_id', v3Value);
-    expect(decodeV3Cookie(getCookie('rl_user_id'))).toBe('user123');
-  });
-
-  test('decodeV3Cookie returns original value if not v3 format', () => {
-    setCookie('rl_user_id', 'plain-value');
-    expect(decodeV3Cookie(getCookie('rl_user_id'))).toBe('plain-value');
-  });
-  
-  test('decryptV1Cookie decrypts v1 RudderStack cookie', () => {
-    const plainValue = 'anon123asdasdasdlskdjasdlkajdalskdjasldsdl';
+  test('window.tt.getUserId reads v1 encrypted cookie', () => {
+    const plainValue = 'user123';
     const encrypted = CryptoJS.AES.encrypt(plainValue, 'Rudder').toString();
-    expect(decryptV1Cookie(encrypted)).toBe(plainValue); // Direct test
-  });
-
-  test('decryptV1Cookie returns original value if not encrypted', () => {
-    setCookie('rl_anonymous_id', 'plain-value');
-    expect(decryptV1Cookie(getCookie('rl_anonymous_id'))).toBe('plain-value');
-  });
-
-  test('window.tt.getUserId reads v3 encoded cookie', () => {
-    const v3Value = 'RS_ENC_v3_' + btoa(JSON.stringify('user123'));
-    setCookie('rl_user_id', v3Value);
-    expect(window.tt.getUserId()).toBe('user123');
+    setCookie('rl_user_id', encrypted);
+    expect(window.tt.getUserId()).toBe(plainValue);
   });
 
   test('window.tt.getAnonymousId reads v1 encrypted cookie', () => {
@@ -48,18 +27,10 @@ describe('RudderStack Compatibility', () => {
     expect(window.tt.getAnonymousId()).toBe(plainValue);
   });
 
-  test('window.tt.getTraits reads v3 encoded traits', () => {
+  test('window.tt.getTraits reads v1 encrypted traits', () => {
     const traits = { email: '[email protected]' };
-    const v3Value = 'RS_ENC_v3_' + btoa(JSON.stringify(JSON.stringify(traits)));
-    setCookie('rl_trait', v3Value);
+    const encrypted = CryptoJS.AES.encrypt(JSON.stringify(traits), 'Rudder').toString();
+    setCookie('rl_trait', encrypted);
     expect(window.tt.getTraits()).toEqual(traits);
   });
-
-  test('decryptV1Cookie decrypts v1 RudderStack cookie', () => {
-    const plainValue = 'anon123asdasdasdlskdjasdlkajdalskdjasldsdl';
-    const encrypted = CryptoJS.AES.encrypt(plainValue, 'Rudder').toString();
-    const decrypted = decryptV1Cookie(encrypted);
-    console.log('Encrypted:', encrypted, 'Decrypted:', decrypted);
-    expect(decrypted).toBe(plainValue);
-  });
 });