From 91c2f7f0d5106bdfd4a0ff2c14b7e44acc3baee6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 8 May 2025 13:11:51 -0700 Subject: [PATCH 1/4] Remove DB settings from settings service --- server/controllers/settingsController.js | 1 + server/db/models/AppSettings.js | 45 ++--------------------- server/db/mongo/MongoDB.js | 6 +-- server/db/mongo/modules/settingsModule.js | 3 +- server/index.js | 16 ++++---- server/service/settingsService.js | 39 +++----------------- 6 files changed, 24 insertions(+), 86 deletions(-) diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js index 54643dfbb..561ea8266 100755 --- a/server/controllers/settingsController.js +++ b/server/controllers/settingsController.js @@ -32,6 +32,7 @@ class SettingsController { } try { + console.log(req.body); await this.db.updateAppSettings(req.body); const updatedSettings = { ...(await this.settingsService.reloadSettings()) }; delete updatedSettings.jwtSecret; diff --git a/server/db/models/AppSettings.js b/server/db/models/AppSettings.js index 6415b229d..3942305e8 100755 --- a/server/db/models/AppSettings.js +++ b/server/db/models/AppSettings.js @@ -2,44 +2,9 @@ import mongoose from "mongoose"; const AppSettingsSchema = mongoose.Schema( { - apiBaseUrl: { + language: { type: String, - required: true, - default: "http://localhost:5000/api/v1", - }, - logLevel: { - type: String, - default: "debug", - enum: ["debug", "none", "error", "warn"], - }, - clientHost: { - type: String, - required: true, - default: "http://localhost:5173", - }, - jwtSecret: { - type: String, - required: true, - default: "my_secret", - }, - dbType: { - type: String, - required: true, - default: "MongoDB", - }, - dbConnectionString: { - type: String, - required: true, - default: "mongodb://localhost:27017/uptime_db", - }, - redisUrl: { - type: String, - default: "redis://127.0.0.1:6379", - }, - jwtTTL: { - type: String, - required: true, - default: "2h", + default: "gb", }, pagespeedApiKey: { type: String, @@ -47,19 +12,15 @@ const AppSettingsSchema = mongoose.Schema( }, systemEmailHost: { type: String, - default: "smtp.gmail.com", }, systemEmailPort: { type: Number, - default: 465, }, systemEmailAddress: { type: String, - default: "", }, systemEmailPassword: { type: String, - default: "", }, singleton: { type: Boolean, @@ -73,4 +34,4 @@ const AppSettingsSchema = mongoose.Schema( } ); -export default mongoose.model("AppSettings", AppSettingsSchema); \ No newline at end of file +export default mongoose.model("AppSettings", AppSettingsSchema); diff --git a/server/db/mongo/MongoDB.js b/server/db/mongo/MongoDB.js index dd9826de5..b657caec4 100755 --- a/server/db/mongo/MongoDB.js +++ b/server/db/mongo/MongoDB.js @@ -76,7 +76,8 @@ import * as diagnosticModule from "./modules/diagnosticModule.js"; class MongoDB { static SERVICE_NAME = "MongoDB"; - constructor() { + constructor({ appSettings }) { + this.appSettings = appSettings; Object.assign(this, userModule); Object.assign(this, inviteModule); Object.assign(this, recoveryModule); @@ -95,8 +96,7 @@ class MongoDB { connect = async () => { try { const connectionString = - process.env.DB_CONNECTION_STRING || "mongodb://localhost:27017/uptime_db"; - console.log("Connecting to MongoDB with connection string:", connectionString); + this.appSettings.dbConnectionString || "mongodb://localhost:27017/uptime_db"; await mongoose.connect(connectionString); // If there are no AppSettings, create one await AppSettings.findOneAndUpdate( diff --git a/server/db/mongo/modules/settingsModule.js b/server/db/mongo/modules/settingsModule.js index 3b5f68e19..b817d2a32 100755 --- a/server/db/mongo/modules/settingsModule.js +++ b/server/db/mongo/modules/settingsModule.js @@ -14,10 +14,11 @@ const getAppSettings = async () => { const updateAppSettings = async (newSettings) => { try { + console.log(newSettings); const settings = await AppSettings.findOneAndUpdate( {}, { $set: newSettings }, - { new: true } + { new: true, upsert: true } ); return settings; } catch (error) { diff --git a/server/index.js b/server/index.js index 5fa10bcab..f7cab5dbe 100755 --- a/server/index.js +++ b/server/index.js @@ -139,19 +139,21 @@ const shutdown = async () => { // Need to wrap server setup in a function to handle async nature of JobQueue const startApp = async () => { const app = express(); - const allowedOrigin = process.env.CLIENT_HOST; // Create and Register Primary services const translationService = new TranslationService(logger); const stringService = new StringService(translationService); ServiceRegistry.register(StringService.SERVICE_NAME, stringService); - // Create DB - const db = new MongoDB(); - await db.connect(); - // Create services const settingsService = new SettingsService(AppSettings); - await settingsService.loadSettings(); + const appSettings = settingsService.loadSettings(); + + // Create DB + const db = new MongoDB({ appSettings }); + await db.connect(); + + // Set allowed origin + const allowedOrigin = appSettings.clientHost; const networkService = new NetworkService( axios, @@ -237,7 +239,7 @@ const startApp = async () => { ServiceRegistry.get(SettingsService.SERVICE_NAME), ServiceRegistry.get(JobQueue.SERVICE_NAME), ServiceRegistry.get(StringService.SERVICE_NAME), - ServiceRegistry.get(EmailService.SERVICE_NAME), + ServiceRegistry.get(EmailService.SERVICE_NAME) ); const settingsController = new SettingsController( diff --git a/server/service/settingsService.js b/server/service/settingsService.js index 6c7beb456..7c522de96 100755 --- a/server/service/settingsService.js +++ b/server/service/settingsService.js @@ -1,6 +1,4 @@ const SERVICE_NAME = "SettingsService"; -import dotenv from "dotenv"; -dotenv.config(); const envConfig = { logLevel: process.env.LOG_LEVEL, clientHost: process.env.CLIENT_HOST, @@ -20,8 +18,6 @@ const envConfig = { * SettingsService * * This service is responsible for loading and managing the application settings. - * It gives priority to environment variables and will only load settings - * from the database if they are not set in the environment. */ class SettingsService { static SERVICE_NAME = SERVICE_NAME; @@ -34,40 +30,17 @@ class SettingsService { this.settings = { ...envConfig }; } /** - * Load settings from the database and merge with environment settings. - * If there are any settings that weren't set by environment variables, use user settings from the database. - * @returns {Promise} The merged settings. - * @throws Will throw an error if settings are not found in the database or if settings have not been loaded. - */ async loadSettings() { - try { - const dbSettings = await this.appSettings.findOne(); - if (!this.settings) { - throw new Error("Settings not found"); - } - - // If there are any settings that weren't set by environment variables, use user settings from DB - for (const key in envConfig) { - if ( - typeof envConfig?.[key] === "undefined" && - typeof dbSettings?.[key] !== "undefined" - ) { - this.settings[key] = dbSettings[key]; - } - } - - await this.appSettings.updateOne({}, { $set: this.settings }, { upsert: true }); - return this.settings; - } catch (error) { - error.service === undefined ? (error.service = SERVICE_NAME) : null; - error.method === undefined ? (error.method = "loadSettings") : null; - throw error; - } + * Load settings from env settings + * @returns {Object>} The settings. + */ + loadSettings() { + return this.settings; } /** * Reload settings by calling loadSettings. * @returns {Promise} The reloaded settings. */ - async reloadSettings() { + reloadSettings() { return this.loadSettings(); } /** From 7a855ef47adf2265121c236097059c7c6555fd7c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 8 May 2025 13:24:24 -0700 Subject: [PATCH 2/4] return db settings only to client, sanitize keys --- server/controllers/settingsController.js | 18 ++++++++---------- server/service/settingsService.js | 5 +++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js index 561ea8266..4d561216e 100755 --- a/server/controllers/settingsController.js +++ b/server/controllers/settingsController.js @@ -11,16 +11,15 @@ class SettingsController { } getAppSettings = async (req, res, next) => { - try { - const settings = { ...(await this.settingsService.getSettings()) }; - delete settings.jwtSecret; - return res.success({ - msg: this.stringService.getAppSettings, - data: settings, - }); - } catch (error) { - next(handleError(error, SERVICE_NAME, "getAppSettings")); + const dbSettings = await this.settingsService.getDBSettings(); + const sanitizedSettings = { ...dbSettings }; + if (typeof sanitizedSettings.pagespeedApiKey !== "undefined") { + sanitizedSettings.pagespeedApiKey = "********"; } + return res.success({ + msg: this.stringService.getAppSettings, + data: sanitizedSettings, + }); }; updateAppSettings = async (req, res, next) => { @@ -32,7 +31,6 @@ class SettingsController { } try { - console.log(req.body); await this.db.updateAppSettings(req.body); const updatedSettings = { ...(await this.settingsService.reloadSettings()) }; delete updatedSettings.jwtSecret; diff --git a/server/service/settingsService.js b/server/service/settingsService.js index 7c522de96..6a673daa4 100755 --- a/server/service/settingsService.js +++ b/server/service/settingsService.js @@ -54,6 +54,11 @@ class SettingsService { } return this.settings; } + + async getDBSettings() { + const settings = await this.appSettings.findOne({ singleton: true }).lean(); + return settings; + } } export default SettingsService; From 57d87114dec5243f92107e70b70f1467ac34a833 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 8 May 2025 13:44:59 -0700 Subject: [PATCH 3/4] add a temp api key field to separate control state form visual state --- client/src/Pages/Settings/index.jsx | 78 +++++++++++++---------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx index 554ee6857..79e5ea657 100644 --- a/client/src/Pages/Settings/index.jsx +++ b/client/src/Pages/Settings/index.jsx @@ -1,5 +1,5 @@ // Components -import { Box, Stack, Typography, Button, Switch } from "@mui/material"; +import { Box, Stack, Typography, Button } from "@mui/material"; import TextInput from "../../Components/Inputs/TextInput"; import Link from "../../Components/Link"; import Select from "../../Components/Inputs/Select"; @@ -25,12 +25,7 @@ import { } from "../../Features/UptimeMonitors/uptimeMonitorsSlice"; import { update } from "../../Features/Auth/authSlice"; import PropTypes from "prop-types"; -import { - setTimezone, - setMode, - setDistributedUptimeEnabled, - setLanguage, -} from "../../Features/UI/uiSlice"; +import { setTimezone, setMode, setLanguage } from "../../Features/UI/uiSlice"; import timezones from "../../Utils/timezones.json"; import { useState, useEffect } from "react"; import { networkService } from "../../main"; @@ -52,15 +47,18 @@ const Settings = () => { const { isLoading: authIsLoading } = useSelector((state) => state.auth); const { timezone, distributedUptimeEnabled } = useSelector((state) => state.ui); const { mode } = useSelector((state) => state.ui); + const { pagespeedApiKey } = useSelector((state) => state.settings); const [checksIsLoading, setChecksIsLoading] = useState(false); const [form, setForm] = useState({ enableDistributedUptime: distributedUptimeEnabled, ttl: checkTTL ? (checkTTL / SECONDS_PER_DAY).toString() : 0, - pagespeedApiKey: "", + pagespeedApiKey: pagespeedApiKey, }); + const [version, setVersion] = useState("unknown"); const [apiKeyFieldType, setApiKeyFieldType] = useState("password"); - const [isApiKeySet, setIsApiKeySet] = useState(false); + const [isApiKeySet, setIsApiKeySet] = useState(pagespeedApiKey ? true : false); + const [tempPSKey, setTempPSKey] = useState(""); const [errors, setErrors] = useState({}); const deleteStatsMonitorsInitState = { deleteMonitors: false, deleteStats: false }; const [isOpen, setIsOpen] = useState(deleteStatsMonitorsInitState); @@ -87,25 +85,7 @@ const Settings = () => { useEffect(() => { dispatch(getAppSettings()); - }, []); - - const { pagespeedApiKey } = useSelector((state) => state.settings); - - useEffect(() => { - if (pagespeedApiKey) { - setIsApiKeySet(true); - setForm((prev) => ({ - ...prev, - pagespeedApiKey: t("maskedPageSpeedKeyPlaceholder"), - })); - } else { - setIsApiKeySet(false); - setForm((prev) => ({ - ...prev, - pagespeedApiKey: "", - })); - } - }, [pagespeedApiKey]); + }, [dispatch]); const handleChange = (event) => { const { type, checked, value, id } = event.target; @@ -118,16 +98,18 @@ const Settings = () => { return; } + if (id === "pagespeedApiKey") { + setTempPSKey(value); + return; + } + let inputValue = value; if (id === "ttl") { inputValue = value.replace(/[^0-9]/g, ""); } const updatedForm = { ...form, [id]: inputValue }; - const { error } = settingsValidation.validate( - updatedForm, - { abortEarly: false } - ); + const { error } = settingsValidation.validate(updatedForm, { abortEarly: false }); if (!error || error.details.length === 0) { setErrors({}); @@ -139,7 +121,7 @@ const Settings = () => { setErrors(newErrors); logger.error("Validation errors:", error.details); } - + setForm(updatedForm); }; @@ -153,7 +135,14 @@ const Settings = () => { const updatedUser = { ...user, checkTTL: form.ttl }; const [userAction, settingsAction] = await Promise.all([ dispatch(update({ localData: updatedUser })), - dispatch(updateAppSettings({ settings: { language: language, pagespeedApiKey: form.pagespeedApiKey } })), + dispatch( + updateAppSettings({ + settings: { + language: language, + pagespeedApiKey: tempPSKey ? tempPSKey : form.pagespeedApiKey, + }, + }) + ), ]); if (userAction.payload.success && settingsAction.payload.success) { @@ -221,7 +210,7 @@ const Settings = () => { ...prev, pagespeedApiKey: "", })); - }; + }; const languages = Object.keys(i18n.options.resources || {}); @@ -324,7 +313,7 @@ const Settings = () => { { } /> {isApiKeySet && ( - - {t("pageSpeedApiKeyFieldResetLabel")} - - + + {t("pageSpeedApiKeyFieldResetLabel")} + + )} From 5d0877d91db090dd8de9de06ad58e5547a00e2cc Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 9 May 2025 09:33:35 -0700 Subject: [PATCH 4/4] use port 52345 for server by default --- docker/dev/docker-compose.yaml | 4 ++-- docker/dev/nginx/conf.d/default.conf | 18 +++++++++--------- docker/dev/server.Dockerfile | 2 +- docker/dist/server.Dockerfile | 2 +- docker/prod/docker-compose.yaml | 2 +- docker/prod/nginx/conf.d/default.conf | 8 ++++---- docker/prod/server.Dockerfile | 2 +- docker/staging/docker-compose.yaml | 2 +- docker/staging/nginx/conf.d/default.conf | 8 ++++---- docker/staging/server.Dockerfile | 2 +- server/index.js | 7 +++---- server/service/settingsService.js | 17 ++++++++++------- 12 files changed, 38 insertions(+), 36 deletions(-) diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml index 73904da37..50b573d38 100755 --- a/docker/dev/docker-compose.yaml +++ b/docker/dev/docker-compose.yaml @@ -5,7 +5,7 @@ services: ports: - "80:80" environment: - UPTIME_APP_API_BASE_URL: "http://localhost:5000/api/v1" + UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1" UPTIME_APP_CLIENT_HOST: "http://localhost" volumes: - ./nginx/conf.d:/etc/nginx/conf.d/ @@ -15,7 +15,7 @@ services: image: uptime_server:latest restart: always ports: - - "5000:5000" + - "52345:52345" env_file: - server.env depends_on: diff --git a/docker/dev/nginx/conf.d/default.conf b/docker/dev/nginx/conf.d/default.conf index 9a7690aa5..e2c2a7268 100755 --- a/docker/dev/nginx/conf.d/default.conf +++ b/docker/dev/nginx/conf.d/default.conf @@ -12,7 +12,7 @@ server { } # location /api/ { - # proxy_pass http://server:5000/api/; + # proxy_pass http://server:52345/api/; # proxy_http_version 1.1; # proxy_set_header Host $host; # proxy_set_header X-Real-IP $remote_addr; @@ -24,12 +24,12 @@ server { # proxy_cache off; # } - location /api-docs/ { - proxy_pass http://server:5000/api-docs/; - proxy_http_version 1.1; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } + # location /api-docs/ { + # proxy_pass http://server:52345/api-docs/; + # proxy_http_version 1.1; + # proxy_set_header Host $host; + # proxy_set_header X-Real-IP $remote_addr; + # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # proxy_set_header X-Forwarded-Proto $scheme; + # } } \ No newline at end of file diff --git a/docker/dev/server.Dockerfile b/docker/dev/server.Dockerfile index 202422dcc..d9d99a09d 100755 --- a/docker/dev/server.Dockerfile +++ b/docker/dev/server.Dockerfile @@ -8,6 +8,6 @@ RUN npm install COPY ./server/ ./ -EXPOSE 5000 +EXPOSE 52345 CMD ["node", "index.js"] \ No newline at end of file diff --git a/docker/dist/server.Dockerfile b/docker/dist/server.Dockerfile index 202422dcc..d9d99a09d 100755 --- a/docker/dist/server.Dockerfile +++ b/docker/dist/server.Dockerfile @@ -8,6 +8,6 @@ RUN npm install COPY ./server/ ./ -EXPOSE 5000 +EXPOSE 52345 CMD ["node", "index.js"] \ No newline at end of file diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml index bc720862f..db142396d 100755 --- a/docker/prod/docker-compose.yaml +++ b/docker/prod/docker-compose.yaml @@ -25,7 +25,7 @@ services: image: ghcr.io/bluewave-labs/checkmate:backend-demo restart: always ports: - - "5000:5000" + - "52345:52345" env_file: - server.env depends_on: diff --git a/docker/prod/nginx/conf.d/default.conf b/docker/prod/nginx/conf.d/default.conf index 98e1bd97d..8afeb93b7 100755 --- a/docker/prod/nginx/conf.d/default.conf +++ b/docker/prod/nginx/conf.d/default.conf @@ -16,7 +16,7 @@ server { } location /api/ { - proxy_pass http://server:5000/api/; + proxy_pass http://server:52345/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -25,7 +25,7 @@ server { } location /api-docs/ { - proxy_pass http://server:5000/api-docs/; + proxy_pass http://server:52345/api-docs/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -50,7 +50,7 @@ server { } location /api/ { - proxy_pass http://server:5000/api/; + proxy_pass http://server:52345/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -59,7 +59,7 @@ server { } location /api-docs/ { - proxy_pass http://server:5000/api-docs/; + proxy_pass http://server:52345/api-docs/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docker/prod/server.Dockerfile b/docker/prod/server.Dockerfile index 998bbe4fe..c80f468f8 100755 --- a/docker/prod/server.Dockerfile +++ b/docker/prod/server.Dockerfile @@ -10,6 +10,6 @@ RUN npm install COPY ./server ./ -EXPOSE 5000 +EXPOSE 52345 CMD ["node", "index.js"] \ No newline at end of file diff --git a/docker/staging/docker-compose.yaml b/docker/staging/docker-compose.yaml index d491a729e..b9ca52b6e 100755 --- a/docker/staging/docker-compose.yaml +++ b/docker/staging/docker-compose.yaml @@ -27,7 +27,7 @@ services: image: ghcr.io/bluewave-labs/checkmate:backend-staging restart: always ports: - - "5000:5000" + - "52345:52345" env_file: - server.env depends_on: diff --git a/docker/staging/nginx/conf.d/default.conf b/docker/staging/nginx/conf.d/default.conf index 4ea324b11..c755ddef1 100755 --- a/docker/staging/nginx/conf.d/default.conf +++ b/docker/staging/nginx/conf.d/default.conf @@ -16,7 +16,7 @@ server { } location /api/ { - proxy_pass http://server:5000/api/; + proxy_pass http://server:52345/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -29,7 +29,7 @@ server { } location /api-docs/ { - proxy_pass http://server:5000/api-docs/; + proxy_pass http://server:52345/api-docs/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -54,7 +54,7 @@ server { } location /api/ { - proxy_pass http://server:5000/api/; + proxy_pass http://server:52345/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -67,7 +67,7 @@ server { } location /api-docs/ { - proxy_pass http://server:5000/api-docs/; + proxy_pass http://server:52345/api-docs/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docker/staging/server.Dockerfile b/docker/staging/server.Dockerfile index 998bbe4fe..c80f468f8 100755 --- a/docker/staging/server.Dockerfile +++ b/docker/staging/server.Dockerfile @@ -10,6 +10,6 @@ RUN npm install COPY ./server ./ -EXPOSE 5000 +EXPOSE 52345 CMD ["node", "index.js"] \ No newline at end of file diff --git a/server/index.js b/server/index.js index f7cab5dbe..f299b32e9 100755 --- a/server/index.js +++ b/server/index.js @@ -100,8 +100,6 @@ const openApiSpec = JSON.parse( let server; -const PORT = 5000; - const shutdown = async () => { if (isShuttingDown) { return; @@ -217,8 +215,9 @@ const startApp = async () => { await translationService.initialize(); - server = app.listen(PORT, () => { - logger.info({ message: `server started on port:${PORT}` }); + const port = appSettings.port || 52345; + server = app.listen(port, () => { + logger.info({ message: `Server started on port:${port}` }); }); process.on("SIGUSR2", shutdown); diff --git a/server/service/settingsService.js b/server/service/settingsService.js index 6a673daa4..548d76eee 100755 --- a/server/service/settingsService.js +++ b/server/service/settingsService.js @@ -1,18 +1,21 @@ const SERVICE_NAME = "SettingsService"; const envConfig = { + nodeEnv: process.env.NODE_ENV, logLevel: process.env.LOG_LEVEL, - clientHost: process.env.CLIENT_HOST, - jwtSecret: process.env.JWT_SECRET, - dbType: process.env.DB_TYPE, - dbConnectionString: process.env.DB_CONNECTION_STRING, - redisUrl: process.env.REDIS_URL, - jwtTTL: process.env.TOKEN_TTL, - pagespeedApiKey: process.env.PAGESPEED_API_KEY, systemEmailHost: process.env.SYSTEM_EMAIL_HOST, systemEmailPort: process.env.SYSTEM_EMAIL_PORT, systemEmailUser: process.env.SYSTEM_EMAIL_USER, systemEmailAddress: process.env.SYSTEM_EMAIL_ADDRESS, systemEmailPassword: process.env.SYSTEM_EMAIL_PASSWORD, + jwtSecret: process.env.JWT_SECRET, + jwtTTL: process.env.TOKEN_TTL, + clientHost: process.env.CLIENT_HOST, + dbConnectionString: process.env.DB_CONNECTION_STRING, + redisUrl: process.env.REDIS_URL, + callbackUrl: process.env.CALLBACK_URL, + port: process.env.PORT, + pagespeedApiKey: process.env.PAGESPEED_API_KEY, + uprockApiKey: process.env.UPROCK_API_KEY, }; /** * SettingsService