Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion api/server/controllers/AuthController.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,12 @@ const graphTokenController = async (req, res) => {

res.json(tokenResponse);
} catch (error) {
logger.error('[graphTokenController] Failed to obtain Graph API token:', error);
logger.error('[graphTokenController] Failed to obtain Graph API token:', {
message: error?.message,
details: error?.details,
originalMessage: error?.originalError?.message,
stack: error?.stack,
});
res.status(500).json({
message: 'Failed to obtain Microsoft Graph token',
});
Expand Down
43 changes: 41 additions & 2 deletions api/server/services/GraphTokenService.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ const { CacheKeys } = require('librechat-data-provider');
const { getOpenIdConfig } = require('~/strategies/openidStrategy');
const getLogStores = require('~/cache/getLogStores');

function parseResponseBody(body) {
if (!body) {
return null;
}

if (typeof body === 'string') {
try {
return JSON.parse(body);
} catch (error) {
logger.debug('[GraphTokenService] Failed to parse error response body as JSON', {
parseError: error.message,
});
return body;
}
}

return body;
}

/**
* Get Microsoft Graph API token using existing token exchange mechanism
* @param {Object} user - User object with OpenID information
Expand Down Expand Up @@ -73,11 +92,31 @@ async function getGraphApiToken(user, accessToken, scopes, fromCache = true) {
);
return tokenResponse;
} catch (error) {
const statusCode = error?.response?.status ?? error?.statusCode;
const parsedBody = parseResponseBody(error?.response?.body);
const errorDescription =
parsedBody?.error_description ||
parsedBody?.error ||
error?.error_description ||
error?.error ||
error?.message;

const errorDetails = {
statusCode,
error: parsedBody?.error || error?.error,
error_description: errorDescription,
responseBody: parsedBody,
};

logger.error(
`[GraphTokenService] Failed to acquire Graph API token for user ${user.openidId}:`,
error,
errorDetails,
);
throw new Error(`Graph token acquisition failed: ${error.message}`);

const graphError = new Error(`Graph token acquisition failed: ${errorDescription}`);
graphError.originalError = error;
graphError.details = errorDetails;
throw graphError;
}
}

Expand Down