Compare commits
3 Commits
preview-mo
...
preview-fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6dc00c8732 | ||
|
|
ca838a00fa | ||
|
|
f2ed101e52 |
@@ -32,13 +32,27 @@ class ExternalAPI {
|
|||||||
this.fetch = fetch;
|
this.fetch = fetch;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.baseUrl = baseUrl;
|
const url = new URL(baseUrl);
|
||||||
this.params = params;
|
|
||||||
this.defaultHeaders = {
|
this.defaultHeaders = {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Accept: 'application/json',
|
Accept: 'application/json',
|
||||||
|
...((url.username || url.password) && {
|
||||||
|
Authorization: `Basic ${Buffer.from(
|
||||||
|
`${url.username}:${url.password}`
|
||||||
|
).toString('base64')}`,
|
||||||
|
}),
|
||||||
...options.headers,
|
...options.headers,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (url.username || url.password) {
|
||||||
|
url.username = '';
|
||||||
|
url.password = '';
|
||||||
|
baseUrl = url.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.baseUrl = baseUrl;
|
||||||
|
this.params = params;
|
||||||
this.cache = options.nodeCache;
|
this.cache = options.nodeCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -410,7 +410,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
).AccessToken;
|
).AccessToken;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
`Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
|
`Something went wrong while creating an API key from the Jellyfin server: ${e.message}`,
|
||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,14 @@ const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
|
|||||||
admin.jellyfinDeviceId
|
admin.jellyfinDeviceId
|
||||||
);
|
);
|
||||||
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
||||||
|
try {
|
||||||
const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
|
const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
|
||||||
settings.jellyfin.apiKey = apiKey;
|
settings.jellyfin.apiKey = apiKey;
|
||||||
|
} catch {
|
||||||
|
throw new Error(
|
||||||
|
"Failed to create Jellyfin API token from admin account. Please check your network configuration or edit your settings.json by adding an 'apiKey' field inside of the 'jellyfin' section to fix this issue."
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return settings;
|
return settings;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable no-console */
|
|
||||||
import type { AllSettings } from '@server/lib/settings';
|
import type { AllSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import fs from 'fs/promises';
|
import fs from 'fs/promises';
|
||||||
@@ -45,10 +44,20 @@ export const runMigrations = async (
|
|||||||
}
|
}
|
||||||
migrated = newSettings;
|
migrated = newSettings;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(`Error while running migration '${migration}'`, {
|
// we stop jellyseerr if the migration failed
|
||||||
|
logger.error(
|
||||||
|
`Error while running migration '${migration}': ${e.message}`,
|
||||||
|
{
|
||||||
label: 'Settings Migrator',
|
label: 'Settings Migrator',
|
||||||
});
|
}
|
||||||
throw e;
|
);
|
||||||
|
logger.error(
|
||||||
|
'A common cause for this error is a permission issue with your configuration folder, a network issue or a corrupted database.',
|
||||||
|
{
|
||||||
|
label: 'Settings Migrator',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
process.exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,22 +81,18 @@ export const runMigrations = async (
|
|||||||
await fs.writeFile(BACKUP_PATH, oldBackup.toString());
|
await fs.writeFile(BACKUP_PATH, oldBackup.toString());
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
// we stop jellyseerr if the migration failed
|
||||||
logger.error(
|
logger.error(
|
||||||
`Something went wrong while running settings migrations: ${e.message}`,
|
`Something went wrong while running settings migrations: ${e.message}`,
|
||||||
{ label: 'Settings Migrator' }
|
{
|
||||||
|
label: 'Settings Migrator',
|
||||||
|
}
|
||||||
);
|
);
|
||||||
// we stop jellyseerr if the migration failed
|
logger.error(
|
||||||
console.log(
|
'A common cause for this issue is a permission error of your configuration folder.',
|
||||||
'===================================================================='
|
{
|
||||||
);
|
label: 'Settings Migrator',
|
||||||
console.log(
|
}
|
||||||
' SOMETHING WENT WRONG WHILE RUNNING SETTINGS MIGRATIONS '
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
' Please check that your configuration folder is properly set up '
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
'===================================================================='
|
|
||||||
);
|
);
|
||||||
process.exit();
|
process.exit();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user