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

package/package.json

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

package/src/core/XeboNetworkService.ts

@@ -39,6 +39,57 @@ export function buildFeedbackBaseURL(resolvedZone: string, environment: XeboEnvi
     : `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';
+}
+
+// ─── Step 0: API key verification → bearer token ─────────────────────────────
+
+export async function verifyApiKey(
+  verifyURL: string,
+  zone: string,
+  apiKey: string,
+): Promise<string> {
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+  console.log('[Xebo Step 0] Verifying API key');
+  console.log('URL:', verifyURL);
+
+  const res = await fetch(verifyURL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ zone, apiKey }),
+  });
+
+  const json = await res.json();
+  console.log('[Xebo] Verify response status:', res.status);
+  console.log('[Xebo] Verify response:', JSON.stringify(json));
+
+  if (!res.ok) {
+    throw new Error(
+      `[Xebo] verifyApiKey failed — HTTP ${res.status}: ${JSON.stringify(json)}`
+    );
+  }
+
+  const token: string | undefined =
+    json?.token ??
+    json?.data?.token ??
+    json?.access_token ??
+    json?.bearerToken ??
+    json?.data?.access_token;
+
+  if (!token) {
+    throw new Error(
+      `[Xebo] verifyApiKey — bearer token not found in response: ${JSON.stringify(json)}`
+    );
+  }
+
+  console.log('[Xebo] Bearer token obtained successfully');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+  return token;
+}
+
 // ─── HTML stripping ───────────────────────────────────────────────────────────
 
 export function stripHTML(raw: string | undefined): string {
@@ -261,7 +312,7 @@ export interface CollectorInfo {
 export async function fetchCollector(
   baseURL: string,
   collectorId: string,
-  apiKey: string
+  bearerToken: string,
 ): Promise<CollectorInfo> {
   const url = `${baseURL}/v3/collectors/collect/${collectorId}`;
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
@@ -269,7 +320,7 @@ export async function fetchCollector(
   console.log('URL:', url);
   console.log('Collector ID:', collectorId);
 
-  const res = await fetch(url, { headers: { 'x-api-key': apiKey } });
+  const res = await fetch(url, { headers: { 'Authorization': `Bearer ${bearerToken}` } });
   const json: APICollectorResponse = await res.json();
 
   // The API may return the collector object directly at the root OR wrapped in a `data` key
@@ -299,14 +350,14 @@ export async function fetchCollector(
 export async function fetchSurvey(
   baseURL: string,
   surveyId: string,
-  apiKey: string
+  bearerToken: string,
 ): Promise<XeboSurvey> {
   const url = `${baseURL}/v3/survey-management/surveys/${surveyId}`;
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('[Xebo Step 2] Fetching survey');
   console.log('URL:', url);
 
-  const res = await fetch(url, { headers: { 'x-api-key': apiKey } });
+  const res = await fetch(url, { headers: { 'Authorization': `Bearer ${bearerToken}` } });
   const json: APISurveyResponse = await res.json();
 
   console.log('[Xebo] Survey HTTP status:', res.status);
@@ -346,7 +397,7 @@ export async function submitResponse(
   feedbackBaseURL: string,
   surveyId: string,
   collectorUUID: string,
-  apiKey: string,
+  bearerToken: string,
   answers: XeboAnswer[],
   meta?: SubmitMeta,
 ): Promise<SubmitResult> {
@@ -373,7 +424,9 @@ export async function submitResponse(
 
   const payload: Record<string, unknown> = {
     collector_id: collectorUUID,
-    ...(meta?.deviceInfo && { deviceInfo: meta.deviceInfo }),
+    ...(meta?.qualityFlags && { qualityFlags: meta.qualityFlags }),
+    ...(meta?.deviceInfo   && { deviceInfo: meta.deviceInfo }),
+    ...(meta?.geolocation  && { geoLocation: meta.geolocation }),
     responses: [
       {
         response_status: 'complete',
@@ -387,9 +440,6 @@ export async function submitResponse(
             text: v.text || null,
           })),
         })),
-        ...(meta?.qualityFlags  && { qualityFlags: meta.qualityFlags }),
-        ...(meta?.deviceInfo    && { deviceInfo: meta.deviceInfo }),
-        ...(meta?.geolocation   && { geoLocation: meta.geolocation }),
       },
     ],
   };
@@ -412,7 +462,7 @@ export async function submitResponse(
   const res = await fetch(url, {
     method: 'POST',
     headers: {
-      'x-api-key': apiKey,
+      'Authorization': `Bearer ${bearerToken}`,
       'Content-Type': 'application/json',
       'User-Agent': userAgent,
     },

package/src/core/XeboSurveyManager.ts

@@ -47,6 +47,8 @@ import {
   resolveZoneAndEnv,
   buildBaseURL,
   buildFeedbackBaseURL,
+  buildVerifyURL,
+  verifyApiKey,
   fetchCollector,
   fetchSurvey,
   submitResponse,
@@ -73,6 +75,8 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
   private environment: XeboEnvironment = 'production';
   private baseURL = '';
   private feedbackBaseURL = '';
+  private verifyURL = '';
+  private bearerToken = '';
 
   // User / eData
   private userData: XeboUserData | null = null;
@@ -108,6 +112,7 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
     this.environment = environment;
     this.baseURL = buildBaseURL(this.resolvedZone, this.environment);
     this.feedbackBaseURL = buildFeedbackBaseURL(this.resolvedZone, this.environment);
+    this.verifyURL = buildVerifyURL(this.environment);
 
     // Capture device info once at configure time
     this.deviceModel = `${DeviceInfo.getModel()} (${DeviceInfo.getSystemName()})`;
@@ -151,15 +156,22 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
     });
   }
 
+  // ─── Step 0: Verify API key → bearer token ────────────────────────────────
+
+  private async _verifyAndGetToken(): Promise<void> {
+    this.bearerToken = await verifyApiKey(this.verifyURL, this.resolvedZone, this.apiKey);
+  }
+
   // ─── Background pre-fetch ──────────────────────────────────────────────────
 
   private async _prefetchSurvey(): Promise<void> {
     try {
       console.log('[Xebo] Pre-fetching survey in background...');
-      const collector = await fetchCollector(this.baseURL, this.collectorId, this.apiKey);
+      await this._verifyAndGetToken();
+      const collector = await fetchCollector(this.baseURL, this.collectorId, this.bearerToken);
       this.resolvedCollectorUUID = collector.uuid;
       this.resolvedCollectorMongoId = collector.mongoId;
-      const survey = await fetchSurvey(this.baseURL, collector.surveyId, this.apiKey);
+      const survey = await fetchSurvey(this.baseURL, collector.surveyId, this.bearerToken);
       this.survey = survey;
       this.emit(XEBO_EVENTS.SURVEY_LOADED, survey);
       console.log('[Xebo] Pre-fetch done —', survey.questions.length, 'questions ready');
@@ -187,14 +199,17 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
         return;
       }
 
-      // Not cached yet — fetch now
+      // Not cached yet — verify + fetch now
+      console.log('[Xebo] Step 0: verifyApiKey');
+      await this._verifyAndGetToken();
+
       console.log('[Xebo] Step 1: fetchCollector');
-      const collector = await fetchCollector(this.baseURL, this.collectorId, this.apiKey);
+      const collector = await fetchCollector(this.baseURL, this.collectorId, this.bearerToken);
       this.resolvedCollectorUUID = collector.uuid;
       this.resolvedCollectorMongoId = collector.mongoId;
 
       console.log('[Xebo] Step 2: fetchSurvey');
-      const survey = await fetchSurvey(this.baseURL, collector.surveyId, this.apiKey);
+      const survey = await fetchSurvey(this.baseURL, collector.surveyId, this.bearerToken);
       this.survey = survey;
       this.currentAnswers = [];
       this.currentQuestionIndex = 0;
@@ -299,7 +314,7 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
         this.feedbackBaseURL,
         this.survey.id,
         this.resolvedCollectorUUID,
-        this.apiKey,
+        this.bearerToken,
         this.currentAnswers,
         {
           userData: this.userData ?? undefined,
@@ -370,7 +385,7 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
           this.feedbackBaseURL,
           queued.surveyId,
           queued.collectorUUID,
-          this.apiKey,
+          this.bearerToken,
           queued.answers,
           {
             userData: queued.userData,