Merge pull request #36 from kinde-oss/peter/fix/ff

fix: get feature flags
kinde-oss · Jul 5, 2023 · 52b23d7 · 52b23d7
2 parents 9258689 + ff55946
commit 52b23d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/session/appRouter/getFlag.js b/src/session/appRouter/getFlag.js
@@ -6,16 +6,11 @@ const flagDataTypeMap = {
   b: 'boolean'
 };
 
-const getClaimValue = (claim) => {
-  const obj = getClaim(claim);
-  return obj && obj.value;
-};
-
 export const getFlag = (code, defaultValue, flagType) => {
-  const flags = getClaimValue('feature_flags');
+  const flags = getClaim('feature_flags');
   const flag = flags && flags[code] ? flags[code] : {};
 
-  if (!flag.v && !defaultValue) {
+  if (!flag.v && defaultValue == undefined) {
     throw Error(
       `Flag ${code} was not found, and no default value has been provided`
     );

diff --git a/src/session/pagesRouter/getFlag.js b/src/session/pagesRouter/getFlag.js
@@ -6,16 +6,11 @@ const flagDataTypeMap = {
   b: 'boolean'
 };
 
-const getClaimValue = (claim, tokenKey = 'access_token') => {
-  const obj = getClaim(claim, tokenKey);
-  return obj && obj.value;
-};
-
 export const getFlag = (code, defaultValue, flagType) => {
-  const flags = getClaimValue('feature_flags');
+  const flags = getClaim('feature_flags');
   const flag = flags && flags[code] ? flags[code] : {};
 
-  if (!flag.v && !defaultValue) {
+  if (!flag.v && defaultValue == undefined) {
     throw Error(
       `Flag ${code} was not found, and no default value has been provided`
     );