Removed direct references to 'vertexai_project_id' from openai.js and related files, ensuring it is now managed through backend secrets for enhanced security.

1e2bec1751ef06beb4b769dd290b7496b1df127a

InterestingDarkness <computeridiot999@gmail.com>

Parents: a9d4988fc000c0c7cb37d337b056d9b29225cfd4

public/scripts/extensions/shared.js+1 -2 Viewed

     // Add Vertex AI specific parameters if using Vertex AI
     if (extension_settings.caption.multimodal_api === 'vertexai') {
         requestBody.vertexai_auth_mode = oai_settings.vertexai_auth_mode;
-        requestBody.vertexai_project_id = oai_settings.vertexai_project_id;
         requestBody.vertexai_region = oai_settings.vertexai_region;
+    }

@@ -185,7 +184,7 @@ function throwIfInvalidModel(useReverseProxy) {
185	if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {	184	if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {
186	throw new Error('Service Account JSON is required for Vertex AI Full mode. Please validate and save your Service Account JSON.');	185	throw new Error('Service Account JSON is required for Vertex AI Full mode. Please validate and save your Service Account JSON.');
187	}	186	}
188	if (!oai_settings.vertexai_project_id) {	187	if (!secret_state[SECRET_KEYS.VERTEXAI_PROJECT_ID]) {
189	throw new Error('Project ID is required for Vertex AI Full mode.');	188	throw new Error('Project ID is required for Vertex AI Full mode.');
190	}	189	}
191	if (!oai_settings.vertexai_region) {	190	if (!oai_settings.vertexai_region) {

public/scripts/openai.js+13 -14 Viewed

     'custom_include_body',
     'custom_exclude_body',
     'custom_include_headers',
-    'vertexai_project_id',
     'vertexai_region',
 ];

     claude_use_sysprompt: ['#claude_use_sysprompt', 'claude_use_sysprompt', true, false],
     use_makersuite_sysprompt: ['#use_makersuite_sysprompt', 'use_makersuite_sysprompt', true, false],
     vertexai_auth_mode: ['#vertexai_auth_mode', 'vertexai_auth_mode', false, true],
-    vertexai_project_id: ['#vertexai_project_id', 'vertexai_project_id', false, true],
     vertexai_region: ['#vertexai_region', 'vertexai_region', false, true],
     use_alt_scale: ['#use_alt_scale', 'use_alt_scale', true, true],
     squash_system_messages: ['#squash_system_messages', 'squash_system_messages', true, false],

     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     vertexai_auth_mode: 'express',
-    vertexai_project_id: '',
     vertexai_region: 'us-central1',
     use_alt_scale: false,
     squash_system_messages: false,

     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     vertexai_auth_mode: 'express',
-    vertexai_project_id: '',
     vertexai_region: 'us-central1',
     use_alt_scale: false,
     squash_system_messages: false,

@@ -2201,7 +2197,6 @@ async function sendOpenAIRequest(type, messages, signal) {
2201	generate_data['use_makersuite_sysprompt'] = oai_settings.use_makersuite_sysprompt;	2197	generate_data['use_makersuite_sysprompt'] = oai_settings.use_makersuite_sysprompt;
2202	if (isVertexAI) {	2198	if (isVertexAI) {
2203	generate_data['vertexai_auth_mode'] = oai_settings.vertexai_auth_mode;	2199	generate_data['vertexai_auth_mode'] = oai_settings.vertexai_auth_mode;
2204	generate_data['vertexai_project_id'] = oai_settings.vertexai_project_id;
2205	generate_data['vertexai_region'] = oai_settings.vertexai_region;	2200	generate_data['vertexai_region'] = oai_settings.vertexai_region;
2206	}	2201	}
2207	}	2202	}

     if (settings.claude_use_sysprompt !== undefined) oai_settings.claude_use_sysprompt = !!settings.claude_use_sysprompt;
     if (settings.use_makersuite_sysprompt !== undefined) oai_settings.use_makersuite_sysprompt = !!settings.use_makersuite_sysprompt;
     if (settings.vertexai_auth_mode !== undefined) oai_settings.vertexai_auth_mode = settings.vertexai_auth_mode;
-    if (settings.vertexai_project_id !== undefined) oai_settings.vertexai_project_id = settings.vertexai_project_id;
     if (settings.vertexai_region !== undefined) oai_settings.vertexai_region = settings.vertexai_region;
     if (settings.use_alt_scale !== undefined) { oai_settings.use_alt_scale = !!settings.use_alt_scale; updateScaleForm(); }
     $('#stream_toggle').prop('checked', oai_settings.stream_openai);

     $('#claude_use_sysprompt').prop('checked', oai_settings.claude_use_sysprompt);
     $('#use_makersuite_sysprompt').prop('checked', oai_settings.use_makersuite_sysprompt);
     $('#vertexai_auth_mode').val(oai_settings.vertexai_auth_mode);
-    $('#vertexai_project_id').val(oai_settings.vertexai_project_id);
+    // Don't display Project ID in input - it's stored in backend secrets
+    $('#vertexai_project_id').val('');
     $('#vertexai_region').val(oai_settings.vertexai_region);
     // Don't display Service Account JSON in textarea - it's stored in backend secrets
     $('#vertexai_service_account_json').val('');

         claude_use_sysprompt: settings.claude_use_sysprompt,
         use_makersuite_sysprompt: settings.use_makersuite_sysprompt,
         vertexai_auth_mode: settings.vertexai_auth_mode,
-        vertexai_project_id: settings.vertexai_project_id,
         vertexai_region: settings.vertexai_region,
         use_alt_scale: settings.use_alt_scale,
         squash_system_messages: settings.squash_system_messages,

+            }
         } else {
             // Full version - use service account
-            if (!oai_settings.vertexai_project_id.trim()) {
+            // Check if we have a saved project ID, otherwise use the input value
-                toastr.error('Project ID is required for Vertex AI full version');
+            const savedProjectId = secret_state[SECRET_KEYS.VERTEXAI_PROJECT_ID];
+            const inputProjectId = String($('#vertexai_project_id').val()).trim();
+            if (!savedProjectId && !inputProjectId) {
+                toastr.error(t`Project ID is required for Vertex AI full version`);
                 return;
+            }
+            // Save project ID to secrets if we have an input value
+            if (inputProjectId.length) {
+                await writeSecret(SECRET_KEYS.VERTEXAI_PROJECT_ID, inputProjectId);
+            }
             // Check if service account JSON is saved in backend
             if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {
                 toastr.error('Service Account JSON is required for Vertex AI full version. Please validate and save your Service Account JSON.');

     $('#model_google_select').on('change', onModelChange);
     $('#model_vertexai_select').on('change', onModelChange);
     $('#vertexai_auth_mode').on('change', onVertexAIAuthModeChange);
-    $('#vertexai_project_id').on('input', function () {
-        oai_settings.vertexai_project_id = String($(this).val());
-        saveSettingsDebounced();
-    });
     $('#vertexai_region').on('input', function () {
         oai_settings.vertexai_region = String($(this).val());
         saveSettingsDebounced();

public/scripts/secrets.js+1 -0 Viewed

     SERPER: 'api_key_serper',
     FALAI: 'api_key_falai',
     XAI: 'api_key_xai',
+    VERTEXAI_PROJECT_ID: 'vertexai_project_id',
     VERTEXAI_SERVICE_ACCOUNT: 'vertexai_service_account_json',
 };

src/endpoints/backends/chat-completions.js+6 -1 Viewed

                 url = `${apiUrl.toString().replace(/\/$/, '')}/v1/publishers/google/models/${model}:${responseType}?key=${keyParam}${stream ? '&alt=sse' : ''}`;
             } else if (authType === 'full') {
                 // For Full mode (service account authentication), use project-specific URL
-                const projectId = request.body.vertexai_project_id || 'your-project-id';
+                // Only use project ID from secrets
+                const projectId = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_PROJECT_ID);
+                if (!projectId) {
+                    console.warn('Vertex AI project ID is missing.');
+                    return response.status(400).send({ error: true });
+                }
                 const region = request.body.vertexai_region || 'us-central1';
                 // Handle global region differently - no region prefix in hostname
                 if (region === 'global') {

src/endpoints/google.js+5 -1 Viewed

                 url = `${apiUrl.origin}/v1/publishers/google/models/${model}:generateContent?key=${keyParam}`;
             } else if (authType === 'full') {
                 // Full mode: use project-specific URL with Authorization header
-                const projectId = request.body.vertexai_project_id || 'your-project-id';
+                const projectId = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_PROJECT_ID);
+                if (!projectId) {
+                    console.warn('Vertex AI project ID is missing.');
+                    return response.status(400).send({ error: true });
+                }
                 const region = request.body.vertexai_region || 'us-central1';
                 // Handle global region differently - no region prefix in hostname
                 if (region === 'global') {

src/endpoints/secrets.js+1 -0 Viewed

     DEEPSEEK: 'api_key_deepseek',
     SERPER: 'api_key_serper',
     XAI: 'api_key_xai',
+    VERTEXAI_PROJECT_ID: 'vertexai_project_id',
     VERTEXAI_SERVICE_ACCOUNT: 'vertexai_service_account_json',
 };