react-native-my-survey-sdk 2.2.26 → 2.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-my-survey-sdk",
-  "version": "2.2.26",
+  "version": "2.2.28",
   "description": "Xebo survey collection SDK for React Native",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/core/XeboNetworkService.ts

@@ -8,7 +8,6 @@ import {
   XeboEnvironment,
   XeboUserData,
   XeboQualityFlags,
-  XeboDeviceInfo,
   XeboGeolocation,
 } from '../models/XeboModels';
 import {
@@ -24,25 +23,33 @@ export function resolveZoneAndEnv(zone: string, explicitEnv?: XeboEnvironment):
   if (zone.startsWith('uat-')) {
     return { resolvedZone: zone.slice(4), environment: 'uat' };
   }
+  if (zone === 'preprod' || zone.startsWith('preprod-')) {
+    const resolvedZone = zone.startsWith('preprod-') ? zone.slice(8) : 'preprod';
+    return { resolvedZone, environment: 'preprod' };
+  }
   return { resolvedZone: zone, environment: explicitEnv ?? 'production' };
 }
 
 export function buildBaseURL(resolvedZone: string, environment: XeboEnvironment): string {
-  return environment === 'uat'
-    ? `https://uat-${resolvedZone}-api.xebo.ai`
-    : `https://${resolvedZone}-api.xebo.ai`;
+  if (environment === 'uat')     return `https://uat-${resolvedZone}-api.xebo.ai`;
+  if (environment === 'preprod') return resolvedZone === 'preprod'
+    ? 'https://preprod-api.xebo.ai'
+    : `https://preprod-${resolvedZone}-api.xebo.ai`;
+  return `https://${resolvedZone}-api.xebo.ai`;
 }
 
 export function buildFeedbackBaseURL(resolvedZone: string, environment: XeboEnvironment): string {
-  return environment === 'uat'
-    ? `https://uat-${resolvedZone}-feedback-api.xebo.ai`
-    : `https://${resolvedZone}-feedback-api.xebo.ai`;
+  if (environment === 'uat')     return `https://uat-${resolvedZone}-feedback-api.xebo.ai`;
+  if (environment === 'preprod') return resolvedZone === 'preprod'
+    ? 'https://preprod-feedback-api.xebo.ai'
+    : `https://preprod-${resolvedZone}-feedback-api.xebo.ai`;
+  return `https://${resolvedZone}-feedback-api.xebo.ai`;
 }
 
 export function buildVerifyURL(environment: XeboEnvironment): string {
-  return environment === 'uat'
-    ? 'https://uat-api.xebo.ai/api/v1/api-key/verify'
-    : 'https://api.xebo.ai/api/v1/api-key/verify';
+  if (environment === 'uat')     return 'https://uat-api.xebo.ai/api/v1/api-key/verify';
+  if (environment === 'preprod') return 'https://preprod-api.xebo.ai/api/v1/api-key/verify';
+  return 'https://api.xebo.ai/api/v1/api-key/verify';
 }
 
 // ─── Step 0: API key verification → bearer token ─────────────────────────────
@@ -52,14 +59,14 @@ export async function verifyApiKey(
   zone: string,
   apiKey: string,
 ): Promise<string> {
+  const url = `${verifyURL}?zone=${encodeURIComponent(zone)}`;
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('[Xebo Step 0] Verifying API key');
-  console.log('URL:', verifyURL);
+  console.log('URL:', url);
 
-  const res = await fetch(verifyURL, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ zone, apiKey }),
+  const res = await fetch(url, {
+    method: 'GET',
+    headers: { 'x-api-key': apiKey },
   });
 
   const json = await res.json();
@@ -73,9 +80,9 @@ export async function verifyApiKey(
   }
 
   const token: string | undefined =
+    json?.access_token ??
     json?.token ??
     json?.data?.token ??
-    json?.access_token ??
     json?.bearerToken ??
     json?.data?.access_token;
 
@@ -389,7 +396,6 @@ export interface SubmitMeta {
   startTime?: string;
   endTime?: string;
   qualityFlags?: XeboQualityFlags;
-  deviceInfo?: XeboDeviceInfo;
   geolocation?: XeboGeolocation;
 }
 
@@ -425,7 +431,6 @@ export async function submitResponse(
   const payload: Record<string, unknown> = {
     collector_id: collectorUUID,
     ...(meta?.qualityFlags && { qualityFlags: meta.qualityFlags }),
-    ...(meta?.deviceInfo   && { deviceInfo: meta.deviceInfo }),
     ...(meta?.geolocation  && { geoLocation: meta.geolocation }),
     responses: [
       {

package/src/core/XeboSurveyManager.ts

@@ -40,7 +40,7 @@ import {
   XeboQueuedResponse,
   XeboUserData,
   XeboQualityFlags,
-  XeboDeviceInfo,
+
   XeboGeolocation,
 } from '../models/XeboModels';
 import {
@@ -286,14 +286,6 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
     };
   }
 
-  private _buildDeviceInfo(): XeboDeviceInfo {
-    return {
-      type: 'mobile',
-      os: Platform.OS,
-      browser: 'app',
-    };
-  }
-
   private _buildGeolocation(): XeboGeolocation {
     return {
       type: 'point',
@@ -324,7 +316,6 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
           startTime: this.surveyStartTime,
           endTime,
           qualityFlags: this._buildQualityFlags(),
-          deviceInfo: this._buildDeviceInfo(),
           geolocation: this._buildGeolocation(),
         },
       );
@@ -361,7 +352,6 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
       platform: Platform.OS,
       osVersion: this.osVersion,
       qualityFlags: this._buildQualityFlags(),
-      deviceInfo: this._buildDeviceInfo(),
       geolocation: this._buildGeolocation(),
     };
 
@@ -395,7 +385,6 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
             startTime: queued.startTime,
             endTime: queued.endTime,
             qualityFlags: queued.qualityFlags,
-            deviceInfo: queued.deviceInfo,
             geolocation: queued.geolocation,
           },
         );

package/src/models/XeboModels.ts

@@ -1,6 +1,6 @@
 // ─── Enums ───────────────────────────────────────────────────────────────────
 
-export type XeboEnvironment = 'production' | 'uat';
+export type XeboEnvironment = 'production' | 'uat' | 'preprod';
 
 export enum XeboQuestionType {
   singleChoice = 'singleChoice',
@@ -149,7 +149,6 @@ export interface XeboQueuedResponse {
   platform?: string;
   osVersion?: string;
   qualityFlags?: XeboQualityFlags;
-  deviceInfo?: XeboDeviceInfo;
   geolocation?: XeboGeolocation;
 }