QingWei-Li/notea
1
1
Fork 0
mirror of https://github.com/QingWei-Li/notea.git synced 2024-11-29 12:53:00 +03:00
Code Issues Projects Releases Wiki Activity

change(config): Add server field to config

Browse Source 
server: The `server` field will just contain things related to the server. I dunno how to explain it, but it's for that.
useSecureCookies: `server.useSecureCookies` is the equivalent of `COOKIE_SECURE`.
config/compatibility.yml: Add documentation for the new `server` field.
This commit is contained in:
tecc 2022-09-24 16:16:09 +02:00
parent 777f958349
commit c83f55219d
No known key found for this signature in database
GPG Key ID: 400AAD881FCC028B
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/compatibility.yml
View File

@ -26,5 +26,10 @@ store:
# proxyAttachments is the same as DIRECT_RESPONSE_ATTACHMENT; defaults to false
proxyAttachments: true
# Server configuration
server:
# useSecureConfig is the same as COOKIE_SECURE; if in production (which is for end-users), it will be true, else it'll be false
useSecureConfig: true
# baseUrl is the same as BASE_URL; not required
baseUrl: https://example.com
baseUrl: https://example.com

17
libs/server/config.ts
View File

@ -31,9 +31,15 @@ export interface S3StoreConfiguration {
export type StoreConfiguration = S3StoreConfiguration;
export interface ServerConfiguration {
useSecureCookies: boolean;
// TODO: Move baseUrl to here
}
export interface Configuration {
auth: AuthConfiguration;
store: StoreConfiguration;
server: ServerConfiguration;
baseUrl?: string;
}
@ -130,9 +136,20 @@ export function loadConfig() {
store.proxyAttachments = env.parseBool(env.getEnvRaw('DIRECT_RESPONSE_ATTACHMENT', false), store.proxyAttachments ?? false);
}
let server: ServerConfiguration;
if (!baseConfig.server) {
server = {} as ServerConfiguration;
} else {
server = baseConfig.server;
}
{
server.useSecureCookies = env.parseBool(env.getEnvRaw('COOKIE_SECURE', false), process.env.NODE_ENV === 'production');
}
loaded = {
auth,
store,
server,
baseUrl: env.getEnvRaw('BASE_URL', false) ?? baseConfig.baseUrl,
};
}