wip

Author: doregg

packages/vue/src/auth/entitlements.ts

@@ -9,10 +9,10 @@ import {
   AuthState,
 } from '@frontegg/redux-store';
 
-import { FeatureFlags, USE_ENTITLEMENTS_V2_ENDPOINT_FF } from '@frontegg/rest-api';
+import { USE_ENTITLEMENTS_V2_ENDPOINT_FF } from '@frontegg/rest-api';
 
 import { authStateKey } from '../constants';
-import { useFronteggStore } from '../auth/mapAuthState';
+import { useFeatureFlag } from '../auth/mapAuthState';
 
 /**
  * @returns user state 
@@ -26,9 +26,7 @@ const useGetUserState = () => {
  * @returns true when need to use entitlements V2 API
  */
 const useIsV2API = () => {
-  // TODO: check should it be immediate or we can recursively inject (check when app name change?)
-  const { appName } = useFronteggStore();
-  const [useEntitlementsV2] = FeatureFlags.getFeatureFlags([USE_ENTITLEMENTS_V2_ENDPOINT_FF], appName);
+  const [useEntitlementsV2] = useFeatureFlag([USE_ENTITLEMENTS_V2_ENDPOINT_FF]);
   return useEntitlementsV2;
 };
 
@@ -41,7 +39,7 @@ const useEntitlementsQueryData = (customAttributes?: CustomAttributes) => {
   const entitlements = user?.entitlements;
   const isV2 = useIsV2API();
 
-  const attributes: Attributes | undefined = {
+  const attributes: Attributes = {
     custom: customAttributes,
     jwt: user as JwtAttributes | undefined,
   };

packages/vue/src/auth/mapAuthState.ts

@@ -1,5 +1,6 @@
 // @ts-ignore
 import { inject, onUpdated, onMounted, reactive, onBeforeUnmount, computed } from 'vue';
+import { FeatureFlags } from '@frontegg/rest-api';
 import { defaultGetterGenerator, objectMappers } from '../helpers';
 import {
   AcceptInvitationActions,
@@ -154,6 +155,11 @@ export const useLoadEntitlements = () => {
   return inject(loadEntitlementsKey);
 };
 
+export const useFeatureFlag = (keys: string[]) => {
+  const { appName } = useFronteggStore();
+  return FeatureFlags.getFeatureFlags(keys, appName);
+};
+
 export const useFrontegg = () => {
   const fronteggLoaded = useFronteggLoaded();
   const unsubscribeFronteggStore = useUnsubscribeFronteggStore();