Skip to content

Fix REST API 401 authentication errors by adding nonce middleware #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arifulhoque7 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix REST API 401 authentication errors by adding nonce middleware #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/data/docs/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import apiFetch from '@wordpress/api-fetch';

// Set up REST API nonce for authentication
if ( typeof window.weDocsAdminVars !== 'undefined' && window.weDocsAdminVars.restNonce ) {
apiFetch.use( apiFetch.createNonceMiddleware( window.weDocsAdminVars.restNonce ) );
}

const controls = {
FETCH_FROM_API( action ) {
return apiFetch( { path: action.path } );
Expand Down
5 changes: 5 additions & 0 deletions src/data/settings/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import apiFetch from '@wordpress/api-fetch';

// Set up REST API nonce for authentication
if ( typeof window.weDocsAdminVars !== 'undefined' && window.weDocsAdminVars.restNonce ) {
apiFetch.use( apiFetch.createNonceMiddleware( window.weDocsAdminVars.restNonce ) );
}

const isProLoaded = wp.hooks.applyFilters(
'wedocs_pro_loaded',
false
Expand Down
44 changes: 21 additions & 23 deletions src/utils/aiService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

import { __ } from '@wordpress/i18n';
import apiFetch from '@wordpress/api-fetch';

class AiService {
constructor() {
Expand Down Expand Up @@ -72,8 +73,7 @@ class AiService {
*/
async getAiSettings() {
try {
const response = await fetch('/wp-json/wp/v2/docs/settings?data=wedocs_settings');
const settings = await response.json();
const settings = await apiFetch({ path: '/wp/v2/docs/settings?data=wedocs_settings' });
return settings?.ai || this.getDefaultAiSettings();
} catch (error) {
return this.getDefaultAiSettings();
Expand Down Expand Up @@ -161,9 +161,6 @@ class AiService {

// Make the API call directly via WordPress REST API
// Pass prompt and options directly instead of creating provider-specific payloads
const restUrl = '/wp-json/wp/v2/docs/ai/generate';
const nonce = window.weDocsEditorVars?.nonce || '';

const requestBody = {
prompt: prompt,
provider: provider,
Expand All @@ -172,19 +169,20 @@ class AiService {
temperature: options.temperature || 0.7,
systemPrompt: options.systemPrompt || __('You are a helpful documentation assistant.', 'wedocs')
};

const response = await fetch(restUrl, {
method: 'POST',
credentials: 'include', // Include cookies for authentication
headers: {
'Content-Type': 'application/json',
'X-WP-Nonce': nonce
},
body: JSON.stringify(requestBody)
});

if (!response.ok) {
let errorData = {};
try {
const data = await apiFetch({
path: '/wp/v2/docs/ai/generate',
method: 'POST',
data: requestBody
});

// Return in format expected by callers
return {
content: data.content || '',
usage: data.usage || null
};
} catch (error) {
let errorMessage = __('AI content generation failed. Please try again.', 'wedocs');

try {
Expand All @@ -194,7 +192,7 @@ class AiService {
errorData = JSON.parse(responseText);
// Use the message from the API, which should already be user-friendly
errorMessage = errorData.message || errorData.code || errorMessage;

// Clean up HTML error messages (WordPress fatal errors)
if (errorMessage.includes('<p>') || errorMessage.includes('critical error')) {
errorMessage = __('A server error occurred. Please try again or contact support if the problem persists.', 'wedocs');
Expand Down Expand Up @@ -222,7 +220,7 @@ class AiService {
}

const data = await response.json();

// Return in format expected by callers
return {
content: data.content || '',
Expand Down Expand Up @@ -343,13 +341,13 @@ class AiService {
async makeApiCall(provider, apiKey, endpoint, payload, model = null) {
// Extract options from payload (provider-specific payloads vary)
const options = this.extractOptionsFromPayload(provider, payload);

// Use WordPress REST API endpoint instead of direct API calls
const restUrl = '/wp-json/wp/v2/docs/ai/generate';

// Get nonce from localized script
const nonce = window.weDocsEditorVars?.nonce || '';

const response = await fetch(restUrl, {
method: 'POST',
credentials: 'include', // Include cookies for authentication
Expand Down Expand Up @@ -390,7 +388,7 @@ class AiService {
}

const data = await response.json();

// Return in format expected by parseResponse
return data;
}
Expand Down