Include salt in convenience method for setting precomputed flag store

Author: sameerank

src/client/eppo-precomputed-client.spec.ts

@@ -651,7 +651,12 @@ describe('EppoPrecomputedClient E2E test', () => {
       });
 
       const client = new EppoPrecomputedClient(storage, true);
-      client.setDecodedFlagKeySalt(salt);
+      client.setSubjectSaltAndPrecomputedFlagStore(
+        'test-subject',
+        { attr1: 'value1' },
+        encodeBase64(salt),
+        storage,
+      );
 
       expect(client.getStringAssignment(precomputedFlagKey, 'default')).toBe(
         mockPrecomputedFlag.variationValue,
@@ -688,7 +693,12 @@ describe('EppoPrecomputedClient E2E test', () => {
     });
 
     it('returns default value and does not log when store is not initialized', () => {
-      client.setSubjectAndPrecomputedFlagStore('test-subject', {}, store);
+      client.setSubjectSaltAndPrecomputedFlagStore(
+        'test-subject',
+        {},
+        encodeBase64('sodium-chloride'),
+        store,
+      );
       expect(client.getStringAssignment('test-flag', 'default')).toBe('default');
       expect(td.explain(mockLogger.logAssignment).callCount).toEqual(0);
     });
@@ -708,7 +718,12 @@ describe('EppoPrecomputedClient E2E test', () => {
           extraLogging: {},
         },
       });
-      client.setSubjectAndPrecomputedFlagStore(subjectKey, subjectAttributes, store);
+      client.setSubjectSaltAndPrecomputedFlagStore(
+        subjectKey,
+        subjectAttributes,
+        encodeBase64('sodium-chloride'),
+        store,
+      );
       expect(client.getStringAssignment('test-flag', 'default')).toBe('test-value');
 
       expect(td.explain(mockLogger.logAssignment).callCount).toEqual(1);

src/client/eppo-precomputed-client.ts

@@ -17,7 +17,7 @@ import { decodePrecomputedFlag } from '../decoding';
 import { FlagEvaluationWithoutDetails } from '../evaluator';
 import FetchHttpClient from '../http-client';
 import { DecodedPrecomputedFlag, PrecomputedFlag, VariationType } from '../interfaces';
-import { getMD5Hash } from '../obfuscation';
+import { decodeBase64, getMD5Hash } from '../obfuscation';
 import initPoller, { IPoller } from '../poller';
 import PrecomputedRequestor from '../precomputed-requestor';
 import { Attributes } from '../types';
@@ -64,20 +64,20 @@ export default class EppoPrecomputedClient {
     this.isObfuscated = isObfuscated;
   }
 
-  public setDecodedFlagKeySalt(salt: string) {
+  private setDecodedFlagKeySalt(salt: string) {
     this.decodedFlagKeySalt = salt;
   }
 
-  public setPrecomputedFlagsRequestParameters(parameters: PrecomputedFlagsRequestParameters) {
+  private setPrecomputedFlagsRequestParameters(parameters: PrecomputedFlagsRequestParameters) {
     this.precomputedFlagsRequestParameters = parameters;
   }
 
-  public setSubjectData(subjectKey: string, subjectAttributes: Attributes) {
+  private setSubjectData(subjectKey: string, subjectAttributes: Attributes) {
     this.subjectKey = subjectKey;
     this.subjectAttributes = subjectAttributes;
   }
 
-  // Convenience method that combines both since they are expected to be set together
+  // Convenience method that combines setters we need to make assignments work
   public setSubjectAndPrecomputedFlagsRequestParameters(
     parameters: PrecomputedFlagsRequestParameters,
   ) {
@@ -128,8 +128,8 @@ export default class EppoPrecomputedClient {
 
     // A callback to capture the salt and subject information
     precomputedRequestor.onPrecomputedResponse = (responseData) => {
-      if (responseData.decodedSalt) {
-        this.setDecodedFlagKeySalt(responseData.decodedSalt);
+      if (responseData.salt) {
+        this.setDecodedFlagKeySalt(decodeBase64(responseData.salt));
       }
       if (responseData.subjectKey && responseData.subjectAttributes) {
         this.setSubjectData(responseData.subjectKey, responseData.subjectAttributes);
@@ -160,19 +160,21 @@ export default class EppoPrecomputedClient {
     }
   }
 
-  public setPrecomputedFlagStore(store: IConfigurationStore<PrecomputedFlag>) {
+  private setPrecomputedFlagStore(store: IConfigurationStore<PrecomputedFlag>) {
     this.requestPoller?.stop();
     this.precomputedFlagStore = store;
   }
 
-  // Convenience method that combines both since they are expected to be set together
-  public setSubjectAndPrecomputedFlagStore(
+  // Convenience method that combines setters we need to make assignments work
+  public setSubjectSaltAndPrecomputedFlagStore(
     subjectKey: string,
     subjectAttributes: Attributes,
+    salt: string,
     precomputedFlagStore: IConfigurationStore<PrecomputedFlag>,
   ) {
     this.setPrecomputedFlagStore(precomputedFlagStore);
     this.setSubjectData(subjectKey, subjectAttributes);
+    this.setDecodedFlagKeySalt(decodeBase64(salt));
   }
 
   private getPrecomputedAssignment<T>(

src/precomputed-requestor.ts

@@ -2,11 +2,10 @@ import { IConfigurationStore } from './configuration-store/configuration-store';
 import { hydrateConfigurationStore } from './configuration-store/configuration-store-utils';
 import { IHttpClient } from './http-client';
 import { PrecomputedFlag, UNKNOWN_ENVIRONMENT_NAME } from './interfaces';
-import { decodeBase64 } from './obfuscation';
 import { Attributes } from './types';
 
 export interface PrecomputedResponseData {
-  decodedSalt?: string;
+  salt?: string;
   subjectKey?: string;
   subjectAttributes?: Attributes;
 }
@@ -30,7 +29,7 @@ export default class PrecomputedFlagRequestor {
 
     if (this.onPrecomputedResponse) {
       this.onPrecomputedResponse({
-        decodedSalt: precomputedResponse?.salt ? decodeBase64(precomputedResponse.salt) : undefined,
+        salt: precomputedResponse?.salt,
         subjectKey: this.subjectKey,
         subjectAttributes: this.subjectAttributes,
       });