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

package/lib/commonjs/platform/DataverseGlobalDiscoveryApi.js

@@ -5,8 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.fetchInstanceUrl = fetchInstanceUrl;
 var _http = require("@microsoft/power-apps-native-common/http");
+var SecureStore = _interopRequireWildcard(require("expo-secure-store"));
 var _index = require("../telemetry/index.js");
 var _GlobalDiscovery = require("./GlobalDiscovery.js");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const INSTANCE_URL_CACHE_KEY_PREFIX = 'microsoft.power-apps-native-host.instance-url.v1';
+const INSTANCE_URL_CACHE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
+function getInstanceUrlCacheKey(environmentId, region) {
+  return `${INSTANCE_URL_CACHE_KEY_PREFIX}.${region.toLowerCase()}.${environmentId.toLowerCase()}`;
+}
+async function getCachedInstanceUrl(environmentId, region) {
+  try {
+    const cachedValue = await SecureStore.getItemAsync(getInstanceUrlCacheKey(environmentId, region));
+    if (!cachedValue) {
+      return null;
+    }
+    const entry = JSON.parse(cachedValue);
+    if (typeof entry.instanceUrl !== 'string' || typeof entry.expiresAt !== 'number' || entry.expiresAt <= Date.now()) {
+      return null;
+    }
+    return entry.instanceUrl;
+  } catch {
+    return null;
+  }
+}
+async function cacheInstanceUrl(environmentId, region, instanceUrl) {
+  try {
+    const entry = {
+      instanceUrl,
+      expiresAt: Date.now() + INSTANCE_URL_CACHE_TTL_MS
+    };
+    await SecureStore.setItemAsync(getInstanceUrlCacheKey(environmentId, region), JSON.stringify(entry));
+  } catch {
+    // SecureStore may be unavailable (for example, on web); discovery still succeeds.
+  }
+}
 function getSafeErrorName(error) {
   return error instanceof Error ? error.constructor.name : typeof error;
 }
@@ -18,6 +51,14 @@ async function fetchInstanceUrl(environmentId, region, acquireToken, _bearerToke
     region
   });
   try {
+    const cachedInstanceUrl = await getCachedInstanceUrl(environmentId, region);
+    if (cachedInstanceUrl) {
+      scenario.complete({
+        hasInstanceUrl: true,
+        cacheHit: true
+      });
+      return cachedInstanceUrl;
+    }
     const url = (0, _GlobalDiscovery.buildGlobalDiscoveryUrl)(environmentId, region);
     const token = await acquireToken([(0, _GlobalDiscovery.globalDiscoveryScope)(region)]);
     if (!token) {
@@ -35,8 +76,12 @@ async function fetchInstanceUrl(environmentId, region, acquireToken, _bearerToke
     }
     const result = await response.json();
     const instanceUrl = result.value?.find(instance => instance.EnvironmentId?.toLowerCase() === environmentId.toLowerCase())?.ApiUrl;
+    if (instanceUrl) {
+      await cacheInstanceUrl(environmentId, region, instanceUrl);
+    }
     scenario.complete({
       hasInstanceUrl: instanceUrl !== undefined,
+      cacheHit: false,
       ...(0, _http.getHttpCorrelationProperties)(response.headers)
     });
     return instanceUrl;

package/lib/commonjs/provider/PowerAppsHostProvider.js

@@ -150,6 +150,7 @@ function PowerAppsHostProvider({
     environmentId,
     region,
     connectionReferences,
+    hasDataverse: (0, _DataverseDataSources.hasDataverseDatabaseReferences)(databaseReferences),
     schemaMap,
     onDisambiguationNeeded,
     isvClientId

package/lib/commonjs/provider/PowerAppsProvider.js

@@ -19,6 +19,7 @@ var _PowerPlatformEnvironmentApi = require("../platform/PowerPlatformEnvironment
 var _ThemeProvider = require("../theme/ThemeProvider.js");
 var _ErrorBoundary = require("../ErrorBoundary.js");
 var _isDevPlayer = require("../utils/isDevPlayer.js");
+var Application = _interopRequireWildcard(require("expo-application"));
 var _expoConstants = _interopRequireDefault(require("expo-constants"));
 var _powerAppsNativeCommon = require("@microsoft/power-apps-native-common");
 var _createOfflineHostActivationCallbacks = require("../offline/createOfflineHostActivationCallbacks.js");
@@ -232,6 +233,7 @@ function InnerProviders({
  * root layout.
  */
 function PowerAppsProvider({
+  appConfig,
   msalConfig,
   intuneConfig,
   powerConfig,
@@ -249,7 +251,8 @@ function PowerAppsProvider({
   onConnectionConsentDeclined,
   appName,
   logger: loggerProp,
-  showSessionDetailsOnSwipe = true,
+  showSessionDetailsOnLongPress,
+  showSessionDetailsOnSwipe,
   appInsightsConfig,
   offlineProfile,
   children
@@ -258,15 +261,17 @@ function PowerAppsProvider({
   // is stable (loggerProp is an object reference; re-running on every render
   // would reconfigure and leak the previous provider).
   const loggerPropRef = (0, _react.useRef)(loggerProp);
-  const appInsightsConfigRef = (0, _react.useRef)(appInsightsConfig ?? readAppInsightsConfig(_expoConstants.default.expoConfig?.extra?.appInsightsConfig));
+  const appInsightsConfigRef = (0, _react.useRef)(appInsightsConfig ?? readAppInsightsConfig(appConfig?.expo?.extra?.appInsightsConfig ?? _expoConstants.default.expoConfig?.extra?.appInsightsConfig));
   const [offlineTelemetryEnabled, setOfflineTelemetryEnabled] = (0, _react.useState)();
   const missingClientIdInDevPlayer = _reactNative.Platform.OS !== 'web' && _isDevPlayer.isDevPlayer && !hasConfiguredValue(msalConfig.clientId) && requiresPowerPlatformAuth(powerConfig);
-  const missingAppId = !_isDevPlayer.isDevPlayer && !hasConfiguredValue(powerConfig.appId);
+  const missingAppId = _reactNative.Platform.OS !== 'web' && !_isDevPlayer.isDevPlayer && !hasConfiguredValue(powerConfig.appId);
   const missingEnvironmentId = !_isDevPlayer.isDevPlayer && !hasConfiguredValue(powerConfig.environmentId);
   const appId = typeof powerConfig.appId === 'string' ? powerConfig.appId.trim() : '';
-  const bundleId = _reactNative.Platform.OS === 'ios' ? _expoConstants.default.expoConfig?.ios?.bundleIdentifier : _reactNative.Platform.OS === 'android' ? _expoConstants.default.expoConfig?.android?.package : undefined;
+  const configuredBundleId = _reactNative.Platform.OS === 'ios' ? _expoConstants.default.expoConfig?.ios?.bundleIdentifier : _reactNative.Platform.OS === 'android' ? _expoConstants.default.expoConfig?.android?.package : undefined;
+  const bundleId = _reactNative.Platform.OS === 'ios' || _reactNative.Platform.OS === 'android' ? Application.applicationId ?? configuredBundleId : undefined;
   const appInstanceId = _expoConstants.default.expoConfig?.extra?.telemetry?.appInstanceId;
   const skillCorrelationId = typeof appInstanceId === 'string' ? appInstanceId.trim() : '';
+  const sessionDetailsGestureEnabled = showSessionDetailsOnLongPress ?? showSessionDetailsOnSwipe ?? true;
   const requiredAuthScopes = (0, _react.useMemo)(() => [(0, _PowerPlatformEnvironmentApi.powerPlatformScope)(powerConfig.region ?? 'prod')], [powerConfig.region]);
   const queryClient = (0, _react.useMemo)(() => (0, _createOfflineHostActivationCallbacks.createHostQueryClient)(), []);
 
@@ -386,7 +391,7 @@ function PowerAppsProvider({
               swipeDirection: "horizontal",
               duration: 3000,
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_SessionDetailsGesture.SessionDetailsGesture, {
-                enabled: showSessionDetailsOnSwipe,
+                enabled: sessionDetailsGestureEnabled,
                 appName: appName ?? _expoConstants.default.expoConfig?.name ?? 'Power Apps',
                 appId: appId || undefined,
                 environmentId: powerConfig.environmentId,

package/lib/commonjs/provider/SessionDetailsGesture.js

@@ -11,7 +11,6 @@ var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _index = require("../telemetry/index.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-const SWIPE_DISTANCE = 80;
 function SessionDetailsGesture({
   enabled,
   appName,
@@ -29,14 +28,7 @@ function SessionDetailsGesture({
     setCopied(false);
     setVisible(true);
   }, []);
-  const gesture = (0, _react.useMemo)(() => _reactNativeGestureHandler.Gesture.Pan().enabled(enabled && _reactNative.Platform.OS !== 'web').minPointers(3).maxPointers(3).runOnJS(true).onEnd(({
-    translationX,
-    translationY
-  }) => {
-    if (translationY >= SWIPE_DISTANCE && translationY > Math.abs(translationX)) {
-      showSessionDetails();
-    }
-  }), [enabled, showSessionDetails]);
+  const gesture = (0, _react.useMemo)(() => _reactNativeGestureHandler.Gesture.LongPress().enabled(enabled && _reactNative.Platform.OS !== 'web').numberOfPointers(3).runOnJS(true).onStart(showSessionDetails), [enabled, showSessionDetails]);
   const close = (0, _react.useCallback)(() => setVisible(false), []);
   const copySessionId = (0, _react.useCallback)(async () => {
     if (!sessionId) return;

package/lib/module/auth/AuthContext.js

@@ -31,6 +31,32 @@ const SIGN_IN_SCOPES = ['https://api.powerplatform.com/.default'];
 function getSafeErrorName(error) {
   return error instanceof Error ? error.constructor.name : typeof error;
 }
+function getErrorProperty(error, propertyName) {
+  return error && typeof error === 'object' ? error[propertyName] : undefined;
+}
+function getSafeErrorMessage(error) {
+  if (error instanceof Error) return error.message;
+  return typeof error === 'string' ? error : String(error);
+}
+function getAuthErrorTelemetry(error) {
+  const errorMessage = getSafeErrorMessage(error);
+  const parsedNSError = /domain=([^\s]+) code=(-?\d+)/.exec(errorMessage);
+  return {
+    errorName: getSafeErrorName(error),
+    errorCode: getErrorProperty(error, 'code'),
+    nativeErrorDomain: getErrorProperty(error, 'nativeErrorDomain') ?? parsedNSError?.[1],
+    nativeErrorCode: getErrorProperty(error, 'nativeErrorCode') ?? parsedNSError?.[2],
+    nativeErrorMessage: errorMessage.slice(0, 512)
+  };
+}
+function getAuthTelemetryProperties(useBroker, useEmbeddedWebView) {
+  return {
+    authMode: useBroker ? 'wrap' : 'nonWrap',
+    platform: Platform.OS,
+    useBroker,
+    useEmbeddedWebView
+  };
+}
 function accountsMatch(left, right) {
   return left.identifier === right.identifier && left.tenantId === right.tenantId;
 }
@@ -161,10 +187,8 @@ export function AuthProvider({
       } : {})
     });
     pcaRef.current = pca;
-    const authInitScenario = getAppLogger().trackScenario(HostOperationNames.AuthInit, {
-      useBroker,
-      platform: Platform.OS
-    });
+    const authTelemetryProperties = getAuthTelemetryProperties(useBroker, useEmbeddedWebView);
+    const authInitScenario = getAppLogger().trackScenario(HostOperationNames.AuthInit, authTelemetryProperties);
     pca.init().then(() => pca.getAccounts()).then(async accounts => {
       let restoredAccount = accounts[0] ?? null;
       if (restoredAccount) {
@@ -196,9 +220,7 @@ export function AuthProvider({
       setError(e instanceof Error ? e : new Error(String(e)));
       setIsAuthReady(true);
       setIsLoading(false);
-      authInitScenario.fail(undefined, {
-        errorName: getSafeErrorName(e)
-      });
+      authInitScenario.fail(undefined, getAuthErrorTelemetry(e));
     });
     // Re-initialize only when the effective broker/identity settings change.
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -208,9 +230,8 @@ export function AuthProvider({
     if (!pca) return;
     setIsLoading(true);
     setError(null);
-    const signInScenario = getAppLogger().trackScenario(HostOperationNames.AuthSignIn, {
-      useBroker
-    });
+    const authTelemetryProperties = getAuthTelemetryProperties(useBroker, useEmbeddedWebView);
+    const signInScenario = getAppLogger().trackScenario(HostOperationNames.AuthSignIn, authTelemetryProperties);
     try {
       // If init() failed on mount, retry it now before attempting sign-in.
       if (!pca.isInitialized) {
@@ -239,16 +260,15 @@ export function AuthProvider({
           // Intune Conditional Access on the next token acquisition.
           debugWarn('[AuthProvider] Intune enrollment failed:', intuneErr);
           getAppLogger().trackErrorEvent(HostOperationNames.AuthIntuneEnroll, {
-            errorName: getSafeErrorName(intuneErr)
+            ...authTelemetryProperties,
+            ...getAuthErrorTelemetry(intuneErr)
           });
         }
       }
       signInScenario.complete();
     } catch (e) {
       setError(e instanceof Error ? e : new Error(String(e)));
-      signInScenario.fail(undefined, {
-        errorName: getSafeErrorName(e)
-      });
+      signInScenario.fail(undefined, getAuthErrorTelemetry(e));
     } finally {
       setIsLoading(false);
     }
@@ -265,8 +285,9 @@ export function AuthProvider({
     } catch (e) {
       debugWarn('[AuthContext] acquireTokenSilent failed for scopes:', scopes, e);
       getAppLogger().trackErrorEvent(HostOperationNames.AuthAcquireTokenSilentFailed, {
+        ...getAuthTelemetryProperties(useBroker, useEmbeddedWebView),
         scopeCount: scopes.length,
-        errorName: getSafeErrorName(e)
+        ...getAuthErrorTelemetry(e)
       });
       if (scopes.some(scope => effectiveRequiredScopes.includes(scope))) {
         await pca.signOut({

package/lib/module/config/babelConfig.js

@@ -0,0 +1,9 @@
+"use strict";
+
+export function createPowerAppsBabelConfig(api, options = {}) {
+  api.cache(true);
+  return {
+    presets: ['babel-preset-expo', ...(options.presets || [])],
+    plugins: [...(options.plugins || []), 'react-native-reanimated/plugin']
+  };
+}

package/lib/module/config/expoConfig.js

@@ -0,0 +1,67 @@
+"use strict";
+
+/**
+ * Branding placeholder used when the app supplies no icon/splash of its own.
+ *
+ * Expo only carves out native branding slots for images it knows about at
+ * prebuild time. Passing nothing means no slot is generated, and the wrap
+ * pipeline then has nothing to overwrite — so customer icons and splash
+ * screens silently never appear in the wrapped app. Always supplying a source
+ * guarantees the slots exist and are replaceable:
+ *   Android — res/mipmap-*\/ic_launcher*.png, res/drawable-*\/splashscreen_logo.png
+ *   iOS     — AppIcon and SplashScreenLogo imagesets
+ */
+const PLACEHOLDER_BRANDING_IMAGE = './assets/adaptive-icon.png';
+export function createPowerAppsExpoConfig(baseConfig, settings, customize = config => config) {
+  const resolvedIconPath = settings.iconPath || PLACEHOLDER_BRANDING_IMAGE;
+  const resolvedSplashPath = settings.splashPath || process.env.APP_SPLASH_PATH || PLACEHOLDER_BRANDING_IMAGE;
+  const icon = {
+    icon: resolvedIconPath
+  };
+  const adaptiveIcon = {
+    adaptiveIcon: {
+      foregroundImage: resolvedIconPath,
+      backgroundColor: '#ffffff'
+    }
+  };
+  return customize({
+    ...baseConfig,
+    ...icon,
+    name: settings.name,
+    slug: settings.slug,
+    version: settings.version,
+    scheme: settings.scheme,
+    userInterfaceStyle: 'automatic',
+    web: {
+      bundler: 'metro',
+      output: 'static'
+    },
+    platforms: ['ios', 'android', 'web'],
+    experiments: {
+      typedRoutes: true
+    },
+    plugins: [...(settings.isDevClient ? ['expo-dev-client'] : []), 'expo-asset', 'expo-audio', 'expo-font', 'expo-image', 'expo-mail-composer', 'expo-router', 'expo-secure-store', 'expo-sharing', 'expo-video', 'expo-web-browser', '@microsoft/power-apps-native-host', '@microsoft/power-apps-native-offline', '@react-native-community/datetimepicker',
+    // Configured explicitly rather than left to Expo's default so prebuild
+    // emits named, resource-table-registered splash assets the wrap pipeline
+    // can overwrite: res/drawable-*/splashscreen_logo.png on Android and the
+    // SplashScreenLogo imageset on iOS.
+    ['expo-splash-screen', {
+      image: resolvedSplashPath,
+      imageWidth: 200,
+      resizeMode: 'contain',
+      backgroundColor: '#ffffff'
+    }]],
+    android: {
+      package: settings.androidPackage,
+      versionCode: settings.versionCode,
+      ...adaptiveIcon
+    },
+    ios: {
+      supportsTablet: true,
+      bundleIdentifier: settings.iosBundleIdentifier,
+      infoPlist: {
+        LSApplicationQueriesSchemes: ['intunemam', 'ms-acompli', 'msauthv2', 'msauthv3']
+      }
+    }
+  });
+}

package/lib/module/config/metroConfig.js

@@ -0,0 +1,65 @@
+"use strict";
+
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import fs from 'node:fs';
+import { getDefaultConfig } from 'expo/metro-config.js';
+import { withPowerNativeMetroLogging } from "./metroLogger.js";
+function nativeRuntimeVersions(projectRoot) {
+  const appConfig = JSON.parse(fs.readFileSync(path.join(projectRoot, 'app.json'), 'utf8'));
+  const versions = appConfig.expo?.extra?.powerappsNative?.nativeRuntimeVersions;
+  if (!Number.isInteger(versions?.android) || versions.android < 1 || !Number.isInteger(versions?.ios) || versions.ios < 1) {
+    throw new Error('app.json is missing valid expo.extra.powerappsNative.nativeRuntimeVersions');
+  }
+  return versions;
+}
+function templateVersion(projectRoot) {
+  const appConfig = JSON.parse(fs.readFileSync(path.join(projectRoot, 'app.json'), 'utf8'));
+  const version = appConfig.expo?.extra?.powerappsNative?.templateVersion;
+  if (!Number.isInteger(version) || version < 1) {
+    throw new Error('app.json is missing a valid expo.extra.powerappsNative.templateVersion');
+  }
+  return version;
+}
+export function createPowerAppsMetroConfig(projectRoot, customize = config => config) {
+  const projectRequire = createRequire(path.join(projectRoot, 'package.json'));
+  const config = getDefaultConfig(projectRoot);
+  config.resolver.sourceExts = [...config.resolver.sourceExts, 'mjs'];
+  config.server = {
+    ...config.server,
+    enhanceMiddleware: middleware => withPowerNativeMetroLogging((request, response, next) => {
+      if (request.url === '/__pawrap_verify') {
+        response.setHeader('Content-Type', 'application/json');
+        response.setHeader('Access-Control-Allow-Origin', '*');
+        response.end(JSON.stringify({
+          type: 'pawrap-app',
+          version: '1',
+          templateVersion: templateVersion(projectRoot),
+          nativeRuntimeVersions: nativeRuntimeVersions(projectRoot)
+        }));
+        return;
+      }
+      middleware(request, response, next);
+    }, {
+      projectRoot
+    })
+  };
+  const defaultResolver = config.resolver.resolveRequest;
+  const resolveRequest = (context, moduleName, platform) => {
+    const isNodeRenderer = context.customResolverOptions?.environment === 'node';
+    if (!isNodeRenderer && (moduleName === 'react' || moduleName.startsWith('react/')) || moduleName === 'react-native' && platform !== 'web' || moduleName.startsWith('@babel/runtime')) {
+      return {
+        filePath: projectRequire.resolve(moduleName, {
+          paths: [path.resolve(projectRoot, 'node_modules')]
+        }),
+        type: 'sourceFile'
+      };
+    }
+    return defaultResolver ? defaultResolver(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform);
+  };
+  config.resolver = {
+    ...config.resolver,
+    resolveRequest
+  };
+  return customize(config);
+}