@forge/react 11.9.0-next.1 → 11.9.1-experimental-60ea29e

package/out/hooks/usePermissions.js

@@ -3,29 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.usePermissions = void 0;
 const react_1 = require("react");
 const bridge_1 = require("@forge/bridge");
-const minimatch_1 = require("minimatch");
-/**
- * https://ecosystem-platform.atlassian.net/browse/DEPLOY-1411
- * reuse logic from @forge/api
- */
-/**
- * Resource types that can be loaded externally
- */
-const RESOURCE_TYPES = ['fonts', 'styles', 'frames', 'images', 'media', 'scripts'];
-/**
- * Fetch types for external requests
- */
-const FETCH_TYPES = ['backend', 'client'];
-/**
- * Helper function to check if a URL matches any of the allowed patterns
- * Uses minimatch for robust pattern matching with wildcards
- */
-const matchesAllowedUrl = (url, allowedUrls) => {
-    return allowedUrls.some((allowedUrl) => {
-        // Use minimatch for pattern matching
-        return (0, minimatch_1.minimatch)(url, allowedUrl);
-    });
-};
 /**
  * Hook for checking permissions in Forge apps
  *
@@ -66,6 +43,10 @@ const usePermissions = (requiredPermissions) => {
     const [context, setContext] = (0, react_1.useState)();
     const [isLoading, setIsLoading] = (0, react_1.useState)(true);
     const [error, setError] = (0, react_1.useState)(null);
+    const [permissionResult, setPermissionResult] = (0, react_1.useState)({
+        granted: false,
+        missing: null
+    });
     // Load context on mount
     (0, react_1.useEffect)(() => {
         const loadContext = async () => {
@@ -84,110 +65,37 @@ const usePermissions = (requiredPermissions) => {
         };
         void loadContext();
     }, []);
-    // Permission checking utilities
-    const permissionUtils = (0, react_1.useMemo)(() => {
-        if (!context?.permissions)
-            return null;
-        const { scopes, external = {} } = context.permissions;
-        const scopeArray = Array.isArray(scopes) ? scopes : Object.keys(scopes || {});
-        return {
-            hasScope: (scope) => scopeArray.includes(scope),
-            canFetchFrom: (type, url) => {
-                const fetchUrls = external.fetch?.[type];
-                if (!fetchUrls?.length)
-                    return false;
-                // Extract string URLs from fetch URLs array
-                const allowedUrls = fetchUrls
-                    .map((item) => {
-                    // If item is already a string, use it directly
-                    if (typeof item === 'string') {
-                        return item;
-                    }
-                    // If item has an address property, use that
-                    if ('address' in item && item.address) {
-                        return item.address;
-                    }
-                    // Otherwise, use the remote property (if it exists)
-                    return item.remote;
-                })
-                    .filter((url) => typeof url === 'string');
-                return matchesAllowedUrl(url, allowedUrls);
-            },
-            canLoadResource: (type, url) => {
-                const resourceUrls = external[type];
-                if (!resourceUrls?.length)
-                    return false;
-                const stringUrls = resourceUrls.filter((item) => typeof item === 'string');
-                return matchesAllowedUrl(url, stringUrls);
-            },
-            getScopes: () => scopeArray,
-            getExternalPermissions: () => external,
-            hasAnyPermissions: () => scopeArray.length > 0 || Object.keys(external).length > 0
-        };
-    }, [context?.permissions]);
-    // Check permissions
-    const permissionResult = (0, react_1.useMemo)(() => {
-        if (!requiredPermissions) {
-            return { granted: false, missing: null };
-        }
-        if (!permissionUtils) {
-            // If still loading or there's an error, return null for missing permissions
-            if (isLoading || error) {
-                return { granted: false, missing: null };
-            }
-            throw new Error('This feature is not available yet');
+    // Check permissions using shared utility
+    (0, react_1.useEffect)(() => {
+        // Skip if still loading context
+        if (isLoading) {
+            return;
         }
-        const missing = {};
-        let hasAllRequiredPermissions = true;
-        // Check scopes
-        if (requiredPermissions.scopes?.length) {
-            const missingScopes = requiredPermissions.scopes.filter((scope) => !permissionUtils.hasScope(scope));
-            if (missingScopes.length > 0) {
-                missing.scopes = missingScopes;
-                hasAllRequiredPermissions = false;
+        const checkPerms = async () => {
+            if (!requiredPermissions) {
+                setPermissionResult({ granted: false, missing: null });
+                return;
             }
-        }
-        // Check external permissions
-        if (requiredPermissions.external) {
-            const missingExternal = {};
-            // Check fetch permissions
-            if (requiredPermissions.external.fetch) {
-                const missingFetch = {};
-                FETCH_TYPES.forEach((type) => {
-                    const requiredUrls = requiredPermissions.external?.fetch?.[type];
-                    if (requiredUrls?.length) {
-                        const missingUrls = requiredUrls.filter((url) => !permissionUtils.canFetchFrom(type, url));
-                        if (missingUrls.length > 0) {
-                            missingFetch[type] = missingUrls;
-                            hasAllRequiredPermissions = false;
-                        }
-                    }
-                });
-                if (Object.keys(missingFetch).length > 0) {
-                    missingExternal.fetch = missingFetch;
+            if (!context?.permissions) {
+                // If context loaded but has no permissions, set error
+                if (context !== undefined) {
+                    setError(new Error('This feature is not available yet'));
+                    setPermissionResult({ granted: false, missing: null });
                 }
+                return;
             }
-            // Check resource permissions
-            RESOURCE_TYPES.forEach((type) => {
-                const requiredUrls = requiredPermissions.external?.[type];
-                if (requiredUrls?.length) {
-                    const missingUrls = requiredUrls.filter((url) => !permissionUtils.canLoadResource(type, url));
-                    if (missingUrls.length > 0) {
-                        missingExternal[type] = missingUrls;
-                        hasAllRequiredPermissions = false;
-                    }
-                }
-            });
-            if (Object.keys(missingExternal).length > 0) {
-                missing.external = missingExternal;
+            try {
+                setError(null); // Clear any previous errors
+                const result = await (0, bridge_1.checkPermissions)(requiredPermissions, context.permissions);
+                setPermissionResult(result);
+            }
+            catch (err) {
+                setError(err instanceof Error ? err : new Error('Failed to check permissions'));
+                setPermissionResult({ granted: false, missing: null });
             }
-        }
-        // Note: Content permissions are not supported in the current RuntimePermissions type
-        return {
-            granted: hasAllRequiredPermissions,
-            missing: hasAllRequiredPermissions ? null : missing
         };
-    }, [permissionUtils, requiredPermissions]);
+        void checkPerms();
+    }, [context, requiredPermissions, isLoading]);
     return {
         hasPermission: permissionResult.granted,
         isLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/react",
-  "version": "11.9.0-next.1",
+  "version": "11.9.1-experimental-60ea29e",
   "description": "Forge React reconciler",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -28,12 +28,12 @@
     "@atlaskit/adf-schema": "^48.0.0",
     "@atlaskit/adf-utils": "^19.19.0",
     "@atlaskit/forge-react-types": "^0.48.0",
-    "@forge/bridge": "^5.10.1-next.0",
+    "@forge/bridge": "^5.10.2-experimental-60ea29e",
+    "@forge/egress": "^2.3.1",
     "@forge/i18n": "0.0.7",
     "@types/react": "^18.2.64",
     "@types/react-reconciler": "^0.28.8",
     "lodash": "^4.17.21",
-    "minimatch": "^9.0.5",
     "react": "^18.2.0",
     "react-hook-form": "7.65.0",
     "react-reconciler": "^0.29.0",