@microsoft/power-apps-native-host 0.2.22 → 0.3.0

package/lib/commonjs/provider/PowerAppsHostProvider.js

@@ -9,9 +9,14 @@ var _reactNative = require("react-native");
 var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
 var _setupNativeHost = require("../bridge/setupNativeHost.js");
 var _NativePowerAppsBridge = require("../bridge/NativePowerAppsBridge.js");
-var _useConnectionRefs = require("../platform/useConnectionRefs.js");
+var _useConnectionRefs = require("../connections/useConnectionRefs.js");
+var _DataverseDataSources = require("../platform/DataverseDataSources.js");
 var _PowerPlatformEnvironmentApi = require("../platform/PowerPlatformEnvironmentApi.js");
 var _ConnectionSetupScreen = require("../connections/ConnectionSetupScreen.js");
+var _types = require("../connections/types.js");
+var _PowerPlatformConnectionApi = require("../connections/PowerPlatformConnectionApi.js");
+var _connectionState = require("../connections/connectionState.js");
+var _isDevPlayer = require("../utils/isDevPlayer.js");
 var _logger = require("../logger.js");
 var _index = require("../telemetry/index.js");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -48,6 +53,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 // Entra ID token scope for the APIM connector proxy (API Hub).
 const CONNECTOR_SCOPE = 'https://apihub.azure.com/.default';
 const EMPTY_DATABASE_REFERENCES = {};
+const EMPTY_CONNECTION_REFERENCES = {};
 /**
  * Initialises the NativePowerAppsBridge and manages the full pre-launch
  * pipeline — connection resolution, disambiguation, and creation — before
@@ -58,6 +64,7 @@ const EMPTY_DATABASE_REFERENCES = {};
 function PowerAppsHostProvider({
   acquireToken,
   isSignedIn,
+  onSignOut,
   appId,
   environmentId,
   region = 'prod',
@@ -67,18 +74,75 @@ function PowerAppsHostProvider({
   renderOAuthWebView,
   isvClientId,
   onDisambiguationNeeded,
+  onConnectionConsent,
+  onResourceConsent,
+  onConnectionConsentDeclined,
   children
 }) {
   // Extra refs produced by ConnectionSetupScreen for newly-created connections.
   const [extraConnectionRefs, setExtraConnectionRefs] = (0, _react.useState)({});
-
-  // setupDone is derived — true as soon as extraConnectionRefs is populated.
-  const setupDone = Object.keys(extraConnectionRefs).length > 0;
+  const [consentApproved, setConsentApproved] = (0, _react.useState)(false);
+  const setupDone = consentApproved;
+  const renderConnectionError = (title, messages, useNeutralText = false) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+    style: {
+      flex: 1,
+      padding: 24,
+      justifyContent: 'center',
+      backgroundColor: '#F8F8F8'
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+      style: {
+        fontSize: 20,
+        fontWeight: '700',
+        color: '#1A1A1A',
+        marginBottom: 12
+      },
+      children: title
+    }), messages.map(message => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+      style: {
+        fontSize: 14,
+        color: useNeutralText ? '#323130' : '#C4262E',
+        lineHeight: 20,
+        marginBottom: 8
+      },
+      children: message
+    }, message)), isSignedIn && onSignOut ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+      accessibilityRole: "button",
+      onPress: () => {
+        void onSignOut();
+      },
+      style: {
+        alignSelf: 'flex-start',
+        backgroundColor: '#0F6CBD',
+        paddingHorizontal: 20,
+        paddingVertical: 12,
+        borderRadius: 4,
+        marginTop: 12
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+        style: {
+          color: '#FFFFFF',
+          fontSize: 15,
+          fontWeight: '600'
+        },
+        children: "Sign out"
+      })
+    }) : null]
+  });
   const {
     connectionRefs,
     isReady,
+    error: connectionError,
+    errorKind: connectionErrorKind,
     missingConnectors,
-    dataverseOrgUrl
+    missingConnectionReferences,
+    connectionRequirements,
+    resourceConsents: launchResourceConsents,
+    configurationErrors,
+    requiresConnectionConsent,
+    resolvedConfigKey,
+    dataverseOrgUrl,
+    databaseReferences: resolvedDatabaseReferences
   } = (0, _useConnectionRefs.useConnectionRefs)({
     isSignedIn,
     acquireToken,
@@ -96,39 +160,43 @@ function PowerAppsHostProvider({
     if (!isSignedIn) {
       (0, _logger.debugLog)('[PAHost] user signed out — resetting bridge state');
       setExtraConnectionRefs({});
+      setConsentApproved(false);
     }
   }, [isSignedIn]);
+  (0, _react.useEffect)(() => {
+    setExtraConnectionRefs({});
+    setConsentApproved(false);
+  }, [appId, environmentId, connectionReferences]);
 
   // Merge hook refs with anything the setup screen created.
   const mergedRefs = (0, _react.useMemo)(() => ({
     ...connectionRefs,
     ...extraConnectionRefs
   }), [connectionRefs, extraConnectionRefs]);
-  const staticConnectionRefs = (0, _react.useMemo)(() => (0, _NativePowerAppsBridge.buildConnectionReferences)(connectionReferences), [connectionReferences]);
+  const staticConnectionRefs = (0, _react.useMemo)(() => _isDevPlayer.isDevPlayer ? (0, _NativePowerAppsBridge.buildConnectionReferences)(connectionReferences) : EMPTY_CONNECTION_REFERENCES, [connectionReferences, _isDevPlayer.isDevPlayer]);
 
   // dataverseOrgUrl comes directly from useConnectionRefs (fetched from the
   // environment metadata regardless of whether a commondataserviceforapps
   // connection reference is configured).  This allows Dataverse calls to work
   // even when there is no explicit Dataverse connection in connectionReferences.
-  const cdsDataSources = (0, _react.useMemo)(() => (0, _PowerPlatformEnvironmentApi.buildCdsDataSources)(databaseReferences ?? EMPTY_DATABASE_REFERENCES, dataverseOrgUrl), [databaseReferences, dataverseOrgUrl]);
+  const cdsDataSources = (0, _react.useMemo)(() => (0, _DataverseDataSources.buildCdsDataSources)(_isDevPlayer.isDevPlayer ? databaseReferences ?? EMPTY_DATABASE_REFERENCES : resolvedDatabaseReferences, dataverseOrgUrl), [databaseReferences, resolvedDatabaseReferences, dataverseOrgUrl, _isDevPlayer.isDevPlayer]);
 
   // Build the missing-connector entries for ConnectionSetupScreen.
-  const missingEntries = (0, _react.useMemo)(() => missingConnectors.map(apiId => {
-    const localRefId = Object.keys(connectionReferences).find(k => connectionReferences[k].id === apiId) ?? apiId;
-    return {
-      apiId,
-      localRefId
-    };
-  }), [missingConnectors, connectionReferences]);
+  const missingEntries = (0, _react.useMemo)(() => missingConnectionReferences, [missingConnectionReferences]);
+  const resourceConsents = (0, _react.useMemo)(() => [...new Map(launchResourceConsents.map(resource => [resource.resourceId.toLowerCase(), resource])).values()], [launchResourceConsents]);
+  const currentConfigKey = (0, _react.useMemo)(() => (0, _types.buildConnectionResolutionKey)(appId, environmentId, _isDevPlayer.isDevPlayer ? connectionReferences : {}), [appId, environmentId, connectionReferences, _isDevPlayer.isDevPlayer]);
+  const resolutionMatchesCurrentConfig = resolvedConfigKey === currentConfigKey;
+  const needsConsent = (0, _connectionState.shouldShowConnectionReview)(_isDevPlayer.isDevPlayer, requiresConnectionConsent, resourceConsents.length > 0);
 
   // Called by ConnectionSetupScreen once every missing connector is resolved.
-  const handleSetupComplete = (0, _react.useCallback)(resolvedIds => {
+  const handleSetupComplete = (0, _react.useCallback)(async resolvedIds => {
     const refs = {};
-    for (const [apiId, connectionId] of Object.entries(resolvedIds)) {
-      const localRefId = Object.keys(connectionReferences).find(k => connectionReferences[k].id === apiId);
-      if (!localRefId) continue;
-      const dataSources = connectionReferences[localRefId].dataSources;
-      const runtimeUrl = dataSources.map(ds => schemaMap[ds]?.properties?.primaryRuntimeUrl).find(Boolean) ?? '';
+    for (const [localRefId, connectionId] of Object.entries(resolvedIds)) {
+      const requirement = connectionRequirements.find(item => item.localRefId === localRefId);
+      if (!requirement) continue;
+      const apiId = requirement.apiId;
+      const dataSources = requirement.dataSources;
+      const runtimeUrl = dataSources.map(ds => connectionRefsRef.current[ds]?.runtimeUrl ?? (_isDevPlayer.isDevPlayer ? schemaMap[ds]?.properties?.primaryRuntimeUrl : undefined)).find(Boolean) ?? '';
       for (const ds of dataSources) {
         refs[ds] = {
           apiId,
@@ -142,7 +210,44 @@ function PowerAppsHostProvider({
       }
     }
     setExtraConnectionRefs(refs);
-  }, [connectionReferences, schemaMap]);
+    const mergedForConsent = {
+      ...connectionRefsRef.current,
+      ...refs
+    };
+    const usages = connectionRequirements.map(requirement => ({
+      localRefId: requirement.localRefId,
+      apiId: requirement.apiId,
+      connectionId: requirement.dataSources.map(dataSource => mergedForConsent[dataSource]?.connectionName).find(Boolean) ?? '',
+      dataSources: requirement.dataSources,
+      appActions: requirement.appActions ?? [],
+      apiScopes: requirement.apiScopes
+    }));
+    if (usages.some(usage => !usage.connectionId)) {
+      throw new Error('Not all required connections have been resolved.');
+    }
+    if (!_isDevPlayer.isDevPlayer && resourceConsents.length > 0 && !onResourceConsent) {
+      throw new Error('Protected resource consent requires an onResourceConsent persistence callback.');
+    }
+    const shouldPersistUsages = (0, _connectionState.shouldPersistConnectionUsages)(_isDevPlayer.isDevPlayer, appId);
+    if (shouldPersistUsages && appId && usages.length > 0) {
+      const token = await acquireToken([(0, _PowerPlatformEnvironmentApi.powerPlatformScope)(region)]);
+      if (!token) throw new Error('Unable to acquire a token to register connection usage.');
+      await Promise.all(usages.map(usage => (0, _PowerPlatformConnectionApi.postConnectionUsage)(appId, usage, environmentId, region, token)));
+      await (0, _PowerPlatformConnectionApi.reportScopeConsents)(appId, usages, environmentId, region, token);
+    }
+    if (!_isDevPlayer.isDevPlayer) {
+      await onConnectionConsent?.(usages);
+      await onResourceConsent?.(resourceConsents);
+    }
+    setConsentApproved(true);
+  }, [acquireToken, appId, environmentId, region, schemaMap, connectionRequirements, onConnectionConsent, onResourceConsent, resourceConsents, _isDevPlayer.isDevPlayer]);
+  const consentDetails = (0, _react.useMemo)(() => connectionRequirements.map(requirement => ({
+    localRefId: requirement.localRefId,
+    connectorId: requirement.connectorId,
+    displayName: requirement.displayName ?? requirement.connectorId.replace(/^shared_/, ''),
+    description: `Uses ${requirement.dataSources.join(', ')}`,
+    appActions: requirement.appActions ?? []
+  })), [connectionRequirements]);
 
   // ---- Bridge wiring ----
 
@@ -154,7 +259,7 @@ function PowerAppsHostProvider({
   connectionRefsRef.current = connectionRefs;
   const configuredBridgeInputsRef = (0, _react.useRef)(undefined);
   const [, setBridgeRegistrationVersion] = (0, _react.useState)(0);
-  const hasResolvedConnections = isSignedIn && isReady && (missingConnectors.length === 0 || setupDone);
+  const hasResolvedConnections = isSignedIn && isReady && resolutionMatchesCurrentConfig && (missingConnectors.length === 0 || consentApproved) && (!needsConsent || consentApproved);
   const isBridgeConfiguredFor = (connections, dataSources) => {
     const currentInputs = configuredBridgeInputsRef.current;
     return currentInputs?.connections === connections && currentInputs.dataSources === dataSources;
@@ -254,13 +359,34 @@ function PowerAppsHostProvider({
     }
   }, [isSignedIn, isReady]);
   (0, _react.useEffect)(() => {
-    if (isSignedIn && isReady && missingConnectors.length > 0 && !setupDone) {
+    if (isSignedIn && isReady && (missingConnectors.length > 0 || needsConsent) && !setupDone) {
       (0, _logger.debugLog)(`[PAHost] render: showing ConnectionSetupScreen for ${missingConnectors.length} missing connector(s):`, missingConnectors.join(', '));
     }
-  }, [isSignedIn, isReady, missingConnectors, setupDone]);
+  }, [isSignedIn, isReady, missingConnectors, needsConsent, setupDone]);
 
   // ---- Render ----
 
+  if (connectionError) {
+    const accessDenied = connectionErrorKind === 'app-access-denied';
+    return renderConnectionError(accessDenied ? 'You don’t have access' : 'Unable to load app', [connectionError], accessDenied);
+  }
+  if (configurationErrors.length > 0) {
+    return renderConnectionError('Connection configuration error', configurationErrors);
+  }
+  if (isSignedIn && !resolutionMatchesCurrentConfig) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      style: {
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: '#F8F8F8'
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
+        size: "large"
+      })
+    });
+  }
+
   // First mount: register the native bridge with static manifest refs before
   // any route children can mount and call into @microsoft/power-apps.
   if (!staticBridgeRegistered && !hasResolvedConnections) {
@@ -296,7 +422,7 @@ function PowerAppsHostProvider({
   // Wrapped in SafeAreaProvider so useSafeAreaInsets() works even when the
   // consuming app hasn't mounted its own SafeAreaProvider yet.  Nesting is
   // safe — react-native-safe-area-context treats inner providers as no-ops.
-  if (isSignedIn && isReady && missingConnectors.length > 0 && !setupDone) {
+  if (isSignedIn && isReady && (missingConnectors.length > 0 || needsConsent) && !setupDone) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeSafeAreaContext.SafeAreaProvider, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConnectionSetupScreen.ConnectionSetupScreen, {
         missingConnectors: missingEntries,
@@ -304,8 +430,13 @@ function PowerAppsHostProvider({
         environmentId: environmentId,
         region: region,
         acquireToken: acquireToken,
+        onSignOut: isSignedIn ? onSignOut : undefined,
         isvClientId: isvClientId,
         onAllConnected: handleSetupComplete,
+        consentDetails: consentDetails,
+        resourceConsents: resourceConsents,
+        onConsentDeclined: onConnectionConsentDeclined,
+        showReview: !_isDevPlayer.isDevPlayer,
         renderOAuthWebView: renderOAuthWebView
         // No onSkip — connections are required.
       })

package/lib/commonjs/provider/PowerAppsHostProvider.web.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PowerAppsHostProvider = PowerAppsHostProvider;
+var _react = _interopRequireDefault(require("react"));
+var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
+var _NativePowerAppsBridge = require("../bridge/NativePowerAppsBridge.js");
+var _PowerPagesBridge = require("../bridge/PowerPagesBridge.js");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function PowerAppsHostProvider({
+  connectionReferences,
+  databaseReferences,
+  children
+}) {
+  const isPowerPages = typeof window !== 'undefined' && Boolean(window.Microsoft?.Dynamic365?.Portal?.version);
+  if (isPowerPages) {
+    const connectorRuntimeUrl = window.location.origin;
+    const dataverseRuntimeUrl = `${window.location.origin}/api/data/v9.0/`;
+    const connections = (0, _NativePowerAppsBridge.buildConnectionReferences)(connectionReferences);
+    for (const connection of Object.values(connections)) {
+      connection.runtimeUrl = connectorRuntimeUrl;
+      connection.datasetName = window.location.origin;
+    }
+    const dataSources = Object.values(databaseReferences ?? {}).flatMap(databaseReference => Object.values(databaseReference.dataSources ?? {}).map(dataSource => ({
+      runtimeUrl: dataverseRuntimeUrl,
+      entitySetName: dataSource.entitySetName ?? '',
+      logicalName: dataSource.logicalName ?? '',
+      version: '9.2'
+    })));
+    (0, _PowerPagesBridge.setupPowerPagesHost)({
+      connections,
+      dataSources
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeSafeAreaContext.SafeAreaProvider, {
+    children: children
+  });
+}