mirror of
https://github.com/fosrl/pangolin.git
synced 2026-02-22 12:56:37 +00:00
use config file instead of env
This commit is contained in:
@@ -11,7 +11,7 @@ import { User, users } from "@server/db/schema";
|
||||
import { eq } from "drizzle-orm";
|
||||
import { verify } from "@node-rs/argon2";
|
||||
import { createTOTPKeyURI } from "oslo/otp";
|
||||
import env from "@server/environment";
|
||||
import config from "@server/config";
|
||||
|
||||
export const requestTotpSecretBody = z.object({
|
||||
password: z.string(),
|
||||
@@ -65,7 +65,7 @@ export async function requestTotpSecret(
|
||||
|
||||
const hex = crypto.getRandomValues(new Uint8Array(20));
|
||||
const secret = encodeHex(hex);
|
||||
const uri = createTOTPKeyURI(env.APP_NAME, user.email, hex);
|
||||
const uri = createTOTPKeyURI(config.app.name, user.email, hex);
|
||||
|
||||
await db
|
||||
.update(users)
|
||||
|
||||
@@ -5,7 +5,7 @@ import { users, emailVerificationCodes } from "@server/db/schema";
|
||||
import { eq } from "drizzle-orm";
|
||||
import { sendEmail } from "@server/emails";
|
||||
import VerifyEmail from "@server/emails/templates/verifyEmailCode";
|
||||
import env from "@server/environment";
|
||||
import config from "@server/config";
|
||||
|
||||
export async function sendEmailVerificationCode(
|
||||
email: string,
|
||||
@@ -15,7 +15,7 @@ export async function sendEmailVerificationCode(
|
||||
|
||||
await sendEmail(VerifyEmail({ username: email, verificationCode: code }), {
|
||||
to: email,
|
||||
from: env.EMAIL_NOREPLY!,
|
||||
from: config.email?.no_reply,
|
||||
subject: "Verify your email address",
|
||||
});
|
||||
}
|
||||
|
||||
@@ -24,8 +24,6 @@ export async function verifyUser(
|
||||
): Promise<any> {
|
||||
const parsedBody = verifyUserBody.safeParse(req.query);
|
||||
|
||||
logger.debug("Parsed body", parsedBody);
|
||||
|
||||
if (!parsedBody.success) {
|
||||
return next(
|
||||
createHttpError(
|
||||
@@ -40,9 +38,6 @@ export async function verifyUser(
|
||||
try {
|
||||
const { session, user } = await lucia.validateSession(sessionId);
|
||||
|
||||
logger.debug("Session", session);
|
||||
logger.debug("User", user);
|
||||
|
||||
if (!session || !user) {
|
||||
return next(
|
||||
createHttpError(HttpCode.UNAUTHORIZED, "Invalid session"),
|
||||
|
||||
@@ -5,14 +5,13 @@ import { DynamicTraefikConfig } from "./configSchema";
|
||||
import { and, like, eq } from "drizzle-orm";
|
||||
import logger from "@server/logger";
|
||||
import HttpCode from "@server/types/HttpCode";
|
||||
import env from "@server/environment";
|
||||
import environment from "@server/environment";
|
||||
import env from "@server/config";
|
||||
import config from "@server/config";
|
||||
|
||||
export async function traefikConfigProvider(_: Request, res: Response) {
|
||||
try {
|
||||
const targets = await getAllTargets();
|
||||
const traefikConfig = buildTraefikConfig(targets);
|
||||
// logger.debug("Built traefik config");
|
||||
res.status(HttpCode.OK).json(traefikConfig);
|
||||
} catch (e) {
|
||||
logger.error(`Failed to build traefik config: ${e}`);
|
||||
@@ -32,35 +31,13 @@ export function buildTraefikConfig(
|
||||
}
|
||||
|
||||
const http: DynamicTraefikConfig["http"] = {
|
||||
routers: {
|
||||
"themainwebpage": {
|
||||
"entryPoints": [
|
||||
"http"
|
||||
],
|
||||
"middlewares": [
|
||||
],
|
||||
"service": "service-themainwebpage",
|
||||
"rule": "Host(`testing123.io`)"
|
||||
},
|
||||
},
|
||||
services: {
|
||||
"service-themainwebpage": {
|
||||
"loadBalancer": {
|
||||
"servers": [
|
||||
{
|
||||
"url": `http://${environment.APP_NAME.toLowerCase()}:3000`
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
},
|
||||
routers: {},
|
||||
services: {},
|
||||
middlewares: {
|
||||
[middlewareName]: {
|
||||
plugin: {
|
||||
[middlewareName]: {
|
||||
apiBaseUrl: `http://${environment.APP_NAME.toLowerCase()}:3001/api/v1`,
|
||||
// appBaseUrl: env.BASE_URL,
|
||||
appBaseUrl: "http://testing123.io:8081",
|
||||
apiBaseUrl: config.app.internal_base_url,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user