Merge pull request #288 from Flagsmith/fix/sanitise-api-url

fix: Handle API URL with or without trailing slash

Author: kyle-ssg

flagsmith-core.ts

@@ -23,6 +23,7 @@ import angularFetch from './utils/angular-fetch';
 import setDynatraceValue from './utils/set-dynatrace-value';
 import { EvaluationContext } from './evaluation-context';
 import { isTraitEvaluationContext, toEvaluationContext, toTraitEvaluationContextObject } from './utils/types';
+import { ensureTrailingSlash } from './utils/ensureTrailingSlash';
 
 enum FlagSource {
     "NONE" = "NONE",
@@ -318,7 +319,7 @@ const Flagsmith = class {
                 ) : {},
             } : evaluationContext.identity;
             this.evaluationContext = evaluationContext;
-            this.api = api;
+            this.api = ensureTrailingSlash(api);
             this.headers = headers;
             this.getFlagInterval = null;
             this.analyticsInterval = null;

lib/flagsmith/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "Feature flagging to support continuous development",
   "main": "./index.js",
   "module": "./index.mjs",

lib/react-native-flagsmith/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-flagsmith",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "Feature flagging to support continuous development",
   "main": "./index.js",
   "repository": {

test/init.test.ts

@@ -96,6 +96,21 @@ describe('Flagsmith.init', () => {
         });
         await expect(flagsmith.init(initConfig)).rejects.toThrow(Error);
     });
+    test('should sanitise api url', async () => {
+        const onChange = jest.fn();
+        const { flagsmith,initConfig } = getFlagsmith({
+            api:'https://edge.api.flagsmith.com/api/v1/',
+            onChange,
+        });
+        await flagsmith.init(initConfig)
+        expect(flagsmith.getState().api).toBe('https://edge.api.flagsmith.com/api/v1/');
+        const { flagsmith:flagsmith2 } = getFlagsmith({
+            api:'https://edge.api.flagsmith.com/api/v1',
+            onChange,
+        });
+        await flagsmith2.init(initConfig)
+        expect(flagsmith2.getState().api).toBe('https://edge.api.flagsmith.com/api/v1/');
+    });
     test('should reject initialize with identity bad key', async () => {
         const onChange = jest.fn();
         const { flagsmith, initConfig, mockFetch } = getFlagsmith({ onChange, environmentID: 'bad' });

utils/ensureTrailingSlash.ts

@@ -0,0 +1,3 @@
+export function ensureTrailingSlash(str: string): string {
+    return str.endsWith('/') ? str : str + '/';
+}