@microsoft/power-apps-native-host 0.3.3 → 0.5.1

package/lib/module/platform/GlobalDiscovery.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { canonicalizeDataverseOrigin } from "./CanvasAppResolution.js";
 const GLOBAL_DISCOVERY_HOST = {
   prod: 'globaldisco.crm.dynamics.com',
   gcc: 'globaldisco.crm9.dynamics.com',
@@ -22,6 +23,35 @@ const REGION_DISCOVERY_CLOUD = {
   mooncake: 'china'
 };
 const ENVIRONMENT_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export function isEnabledDiscoveryState(state) {
+  return state === 0 || typeof state === 'string' && (state === '0' || state.toLowerCase() === 'enabled');
+}
+export function parseDiscoveredEnvironments(instances, tenantId, appDisplayName, appName) {
+  const normalizedTenantId = tenantId.trim().toLowerCase();
+  const environments = new Map();
+  for (const instance of instances) {
+    if (!isEnabledDiscoveryState(instance.State) || typeof instance.EnvironmentId !== 'string' || !ENVIRONMENT_ID_PATTERN.test(instance.EnvironmentId) || typeof instance.TenantId !== 'string' || instance.TenantId.toLowerCase() !== normalizedTenantId || typeof instance.ApiUrl !== 'string') continue;
+    const environmentId = instance.EnvironmentId.toLowerCase();
+    try {
+      const dataverseApiUrl = canonicalizeDataverseOrigin(instance.ApiUrl);
+      if (environments.has(environmentId)) continue;
+      environments.set(environmentId, {
+        id: environmentId,
+        label: typeof instance.FriendlyName === 'string' && instance.FriendlyName.trim() ? instance.FriendlyName.trim() : environmentId,
+        tenantId: normalizedTenantId,
+        environmentId,
+        appDisplayName,
+        appName,
+        region: 'prod',
+        cloud: 'commercial',
+        dataverseApiUrl
+      });
+    } catch {
+      // Ignore records with untrusted or malformed API origins.
+    }
+  }
+  return [...environments.values()].sort((left, right) => left.label.localeCompare(right.label));
+}
 export function globalDiscoveryEndpoint(region) {
   const cloud = REGION_DISCOVERY_CLOUD[region];
   if (!cloud) {
@@ -38,8 +68,14 @@ export function buildGlobalDiscoveryUrl(environmentId, region) {
   }
   const normalizedEnvironmentId = environmentId.toLowerCase();
   const query = new URLSearchParams({
-    '$select': 'ApiUrl,EnvironmentId',
+    '$select': 'ApiUrl,EnvironmentId,Region',
     '$filter': `EnvironmentId eq '${normalizedEnvironmentId}'`
   });
   return `${globalDiscoveryEndpoint(region)}/api/discovery/v2.0/Instances?${query.toString()}`;
+}
+export function buildGlobalDiscoveryListUrl(region) {
+  const query = new URLSearchParams({
+    '$select': 'ApiUrl,EnvironmentId,FriendlyName,Region,State,TenantId'
+  });
+  return `${globalDiscoveryEndpoint(region)}/api/discovery/v2.0/Instances?${query.toString()}`;
 }

package/lib/module/provider/PowerAppsHostProvider.js

@@ -44,6 +44,7 @@ import { shouldPersistConnectionUsages, shouldShowConnectionReview } from "../co
 import { isDevPlayer } from "../utils/isDevPlayer.js";
 import { debugLog } from "../logger.js";
 import { getAppLogger, HostOperationNames } from "../telemetry/index.js";
+import { areDataverseOriginAliases } from "../platform/CanvasAppResolution.js";
 
 // Entra ID token scope for the APIM connector proxy (API Hub).
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -69,6 +70,12 @@ export function PowerAppsHostProvider({
   databaseReferences,
   renderOAuthWebView,
   isvClientId,
+  onTelemetryLocationResolved,
+  targetGeneration,
+  targetTenantId,
+  targetAppName,
+  targetAccountIdentifier,
+  expectedDataverseOrigin,
   onDisambiguationNeeded,
   onConnectionConsent,
   onResourceConsent,
@@ -149,7 +156,14 @@ export function PowerAppsHostProvider({
     hasDataverse: hasDataverseDatabaseReferences(databaseReferences),
     schemaMap,
     onDisambiguationNeeded,
-    isvClientId
+    isvClientId,
+    onTelemetryLocationResolved,
+    targetIdentity: targetGeneration !== undefined && targetTenantId && targetAppName && targetAccountIdentifier ? {
+      tenantId: targetTenantId,
+      appName: targetAppName,
+      generation: targetGeneration,
+      accountIdentifier: targetAccountIdentifier
+    } : undefined
   });
 
   // Reset setup gate when the user signs out.
@@ -181,8 +195,24 @@ export function PowerAppsHostProvider({
   // Build the missing-connector entries for ConnectionSetupScreen.
   const missingEntries = useMemo(() => missingConnectionReferences, [missingConnectionReferences]);
   const resourceConsents = useMemo(() => [...new Map(launchResourceConsents.map(resource => [resource.resourceId.toLowerCase(), resource])).values()], [launchResourceConsents]);
-  const currentConfigKey = useMemo(() => buildConnectionResolutionKey(appId, environmentId, isDevPlayer ? connectionReferences : {}), [appId, environmentId, connectionReferences, isDevPlayer]);
+  const currentConfigKey = useMemo(() => buildConnectionResolutionKey(appId, environmentId, isDevPlayer ? connectionReferences : {}, targetGeneration !== undefined ? {
+    tenantId: targetTenantId,
+    appName: targetAppName,
+    region,
+    generation: targetGeneration,
+    accountIdentifier: targetAccountIdentifier
+  } : undefined), [appId, environmentId, connectionReferences, isDevPlayer, region, targetAccountIdentifier, targetAppName, targetGeneration, targetTenantId]);
   const resolutionMatchesCurrentConfig = resolvedConfigKey === currentConfigKey;
+  const launchTargetMismatch = (() => {
+    if (!expectedDataverseOrigin) return false;
+    if (!isReady || !resolutionMatchesCurrentConfig) return false;
+    if (!dataverseOrgUrl) return true;
+    try {
+      return !areDataverseOriginAliases(expectedDataverseOrigin, dataverseOrgUrl);
+    } catch {
+      return true;
+    }
+  })();
   const needsConsent = shouldShowConnectionReview(isDevPlayer, requiresConnectionConsent, resourceConsents.length > 0);
 
   // Called by ConnectionSetupScreen once every missing connector is resolved.
@@ -256,17 +286,21 @@ export function PowerAppsHostProvider({
   connectionRefsRef.current = connectionRefs;
   const configuredBridgeInputsRef = useRef(undefined);
   const [, setBridgeRegistrationVersion] = useState(0);
-  const hasResolvedConnections = isSignedIn && isReady && resolutionMatchesCurrentConfig && (missingConnectors.length === 0 || consentApproved) && (!needsConsent || consentApproved);
+  const hasResolvedConnections = isSignedIn && isReady && resolutionMatchesCurrentConfig && !launchTargetMismatch && (missingConnectors.length === 0 || consentApproved) && (!needsConsent || consentApproved);
   const isBridgeConfiguredFor = (connections, dataSources) => {
     const currentInputs = configuredBridgeInputsRef.current;
-    return currentInputs?.connections === connections && currentInputs.dataSources === dataSources;
+    const runtimeIdentity = targetGeneration === undefined ? undefined : `${targetGeneration}:${targetAccountIdentifier ?? ''}`;
+    return currentInputs?.connections === connections && currentInputs.dataSources === dataSources && currentInputs.runtimeIdentity === runtimeIdentity;
   };
   const configureBridgeNow = useCallback((connections, dataSources) => {
     const previousInputs = configuredBridgeInputsRef.current;
-    const shouldConfigureBridge = !previousInputs || previousInputs.connections !== connections || previousInputs.dataSources !== dataSources;
+    const runtimeIdentity = targetGeneration === undefined ? undefined : `${targetGeneration}:${targetAccountIdentifier ?? ''}`;
+    const shouldConfigureBridge = !previousInputs || previousInputs.connections !== connections || previousInputs.dataSources !== dataSources || previousInputs.runtimeIdentity !== runtimeIdentity;
     if (!shouldConfigureBridge) return;
     debugLog(`[PAHost] setupNativeHost: isReady=${isReady} missingConnectors=${missingConnectors.length} setupDone=${setupDone} connections=${Object.keys(connections).join(', ') || '(none)'}`);
     setupNativeHost({
+      targetGeneration,
+      runtimeIdentity,
       getConnectorToken: async _apiId => {
         debugLog(`[PAHost] getConnectorToken: acquiring token for apiId="${_apiId}"`);
         let token;
@@ -323,11 +357,12 @@ export function PowerAppsHostProvider({
     });
     configuredBridgeInputsRef.current = {
       connections,
-      dataSources
+      dataSources,
+      runtimeIdentity
     };
     setBridgeRegistrationVersion(version => version + 1);
     debugLog('[PAHost] bridge registered');
-  }, [isReady, missingConnectors.length, setupDone]);
+  }, [isReady, missingConnectors.length, setupDone, targetAccountIdentifier, targetGeneration]);
   const staticBridgeRegistered = isBridgeConfiguredFor(staticConnectionRefs, cdsDataSources);
   const resolvedBridgeRegistered = hasResolvedConnections && isBridgeConfiguredFor(mergedRefs, cdsDataSources);
 
@@ -365,7 +400,11 @@ export function PowerAppsHostProvider({
 
   if (connectionError) {
     const accessDenied = connectionErrorKind === 'app-access-denied';
-    return renderConnectionError(accessDenied ? 'You don’t have access' : 'Unable to load app', [connectionError], accessDenied);
+    const appNotFound = connectionErrorKind === 'app-not-found';
+    return renderConnectionError(accessDenied ? 'You don’t have access' : appNotFound ? 'App not found' : 'Unable to load app', [connectionError], accessDenied);
+  }
+  if (launchTargetMismatch) {
+    return renderConnectionError('Environment mismatch', ['The app launch response does not match the selected environment. Return to environment selection and try again.']);
   }
   if (configurationErrors.length > 0) {
     return renderConnectionError('Connection configuration error', configurationErrors);

package/lib/module/provider/PowerAppsProvider.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { areDataverseOriginAliases } from "../platform/CanvasAppResolution.js";
 /*!
  * power-apps-native-host — PowerAppsProvider
  *
@@ -27,7 +28,7 @@
  *   </PowerAppsProvider>
  */
 
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { AppState, Platform, ScrollView, StyleSheet, Text } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { createTamagui, TamaguiProvider } from '@tamagui/core';
@@ -38,24 +39,29 @@ import { QueryClientProvider, focusManager, onlineManager } from '@tanstack/reac
 import NetInfo from '@react-native-community/netinfo';
 import { AuthProvider, useAuth } from '../auth/AuthContext';
 import { PowerAppsHostProvider } from './PowerAppsHostProvider';
-import { powerPlatformScope } from "../platform/PowerPlatformEnvironmentApi.js";
+import { connectionUserConsentScope, powerPlatformScope } from "../platform/PowerPlatformEnvironmentApi.js";
 import { ThemeProvider } from "../theme/ThemeProvider.js";
 import { ErrorBoundary } from "../ErrorBoundary.js";
 import { isDevPlayer } from "../utils/isDevPlayer.js";
 import * as Application from 'expo-application';
 import Constants from 'expo-constants';
-import { ApplicationInsightsTelemetryProvider, configureAppLogger, configureCustomerTelemetryLogger, getAppLogger, Logger, OneDsTelemetryProvider, resolveDeviceId, resolveTelemetryLocation, regionToClusterCategory, suppressKnownWarnings } from '@microsoft/power-apps-native-common';
+import { ApplicationInsightsTelemetryProvider, configureAppLogger, configureCustomEventsLogger, getAppLogger, Logger, OneDsTelemetryProvider, resolveDeviceId, regionToClusterCategory, suppressKnownWarnings } from '@microsoft/power-apps-native-common';
 suppressKnownWarnings();
 import { createHostQueryClient } from "../offline/createOfflineHostActivationCallbacks.js";
 import { useOfflineIntegrationWithStartupGate } from '../offline/useOfflineIntegrationWithStartupGate';
 import { SessionDetailsGesture } from "./SessionDetailsGesture.js";
 import { configureOfflineSdkTelemetry } from '../telemetry/OfflineSdkTelemetry';
-
+import { invalidateNativeHostRuntime } from "../bridge/setupNativeHost.js";
+import { TargetRuntimeError } from "../target/errors.js";
+import { globalDiscoveryScope } from "../platform/GlobalDiscovery.js";
+import { resolveMultiTenantConfig, resolveTenantMode } from "../config/tenantMode.js";
+import { assertNativeTenantMode } from '../config/runtimeTenantMode';
+import { PowerAppsTargetBootstrap } from "../target/PowerAppsTargetBootstrap.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // ---- React-Query wiring (runs once at module load) ----
 
 // Wire onlineManager to NetInfo so refetchOnReconnect fires on mobile
 // (the default browser-event-based detection is a no-op in React Native).
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 onlineManager.setEventListener(setOnline => {
   if (Platform.OS === 'web' && typeof window !== 'undefined') {
     const updateOnlineState = () => setOnline(window.navigator.onLine);
@@ -84,6 +90,7 @@ focusManager.setEventListener(handleFocus => {
 // The bare @tamagui/config/v5 preset is only a last-resort fallback for tests
 // and storybook — it will not resolve custom $surface* tokens.
 const defaultTamaguiConfig = createTamagui(tamaguiDefaultConfig);
+const EMPTY_TARGET_CONNECTION_REFERENCES = {};
 function hasConfiguredValue(value) {
   return typeof value === 'string' && value.trim().length > 0;
 }
@@ -164,6 +171,65 @@ function readAppInsightsConfig(value) {
 // Separate from PowerAppsProvider only because useAuth() must be called inside
 // AuthProvider. All auth-dependent wiring lives here.
 
+function TargetInnerProviders({
+  target,
+  authSession,
+  connectionReferences,
+  databaseReferences,
+  schemaMap,
+  renderOAuthWebView,
+  onDisambiguationNeeded,
+  onConnectionConsent,
+  onResourceConsent,
+  onConnectionConsentDeclined,
+  children
+}) {
+  if (authSession.accountTenantId.toLowerCase() !== target.tenantId.toLowerCase()) {
+    throw new TargetRuntimeError('tenant-mismatch', 'authentication', true, 'Sign in with an account that can access the selected environment tenant.', target.id);
+  }
+  const acquireToken = async scopes => {
+    if (scopes.length !== 1) throw new Error('Target token requests must use one audience');
+    const scope = scopes[0];
+    if (scope === 'https://apihub.azure.com/.default') return authSession.tokenBroker.acquireApiHubToken();
+    if (scope === powerPlatformScope(target.region)) return authSession.tokenBroker.acquirePowerPlatformToken(target.region);
+    if (scope === connectionUserConsentScope(target.region)) return authSession.tokenBroker.acquireConnectionUserConsentToken(target.region);
+    if (scope === globalDiscoveryScope(target.region)) return authSession.tokenBroker.acquireGlobalDiscoveryToken();
+    const dataverseSuffix = ['/user_impersonation', '/.default'].find(suffix => scope.endsWith(suffix));
+    if (dataverseSuffix) {
+      const requestedOrigin = scope.slice(0, -dataverseSuffix.length);
+      if (areDataverseOriginAliases(requestedOrigin, target.dataverseApiUrl)) {
+        return authSession.tokenBroker.acquireDataverseToken(requestedOrigin);
+      }
+    }
+    throw new Error(`Unsupported target token audience: ${scope}`);
+  };
+  useEffect(() => {
+    return () => invalidateNativeHostRuntime();
+  }, [authSession.accountIdentifier, authSession.generation]);
+  return /*#__PURE__*/_jsx(PowerAppsHostProvider, {
+    acquireToken: acquireToken,
+    isSignedIn: true,
+    onSignOut: authSession.signOut,
+    appId: target.appId,
+    environmentId: target.environmentId,
+    region: target.region,
+    connectionReferences: connectionReferences,
+    schemaMap: schemaMap,
+    databaseReferences: databaseReferences,
+    isvClientId: authSession.clientId,
+    targetGeneration: authSession.generation,
+    targetTenantId: target.tenantId,
+    targetAppName: target.appName,
+    targetAccountIdentifier: authSession.accountIdentifier,
+    expectedDataverseOrigin: target.dataverseApiUrl,
+    renderOAuthWebView: renderOAuthWebView,
+    onDisambiguationNeeded: onDisambiguationNeeded,
+    onConnectionConsent: onConnectionConsent,
+    onResourceConsent: onResourceConsent,
+    onConnectionConsentDeclined: onConnectionConsentDeclined,
+    children: children
+  });
+}
 function InnerProviders({
   msalConfig,
   powerConfig,
@@ -175,6 +241,7 @@ function InnerProviders({
   onConnectionConsentDeclined,
   offlineProfile,
   onOfflineEnabledChange,
+  onTelemetryLocationResolved,
   children
 }) {
   const {
@@ -212,6 +279,7 @@ function InnerProviders({
     onConnectionConsent: onConnectionConsent,
     onResourceConsent: onResourceConsent,
     onConnectionConsentDeclined: onConnectionConsentDeclined,
+    onTelemetryLocationResolved: onTelemetryLocationResolved,
     children: [offline.shouldMountChildren && children, offline.StatusOverlay && /*#__PURE__*/_jsx(offline.StatusOverlay, {})]
   });
 }
@@ -227,9 +295,70 @@ function InnerProviders({
  * root layout.
  */
 export function PowerAppsProvider({
+  ...props
+}) {
+  const {
+    appConfig,
+    msalConfig,
+    intuneConfig,
+    powerConfig,
+    schemaMap,
+    offlineProfile,
+    multiTenantExperience,
+    children,
+    ...commonProps
+  } = props;
+  const effectiveAppConfig = appConfig ?? {
+    expo: Constants.expoConfig
+  };
+  const tenantMode = resolveTenantMode(effectiveAppConfig);
+  assertNativeTenantMode(tenantMode);
+  if (tenantMode === 'multi') {
+    const multiTenantConfig = resolveMultiTenantConfig(effectiveAppConfig);
+    return /*#__PURE__*/_jsx(PowerAppsTargetBootstrap, {
+      msalConfig: msalConfig,
+      appDisplayName: multiTenantConfig.appDisplayName,
+      appName: multiTenantConfig.appName,
+      tenantPolicy: multiTenantConfig.tenantPolicy,
+      experienceComponent: multiTenantExperience,
+      children: (resolvedTarget, authSession) => /*#__PURE__*/_jsx(PowerAppsRuntimeProvider, {
+        ...commonProps,
+        appName: commonProps.appName ?? multiTenantConfig.appDisplayName,
+        appConfig: appConfig,
+        resolvedTarget: resolvedTarget,
+        authSession: authSession,
+        targetGeneration: authSession.generation,
+        powerConfig: {
+          appId: resolvedTarget.appId,
+          environmentId: resolvedTarget.environmentId,
+          region: resolvedTarget.region,
+          geoRegion: powerConfig.geoRegion,
+          connectionReferences: isDevPlayer ? powerConfig.connectionReferences ?? {} : {},
+          databaseReferences: isDevPlayer ? powerConfig.databaseReferences ?? {} : {}
+        },
+        schemaMap: isDevPlayer ? schemaMap : {},
+        children: children
+      })
+    });
+  }
+  return /*#__PURE__*/_jsx(PowerAppsRuntimeProvider, {
+    ...commonProps,
+    appConfig: appConfig,
+    msalConfig: msalConfig,
+    intuneConfig: intuneConfig,
+    powerConfig: powerConfig,
+    schemaMap: schemaMap,
+    offlineProfile: offlineProfile,
+    children: children
+  });
+}
+function PowerAppsRuntimeProvider({
   appConfig,
   msalConfig,
   intuneConfig,
+  resolvedTarget,
+  authSession,
+  targetGeneration,
   powerConfig,
   schemaMap,
   tamaguiConfig = defaultTamaguiConfig,
@@ -251,13 +380,31 @@ export function PowerAppsProvider({
   offlineProfile,
   children
 }) {
+  const targetAware = resolvedTarget !== undefined;
+  if (targetAware) {
+    if (!authSession || targetGeneration !== authSession.generation) {
+      throw new TargetRuntimeError('stale-operation', 'switching', false, 'The selected environment changed.');
+    }
+    if (offlineProfile) {
+      throw new TargetRuntimeError('offline-switch-unsupported', 'configuration', false, 'Offline mode is not available when switching environments.', resolvedTarget.id);
+    }
+    if (powerConfig.appId && powerConfig.appId.toLowerCase() !== resolvedTarget.appId.toLowerCase() || powerConfig.environmentId && powerConfig.environmentId.toLowerCase() !== resolvedTarget.environmentId.toLowerCase() || powerConfig.region && powerConfig.region.toLowerCase() !== resolvedTarget.region.toLowerCase()) {
+      throw new TargetRuntimeError('invalid-build-config', 'configuration', false, 'The selected environment does not match the packaged app configuration.', resolvedTarget.id);
+    }
+  }
   // Capture the logger-prop identity at mount time so the effect dep array
   // is stable (loggerProp is an object reference; re-running on every render
   // would reconfigure and leak the previous provider).
   const loggerPropRef = useRef(loggerProp);
   const appInsightsConfigRef = useRef(appInsightsConfig ?? readAppInsightsConfig(appConfig?.expo?.extra?.appInsightsConfig ?? Constants.expoConfig?.extra?.appInsightsConfig));
   const [offlineTelemetryEnabled, setOfflineTelemetryEnabled] = useState();
-  const missingClientIdInDevPlayer = Platform.OS !== 'web' && isDevPlayer && !hasConfiguredValue(msalConfig.clientId) && requiresPowerPlatformAuth(powerConfig);
+  const oneDsProviderRef = useRef(undefined);
+  const resolvedTelemetryLocationRef = useRef(undefined);
+  const handleTelemetryLocationResolved = useCallback(location => {
+    resolvedTelemetryLocationRef.current = location;
+    void oneDsProviderRef.current?.resolveTelemetryLocation(location);
+  }, []);
+  const missingClientIdInDevPlayer = !targetAware && Platform.OS !== 'web' && isDevPlayer && !hasConfiguredValue(msalConfig?.clientId) && requiresPowerPlatformAuth(powerConfig);
   const missingAppId = Platform.OS !== 'web' && !isDevPlayer && !hasConfiguredValue(powerConfig.appId);
   const missingEnvironmentId = !isDevPlayer && !hasConfiguredValue(powerConfig.environmentId);
   const appId = typeof powerConfig.appId === 'string' ? powerConfig.appId.trim() : '';
@@ -267,7 +414,7 @@ export function PowerAppsProvider({
   const skillCorrelationId = typeof appInstanceId === 'string' ? appInstanceId.trim() : '';
   const sessionDetailsGestureEnabled = showSessionDetailsOnLongPress ?? showSessionDetailsOnSwipe ?? true;
   const requiredAuthScopes = useMemo(() => [powerPlatformScope(powerConfig.region ?? 'prod')], [powerConfig.region]);
-  const queryClient = useMemo(() => createHostQueryClient(), []);
+  const queryClient = useMemo(() => createHostQueryClient(), [targetGeneration, authSession?.accountIdentifier]);
 
   // Configure the app logger exactly once per mount inside useEffect so that
   // side effects (provider construction, async resolveDeviceId) never run
@@ -275,9 +422,9 @@ export function PowerAppsProvider({
   // silent no-op Logger, so any telemetry emitted before the first commit is
   // silently dropped rather than crashing.
   useEffect(() => {
-    // Customer telemetry is a no-op until a valid Application Insights
+    // Custom events are a no-op until a valid Application Insights
     // provider is configured below.
-    configureCustomerTelemetryLogger(new Logger());
+    configureCustomEventsLogger(new Logger());
     const lp = loggerPropRef.current;
     if (lp === null) {
       // Explicit opt-out — replace with a silent no-op Logger.
@@ -293,7 +440,9 @@ export function PowerAppsProvider({
         clientType: appName ?? 'PowerAppsNative',
         appVersion: Constants.expoConfig?.version,
         minSeverity: __DEV__ ? 'verbose' : 'info',
-        telemetryLocation: resolveTelemetryLocation(powerConfig.geoRegion),
+        // Existing host inputs and API responses do not expose authoritative
+        // geography for every app. Keep public-cloud telemetry in EU rather
+        // than infer residency from an opaque ID or a service endpoint URL.
         commonProperties: {
           ...(appId ? {
             appId
@@ -307,10 +456,14 @@ export function PowerAppsProvider({
         }
       };
       const configureDefaultLogger = (deviceId = 'react-native') => {
+        const resolvedTelemetryLocation = resolvedTelemetryLocationRef.current;
         const oneDsProvider = new OneDsTelemetryProvider({
           ...providerConfig,
-          deviceId
+          deviceId,
+          telemetryLocation: resolvedTelemetryLocation ?? 'eu',
+          anonymous: !resolvedTelemetryLocation
         });
+        oneDsProviderRef.current = oneDsProvider;
         const providers = [oneDsProvider];
         let appInsightsEnabled = false;
         const configuredAppInsights = appInsightsConfigRef.current;
@@ -323,7 +476,7 @@ export function PowerAppsProvider({
               sessionId: oneDsProvider.sessionId
             });
             providers.push(customerProvider);
-            configureCustomerTelemetryLogger(new Logger({
+            configureCustomEventsLogger(new Logger({
               providers: [customerProvider]
             }));
             appInsightsEnabled = true;
@@ -393,7 +546,19 @@ export function PowerAppsProvider({
                 appVersion: Constants.expoConfig?.version,
                 children: /*#__PURE__*/_jsx(QueryClientProvider, {
                   client: queryClient,
-                  children: missingAppId ? /*#__PURE__*/_jsx(MissingAppIdErrorScreen, {}) : missingEnvironmentId ? /*#__PURE__*/_jsx(MissingEnvironmentIdErrorScreen, {}) : missingClientIdInDevPlayer ? /*#__PURE__*/_jsx(MissingClientIdErrorScreen, {}) : /*#__PURE__*/_jsx(AuthProvider, {
+                  children: missingAppId ? /*#__PURE__*/_jsx(MissingAppIdErrorScreen, {}) : missingEnvironmentId ? /*#__PURE__*/_jsx(MissingEnvironmentIdErrorScreen, {}) : missingClientIdInDevPlayer ? /*#__PURE__*/_jsx(MissingClientIdErrorScreen, {}) : targetAware && authSession ? /*#__PURE__*/_jsx(TargetInnerProviders, {
+                    target: resolvedTarget,
+                    authSession: authSession,
+                    connectionReferences: powerConfig.connectionReferences ?? EMPTY_TARGET_CONNECTION_REFERENCES,
+                    databaseReferences: powerConfig.databaseReferences,
+                    schemaMap: schemaMap,
+                    renderOAuthWebView: renderOAuthWebView,
+                    onDisambiguationNeeded: onDisambiguationNeeded,
+                    onConnectionConsent: onConnectionConsent,
+                    onResourceConsent: onResourceConsent,
+                    onConnectionConsentDeclined: onConnectionConsentDeclined,
+                    children: children
+                  }) : /*#__PURE__*/_jsx(AuthProvider, {
                     msalConfig: msalConfig,
                     intuneConfig: intuneConfig,
                     requiredScopes: requiredAuthScopes,
@@ -408,6 +573,7 @@ export function PowerAppsProvider({
                       onConnectionConsentDeclined: onConnectionConsentDeclined,
                       offlineProfile: offlineProfile,
                       onOfflineEnabledChange: setOfflineTelemetryEnabled,
+                      onTelemetryLocationResolved: handleTelemetryLocationResolved,
                       children: children
                     })
                   })