updated response to login API
This commit is contained in:
@@ -473,6 +473,8 @@ async function authenticateInstance() {
|
||||
const password = formData.get('password');
|
||||
|
||||
try {
|
||||
console.log('Attempting login to:', `${instanceUrl}/api/admin/login`);
|
||||
|
||||
// First login to get token
|
||||
const loginResponse = await fetch(`${instanceUrl}/api/admin/login`, {
|
||||
method: 'POST',
|
||||
@@ -483,12 +485,21 @@ async function authenticateInstance() {
|
||||
body: JSON.stringify({ email, password })
|
||||
});
|
||||
|
||||
const responseData = await loginResponse.json();
|
||||
console.log('Login response:', responseData);
|
||||
|
||||
if (!loginResponse.ok) {
|
||||
const errorData = await loginResponse.json().catch(() => ({}));
|
||||
throw new Error(errorData.message || 'Login failed');
|
||||
throw new Error(responseData.message || 'Login failed');
|
||||
}
|
||||
|
||||
const { token } = await loginResponse.json();
|
||||
if (responseData.status !== 'success') {
|
||||
throw new Error(responseData.message || 'Login failed');
|
||||
}
|
||||
|
||||
const token = responseData.token;
|
||||
if (!token) {
|
||||
throw new Error('No token received from server');
|
||||
}
|
||||
|
||||
// Then create management API key
|
||||
const keyResponse = await fetch(`${instanceUrl}/api/admin/management-api-key`, {
|
||||
@@ -503,12 +514,17 @@ async function authenticateInstance() {
|
||||
})
|
||||
});
|
||||
|
||||
const keyData = await keyResponse.json();
|
||||
console.log('API key response:', keyData);
|
||||
|
||||
if (!keyResponse.ok) {
|
||||
const errorData = await keyResponse.json().catch(() => ({}));
|
||||
throw new Error(errorData.message || 'Failed to create API key');
|
||||
throw new Error(keyData.message || 'Failed to create API key');
|
||||
}
|
||||
|
||||
const { api_key } = await keyResponse.json();
|
||||
const api_key = keyData.api_key;
|
||||
if (!api_key) {
|
||||
throw new Error('No API key received from server');
|
||||
}
|
||||
|
||||
// Save the token to our database
|
||||
const saveResponse = await fetch(`/instances/${instanceId}/save-token`, {
|
||||
@@ -520,9 +536,11 @@ async function authenticateInstance() {
|
||||
body: JSON.stringify({ token: api_key })
|
||||
});
|
||||
|
||||
const saveData = await saveResponse.json();
|
||||
console.log('Save token response:', saveData);
|
||||
|
||||
if (!saveResponse.ok) {
|
||||
const errorData = await saveResponse.json().catch(() => ({}));
|
||||
throw new Error(errorData.message || 'Failed to save token');
|
||||
throw new Error(saveData.message || 'Failed to save token');
|
||||
}
|
||||
|
||||
// Show success and refresh
|
||||
|
||||
Reference in New Issue
Block a user