feat: usebooleanconfig-takes-precedence-over-returnvaluefordisabledflags

Signed-off-by: wadii <[email protected]>

Author: Zaimwa9

libs/providers/flagsmith/src/lib/flagsmith-provider.spec.ts

@@ -331,11 +331,16 @@ describe('FlagsmithOpenFeatureProvider', () => {
         expect(result.reason).toBe(StandardResolutionReasons.DISABLED);
       });
 
-      it('should throw flag is not enabled with disabled boolean flag and returnValueForDisabledFlags (default)is false', async () => {
+      it('should return flag.enabled with disabled boolean flag and returnValueForDisabledFlags (default) is false', async () => {
         mockFlags.getFlag.mockReturnValue(mockFlagData.booleanDisabled);
-        await expect(
-          defaultProvider.resolveBooleanEvaluation('test-flag', false, evaluationContext, loggerMock),
-        ).rejects.toThrow(FlagsmithProviderError);
+        const result = await defaultProvider.resolveBooleanEvaluation(
+          'test-flag',
+          false,
+          evaluationContext,
+          loggerMock,
+        );
+        expect(result.value).toBe(false);
+        expect(result.reason).toBe(StandardResolutionReasons.DISABLED);
       });
 
       it('should return default value with error details when flag value type does not match requested type', async () => {

libs/providers/flagsmith/src/lib/flagsmith-provider.ts

@@ -114,22 +114,21 @@ export default class FlagsmithOpenFeatureProvider implements Provider {
       throw new FlagsmithProviderError('An error occurred retrieving flags from Flagsmith client.', ErrorCode.GENERAL);
     }
 
-    // Do we want to raise an error if the flag is not found?
     if (!this.useFlagsmithDefaults && (!flag || flag?.isDefault)) {
       throw new FlagNotFoundError(`Flag '${flagKey}' was not found.`);
     }
 
-    if (!(this.returnValueForDisabledFlags || flag.enabled)) {
-      throw new FlagsmithProviderError(`Flag '${flagKey}' is not enabled.`, ErrorCode.GENERAL);
-    }
-
     if (!this.useBooleanConfigValue && flagType === 'boolean') {
       return {
         value: flag.enabled,
         reason: flag.enabled ? StandardResolutionReasons.TARGETING_MATCH : StandardResolutionReasons.DISABLED,
       };
     }
 
+    if (!(this.returnValueForDisabledFlags || flag.enabled)) {
+      throw new FlagsmithProviderError(`Flag '${flagKey}' is not enabled.`, ErrorCode.GENERAL);
+    }
+
     const typedValue = typeFactory(flag.value, flagType);
     if (typedValue === undefined || typeof typedValue !== flagType) {
       return {