pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-22 21:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix minor auth issues and set NODE_ENV to solve react email bug

Browse Source
This commit is contained in:
Milo Schwartz
2024-11-27 14:35:38 -05:00
parent 8178dd1525
commit c2cbd7e1a1
10 changed files with 75 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/config.ts
View File

@@ -25,9 +25,6 @@ const environmentSchema = z.object({
secure_cookies: z.boolean(),
signup_secret: z.string().optional(),
session_cookie_name: z.string(),
}),
badger: z.object({
session_query_parameter: z.string(),
resource_session_cookie_name: z.string(),
}),
traefik: z.object({
@@ -136,8 +133,6 @@ process.env.FLAGS_EMAIL_VERIFICATION_REQUIRED = parsedConfig.data.flags
: "false";
process.env.SESSION_COOKIE_NAME = parsedConfig.data.server.session_cookie_name;
process.env.RESOURCE_SESSION_COOKIE_NAME =
parsedConfig.data.badger.resource_session_cookie_name;
process.env.RESOURCE_SESSION_QUERY_PARAM_NAME =
parsedConfig.data.badger.session_query_parameter;
parsedConfig.data.server.resource_session_cookie_name;
export default parsedConfig.data;

2
server/routers/badger/verifySession.ts
View File

@@ -121,7 +121,7 @@ export async function verifyResourceSession(
const resourceSessionToken =
sessions[
`${config.badger.resource_session_cookie_name}_${resource.resourceId}`
`${config.server.resource_session_cookie_name}_${resource.resourceId}`
];
if ((pincode || password) && resourceSessionToken) {

2
server/routers/resource/authWithPassword.ts
View File

@@ -132,7 +132,7 @@ export async function authWithPassword(
token,
passwordId: definedPassword.passwordId,
});
const cookieName = `${config.badger.resource_session_cookie_name}_${resource.resourceId}`;
const cookieName = `${config.server.resource_session_cookie_name}_${resource.resourceId}`;
const cookie = serializeResourceSessionCookie(
cookieName,
token,

2
server/routers/resource/authWithPincode.ts
View File

@@ -128,7 +128,7 @@ export async function authWithPincode(
token,
pincodeId: definedPincode.pincodeId,
});
const cookieName = `${config.badger.resource_session_cookie_name}_${resource.resourceId}`;
const cookieName = `${config.server.resource_session_cookie_name}_${resource.resourceId}`;
const cookie = serializeResourceSessionCookie(
cookieName,
token,

4
server/routers/traefik/getTraefikConfig.ts
View File

@@ -55,11 +55,9 @@ export async function traefikConfigProvider(
`http://${config.server.internal_hostname}:${config.server.internal_port}`,
).href,
resourceSessionCookieName:
config.badger.resource_session_cookie_name,
config.server.resource_session_cookie_name,
userSessionCookieName:
config.server.session_cookie_name,
sessionQueryParameter:
config.badger.session_query_parameter,
},
},
},