mirror of
https://github.com/Drop-OSS/drop.git
synced 2025-11-09 20:12:10 +10:00
fix: eslint errors, switch to using maps
This commit is contained in:
@ -1,7 +1,6 @@
|
||||
import { applicationSettings } from "../internal/config/application-configuration";
|
||||
import prisma from "../internal/db/database";
|
||||
|
||||
export default defineNitroPlugin(async (nitro) => {
|
||||
export default defineNitroPlugin(async () => {
|
||||
// Ensure system user exists
|
||||
// The system user owns any user-based code
|
||||
// that we want to re-use for the app
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import prisma from "../internal/db/database";
|
||||
|
||||
export default defineNitroPlugin(async (nitro) => {
|
||||
export default defineNitroPlugin(async () => {
|
||||
const userCount = await prisma.user.count({
|
||||
where: { id: { not: "system" } },
|
||||
});
|
||||
|
||||
@ -6,20 +6,20 @@ import { IGDBProvider } from "../internal/metadata/igdb";
|
||||
import { ManualMetadataProvider } from "../internal/metadata/manual";
|
||||
import { PCGamingWikiProvider } from "../internal/metadata/pcgamingwiki";
|
||||
|
||||
export default defineNitroPlugin(async (nitro) => {
|
||||
export default defineNitroPlugin(async () => {
|
||||
const metadataProviders = [
|
||||
GiantBombProvider,
|
||||
PCGamingWikiProvider,
|
||||
IGDBProvider,
|
||||
];
|
||||
|
||||
const providers: { [key: string]: MetadataProvider } = {};
|
||||
const providers = new Map<string, MetadataProvider>();
|
||||
|
||||
for (const provider of metadataProviders) {
|
||||
try {
|
||||
const prov = new provider();
|
||||
const id = prov.id();
|
||||
providers[id] = prov;
|
||||
providers.set(id, prov);
|
||||
|
||||
console.log(`enabled metadata provider: ${prov.name()}`);
|
||||
} catch (e) {
|
||||
@ -28,23 +28,22 @@ export default defineNitroPlugin(async (nitro) => {
|
||||
}
|
||||
|
||||
// Add providers based on their position in the application settings
|
||||
const configuredProviderList = await applicationSettings.get(
|
||||
"metadataProviders"
|
||||
);
|
||||
const configuredProviderList =
|
||||
await applicationSettings.get("metadataProviders");
|
||||
const max = configuredProviderList.length;
|
||||
for (const [index, providerId] of configuredProviderList.entries()) {
|
||||
const priority = max * 2 - index; // Offset by the length --- (max - index) + max
|
||||
const provider = providers[providerId];
|
||||
const provider = providers.get(providerId);
|
||||
if (!provider) {
|
||||
console.warn(`failed to add existing metadata provider: ${providerId}`);
|
||||
continue;
|
||||
}
|
||||
metadataHandler.addProvider(provider, priority);
|
||||
delete providers[providerId];
|
||||
providers.delete(providerId);
|
||||
}
|
||||
|
||||
// Add the rest with no position
|
||||
for (const [providerId, provider] of Object.entries(providers)) {
|
||||
for (const [, provider] of Object.entries(providers)) {
|
||||
metadataHandler.addProvider(provider);
|
||||
}
|
||||
|
||||
@ -53,6 +52,6 @@ export default defineNitroPlugin(async (nitro) => {
|
||||
// Update the applicatonConfig
|
||||
await applicationSettings.set(
|
||||
"metadataProviders",
|
||||
metadataHandler.fetchProviderIdsInOrder()
|
||||
metadataHandler.fetchProviderIdsInOrder(),
|
||||
);
|
||||
});
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
import { CertificateAuthority } from "../internal/clients/ca";
|
||||
import fs from "fs";
|
||||
import {
|
||||
dbCertificateStore,
|
||||
fsCertificateStore,
|
||||
} from "../internal/clients/ca-store";
|
||||
import { dbCertificateStore } from "../internal/clients/ca-store";
|
||||
|
||||
let ca: CertificateAuthority | undefined;
|
||||
|
||||
@ -12,7 +8,7 @@ export const useCertificateAuthority = () => {
|
||||
return ca;
|
||||
};
|
||||
|
||||
export default defineNitroPlugin(async (nitro) => {
|
||||
export default defineNitroPlugin(async () => {
|
||||
// const basePath = process.env.CLIENT_CERTIFICATES ?? "./certs";
|
||||
// fs.mkdirSync(basePath, { recursive: true });
|
||||
// const store = fsCertificateStore(basePath);
|
||||
|
||||
@ -13,13 +13,14 @@ export default defineNitroPlugin((nitro) => {
|
||||
|
||||
switch (error.statusCode) {
|
||||
case 401:
|
||||
case 403:
|
||||
case 403: {
|
||||
const user = await sessionHandler.getSession(event);
|
||||
if (user) break;
|
||||
return sendRedirect(
|
||||
event,
|
||||
`/auth/signin?redirect=${encodeURIComponent(event.path)}`
|
||||
`/auth/signin?redirect=${encodeURIComponent(event.path)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user