Merge branch 'master' into upgrade-admin-portal

CHANGELOG.md

@@ -1,3 +1,34 @@
+# Change Log
+
+## [3.0.23](https://github.com/frontegg/frontegg-vue/compare/v3.0.22...v3.0.23) (2024-3-20)
+
+- FR-15233 - Fix autocomplete popper
+
+
+- FR-13828 - Add option to specify prompt consent from loginDirectAction
+- FR-15315 - Added sort for role selections in Admin Portal 
+
+
+
+## [3.0.22](https://github.com/frontegg/frontegg-vue/compare/v3.0.21...v3.0.22) (2024-3-4)
+
+
+# Change Log
+
+## [3.0.21](https://github.com/frontegg/frontegg-vue/compare/v3.0.20...v3.0.21) (2024-3-3)
+
+- FR-15270 - Added new roles page to the Admin Portal
+- FR-15395 - Fixed tab tenant not cleared after logout
+
+# Change Log
+
+## [3.0.20](https://github.com/frontegg/frontegg-vue/compare/v3.0.19...v3.0.20) (2024-2-28)
+
+- FR-15376 - fixed null group description exception
+- FR-15305 - Fixed changed fields sent on edit group to support SCIM group update
+- FR-15219 - Fixed missing row actions in users table when using MSP
+
+
 # Change Log
 
 ## [3.0.19](https://github.com/frontegg/frontegg-vue/compare/v3.0.18...v3.0.19) (2024-2-8)

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.0.19",
+  "version": "3.0.23",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "publishConfig": {

packages/demo-saas/package.json

@@ -1,14 +1,14 @@
 {
   "name": "vue-demo-saas",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@frontegg/vue": "^3.0.19",
+    "@frontegg/vue": "^3.0.23",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0"
   },

packages/example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-v3",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

packages/nuxt/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/nuxt",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "description": "",
   "main": "lib/module.js",
   "types": "types/index.d.ts",
   "files": [
     "lib"
   ],
   "dependencies": {
-    "@frontegg/vue": "^3.0.19"
+    "@frontegg/vue": "^3.0.23"
   }
 }

packages/sanity-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "frontegg-angular-sanity-check",
   "private": true,
-  "version": "3.0.19",
+  "version": "3.0.23",
   "scripts": {
     "build": "docker-compose build test",
     "build:dev": "docker-compose build test --no-cache",

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/vue",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "description": "",
   "main": "dist/index.ssr.js",
   "browser": "dist/index.js",

packages/vue/src/auth/entitlements.ts

@@ -9,10 +9,7 @@ import {
   AuthState,
 } from '@frontegg/redux-store';
 
-import { USE_ENTITLEMENTS_V2_ENDPOINT_FF } from '@frontegg/rest-api';
-
 import { authStateKey } from '../constants';
-import { useFeatureFlag } from '../auth/mapAuthState';
 
 /**
  * @returns user state 
@@ -22,22 +19,13 @@ const useGetUserState = () => {
   return authState.user;
 };
 
-/**
- * @returns true when need to use entitlements V2 API
- */
-const useIsV2API = () => {
-  const [useEntitlementsV2] = useFeatureFlag([USE_ENTITLEMENTS_V2_ENDPOINT_FF]);
-  return useEntitlementsV2;
-};
-
 /**
  * @param customAttributes consumer attributes
- * @returns is entitled query data including: entitltments state, final attributes (consumer and frontegg) and API version to use
+ * @returns is entitled query data including: entitlements state and final attributes (consumer and frontegg)
  */
 const useEntitlementsQueryData = (customAttributes?: CustomAttributes) => {
   const user = useGetUserState();
   const entitlements = user?.entitlements;
-  const isV2 = useIsV2API();
 
   const attributes: Attributes = {
     custom: customAttributes,
@@ -47,7 +35,6 @@ const useEntitlementsQueryData = (customAttributes?: CustomAttributes) => {
   return {
     entitlements,
     attributes,
-    isV2
   };
 };
 
@@ -59,8 +46,8 @@ const useEntitlementsQueryData = (customAttributes?: CustomAttributes) => {
 */
 export const useFeatureEntitlements = (key: string, customAttributes?: CustomAttributes): ComputedRef<Entitlement> => {
   return computed(() => {
-    const { entitlements, attributes, isV2 } = useEntitlementsQueryData(customAttributes);
-    return getFeatureEntitlements(entitlements, key, attributes, isV2)
+    const { entitlements, attributes } = useEntitlementsQueryData(customAttributes);
+    return getFeatureEntitlements(entitlements, key, attributes, true)
   });
 };
 
@@ -72,8 +59,8 @@ export const useFeatureEntitlements = (key: string, customAttributes?: CustomAtt
 */    
 export const usePermissionEntitlements = (key: string, customAttributes?: CustomAttributes): ComputedRef<Entitlement> => {
   return computed(() => {
-    const { entitlements, attributes, isV2 } = useEntitlementsQueryData(customAttributes);
-    return getPermissionEntitlements(entitlements, key, attributes, isV2)
+    const { entitlements, attributes } = useEntitlementsQueryData(customAttributes);
+    return getPermissionEntitlements(entitlements, key, attributes, true)
   });
 };
 
@@ -85,7 +72,7 @@ export const usePermissionEntitlements = (key: string, customAttributes?: Custom
 */
 export const useEntitlements = (entitledToOptions: EntitledToOptions, customAttributes?: CustomAttributes): ComputedRef<Entitlement> => {
   return computed(() => {
-    const { entitlements, attributes, isV2 } = useEntitlementsQueryData(customAttributes);
-    return getEntitlements(entitlements as any, entitledToOptions, attributes, isV2)
+    const { entitlements, attributes } = useEntitlementsQueryData(customAttributes);
+    return getEntitlements(entitlements, entitledToOptions, attributes, true)
   });
 };

packages/vue/src/helpers.ts

@@ -8,7 +8,7 @@ import { StoreHolder } from './StoreHolder';
 import * as Vue from 'vue';
 
 export const setupOnRedirectTo = (router: VueRouter, routes?: Partial<AuthPageRoutes>) => {
-  const baseName = router.options.base || '';
+  const baseName = getRouterBaseName(router) || '';
   StoreHolder.setBasename(baseName);
   const onRedirectTo = (_path: string, opts?: RedirectOptions) => {
     let path = _path;
@@ -109,3 +109,13 @@ export const simpleMappers = (subState: string, props: any, getter: any) => func
 
   return slices.reduce((result, prop) => Object.assign({}, result, { [prop]: getter(prop)(state) }), {});
 };
+
+
+/**
+ * vue-router base name was changed in v4 from `base` to `history.base`
+ * @param router VueRouter v3 or v4
+ * @returns router base name
+ */
+export const getRouterBaseName = (router?: VueRouter): string | undefined => {
+  return router?.options.base ?? (router?.options as any).history?.base
+}

packages/vue/src/index.ts

@@ -2,7 +2,7 @@
 import _Vue, { PluginObject, reactive, ref } from 'vue';
 import { PluginOptions } from './interfaces';
 import { User } from '@frontegg/redux-store';
-import { setupOnRedirectTo, syncStateWithComponent } from './helpers';
+import { getRouterBaseName, setupOnRedirectTo, syncStateWithComponent } from './helpers';
 import {
   getStoreBinding,
   loadingUnsubscribe,
@@ -105,7 +105,7 @@ const Frontegg: PluginObject<PluginOptions> | any = {
     fronteggApp = initialize({
       ...rest,
       onRedirectTo,
-      basename: router?.options.base,
+      basename: getRouterBaseName(router),
     } as any);
 
     const store = fronteggApp.store;

packages/vue/src/sdkVersion.ts

@@ -1 +1 @@
-export default { version: '3.0.19' };
+export default { version: '3.0.23' };