Update entrypoint and service to aimode in FxA authentication

Updated with OpenAI pipeline changes from D271303

Author: Punam Dahiya

browser/components/smartwindow/content/utils.mjs

@@ -12,6 +12,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
 
 import { createEngine } from "chrome://global/content/ml/EngineProcess.sys.mjs";
 import { SmartAssistEngine } from "moz-src:///browser/components/genai/SmartAssistEngine.sys.mjs";
+import { getFxAccountsSingleton } from "resource://gre/modules/FxAccounts.sys.mjs";
+import {
+  SCOPE_PROFILE,
+  OAUTH_CLIENT_ID,
+} from "resource://gre/modules/FxAccountsCommon.sys.mjs";
 
 const { ChatHistoryMessage } = ChromeUtils.importESModule(
   "resource:///modules/smartwindow/ChatHistory.sys.mjs"
@@ -53,6 +58,20 @@ export async function detectQueryType(query, isFollowup = false) {
   }
 }
 
+const getFxAccountToken = async () => {
+  try {
+    const fxAccounts = getFxAccountsSingleton();
+    const token = await fxAccounts.getOAuthToken({
+      scope: SCOPE_PROFILE,
+      client_id: OAUTH_CLIENT_ID,
+    });
+    return token;
+  } catch (error) {
+    console.error("Error obtaining FxA token:", error);
+    throw error;
+  }
+};
+
 /**
  * Creates an OpenAI engine instance configured with Smart Window preferences.
  *
@@ -61,6 +80,7 @@ export async function detectQueryType(query, isFollowup = false) {
  */
 export async function createOpenAIEngine(engineId = "smart-openai") {
   try {
+    const fxAccountToken = await getFxAccountToken();
     const engineInstance = await createEngine({
       apiKey: Services.prefs.getStringPref("browser.smartwindow.key"),
       backend: "openai",
@@ -69,6 +89,7 @@ export async function createOpenAIEngine(engineId = "smart-openai") {
       modelId: Services.prefs.getStringPref("browser.smartwindow.model"),
       modelRevision: "main",
       taskName: "text-generation",
+      fxAccountToken,
     });
     return engineInstance;
   } catch (error) {

browser/components/smartwindow/content/welcome.js

@@ -68,7 +68,10 @@ XPCOMUtils.defineLazyPreferenceGetter(
                   },
                   {
                     data: {
-                      entrypoint: "activity-stream-firstrun",
+                      entrypoint: "aimode",
+                      extraParams: {
+                        service: "aimode",
+                      }
                     },
                     type: "FXA_SMART_WINDOW_SIGNIN_FLOW",
                     navigate: true,

toolkit/components/ml/content/EngineProcess.sys.mjs

@@ -801,6 +801,7 @@ export class PipelineOptions {
       "baseURL",
       "apiKey",
       "staticEmbeddingsOptions",
+      "fxAccountToken",
     ];
 
     if (options instanceof PipelineOptions) {
@@ -946,6 +947,7 @@ export class PipelineOptions {
       baseURL: this.baseURL,
       apiKey: this.apiKey,
       staticEmbeddingsOptions: this.staticEmbeddingsOptions,
+      fxAccountToken: this.fxAccountToken,
     };
   }
 

toolkit/components/ml/content/backends/OpenAIPipeline.mjs

@@ -326,11 +326,21 @@ export class OpenAIPipeline {
   ) {
     lazy.console.debug("Running OpenAI pipeline");
     try {
-      const { baseURL, apiKey, modelId } = this.#options;
+      const { baseURL, apiKey, modelId, fxAccountToken } = this.#options;
+
+      if (!fxAccountToken) {
+        console.warn("No FxA token available;");
+      }
+
+      const defaultHeaders = fxAccountToken
+        ? { "x-fxa-authorization": `Bearer ${fxAccountToken}` } // or "X-FxA-Access-Token": fxAccountToken
+        : undefined;
+
       const client = new OpenAIPipeline.OpenAILib.OpenAI({
         baseURL: baseURL ? baseURL : "http://localhost:11434/v1",
         apiKey: apiKey || "ollama",
         maxRetries: 10,
+        ...(defaultHeaders ? { defaultHeaders } : {}),
       });
       const stream = request.streamOptions?.enabled || false;
       const tools = request.tools || [];