Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-19 13:11:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified .env

Browse Source
This commit is contained in:
chesspro13 2024-09-07 15:00:12 -07:00
parent 06da11ff41
commit 55b0f0e3f4
No known key found for this signature in database
GPG Key ID: 5FEAE94D298066E5
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example.env
View File

@ -1,9 +1,7 @@
OAUTH_ENABLED="false" SSO_ENABLED="false"
BASE_URL="http://localhost:8080" BASE_URL="http://localhost:8080"
CLIENT_ID="1234" CLIENT_ID="1234"
ISSUER_BASE_URL="https://example.com/xyz/.well-known/openid-configuration"
SECRET="I-Like-Trilium-Notes" SECRET="I-Like-Trilium-Notes"
AUTH_0_LOGOUT="false"
TOTP_ENABLED="false" TOTP_ENABLED="false"
TOTP_SECRET="Trilium-Notes-is-the-best" TOTP_SECRET="Trilium-Notes-is-the-best"

2
src/public/app/widgets/type_widgets/options/multi_factor_authentication.js
View File

@ -175,7 +175,7 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
this.$UserAccountEmail.text(result.email); this.$UserAccountEmail.text(result.email);
}else }else
this.$envEnabledOAuth.text( this.$envEnabledOAuth.text(
"set OAUTH_ENABLED as environment variable to 'true' to enable (Requires restart)" "set SSO_ENABLED as environment variable to 'true' to enable (Requires restart)"
); );
}); });

20
src/services/open_id.ts
View File

@ -35,10 +35,10 @@ function clearSavedUser() {
} }
function checkOpenIDRequirements() { function checkOpenIDRequirements() {
if (process.env.OAUTH_ENABLED === undefined) { if (process.env.SSO_ENABLED === undefined) {
return false; return false;
} }
if (process.env.OAUTH_ENABLED.toLocaleLowerCase() !== "true") { if (process.env.SSO_ENABLED.toLocaleLowerCase() !== "true") {
return false; return false;
} }
@ -48,15 +48,9 @@ function checkOpenIDRequirements() {
if (process.env.CLIENT_ID === undefined) { if (process.env.CLIENT_ID === undefined) {
throw new OpenIDError("CLIENT_ID is undefined in .env!"); throw new OpenIDError("CLIENT_ID is undefined in .env!");
} }
if (process.env.ISSUER_BASE_URL === undefined) {
throw new OpenIDError("ISSUER_BASE_URL is undefined in .env!");
}
if (process.env.SECRET === undefined) { if (process.env.SECRET === undefined) {
throw new OpenIDError("SECRET is undefined in .env!"); throw new OpenIDError("SECRET is undefined in .env!");
} }
if (process.env.AUTH_0_LOGOUT === undefined) {
throw new OpenIDError("AUTH_0_LOGOUT is undefined in .env!");
}
return true; return true;
} }
@ -100,12 +94,6 @@ function isTokenValid(req: Request, res: Response, next: NextFunction) {
} }
} }
function checkAuth0Logout() {
if (process.env.AUTH_0_LOGOUT === undefined) return false;
if (process.env.AUTH_0_LOGOUT.toLocaleLowerCase() === "true") return true;
return false;
}
function generateOAuthConfig() { function generateOAuthConfig() {
const authRoutes = { const authRoutes = {
callback: "/callback", callback: "/callback",
@ -119,10 +107,10 @@ function generateOAuthConfig() {
const authConfig = { const authConfig = {
authRequired: true, authRequired: true,
auth0Logout: checkAuth0Logout(), auth0Logout: false,
baseURL: process.env.BASE_URL, baseURL: process.env.BASE_URL,
clientID: process.env.CLIENT_ID, clientID: process.env.CLIENT_ID,
issuerBaseURL: process.env.ISSUER_BASE_URL, issuerBaseURL: "https://accounts.google.com/.well-known/openid-configuration",
secret: process.env.SECRET, secret: process.env.SECRET,
clientSecret: process.env.SECRET, clientSecret: process.env.SECRET,
authorizationParams: { authorizationParams: {