diff --git a/docker-compose.yml b/docker-compose.yml index 8f841ec..7a6dbf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,18 +50,17 @@ services: context: ./src/ args: - SERVICE=auth - - EXTRA_FILES=auth/extra - container_name: app-auth + container_name: app-auth restart: always networks: - app volumes: - sqlite-volume:/volumes/database - static-volume:/volumes/static + - ./src/auth/config:/config environment: - JWT_SECRET=KRUGKIDROVUWG2ZAMJZG653OEBTG66BANJ2W24DTEBXXMZLSEB2GQZJANRQXU6JA - DATABASE_DIR=/volumes/database - - PROVIDER_FILE=/extra/providers.toml logging: driver: gelf options: diff --git a/src/auth/extra/.gitignore b/src/auth/config/.gitignore similarity index 100% rename from src/auth/extra/.gitignore rename to src/auth/config/.gitignore diff --git a/src/auth/extra/providers.schema.json b/src/auth/config/providers.schema.json similarity index 100% rename from src/auth/extra/providers.schema.json rename to src/auth/config/providers.schema.json diff --git a/src/auth/extra/providers.toml.template b/src/auth/config/providers.toml.template similarity index 100% rename from src/auth/extra/providers.toml.template rename to src/auth/config/providers.toml.template diff --git a/src/auth/extra/.gitkeep b/src/auth/extra/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/auth/extra/login_demo.html b/src/auth/extra/login_demo.html deleted file mode 100644 index 2fdf536..0000000 --- a/src/auth/extra/login_demo.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/src/auth/extra/login_demo.js b/src/auth/extra/login_demo.js deleted file mode 100644 index 75b23c4..0000000 --- a/src/auth/extra/login_demo.js +++ /dev/null @@ -1,4 +0,0 @@ -// const headers = { -// 'Accept': 'application/json', -// 'Content-Type': 'application/json', -// }; diff --git a/src/auth/src/plugins/providers.ts b/src/auth/src/plugins/providers.ts index cf58c13..0fc5620 100644 --- a/src/auth/src/plugins/providers.ts +++ b/src/auth/src/plugins/providers.ts @@ -69,7 +69,7 @@ export type ProviderMap = T.Static; export type ProviderMapFile = T.Static; async function buildProviderMap(): Promise { - const providerFile = process.env.PROVIDER_FILE; + const providerFile = process.env.PROVIDER_FILE ?? '/config/providers.toml'; if (isNullish(providerFile)) return {}; try { await access(providerFile, fsConstants.F_OK | fsConstants.R_OK);