small fixes

actualbudget · Nov 25, 2024 · bddab0c · bddab0c
1 parent 1e449c9
commit bddab0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/account-db.js b/src/account-db.js
@@ -53,7 +53,9 @@ export function getLoginMethod(req) {
     return req.body.loginMethod;
   }
 
-  return config.loginMethod || 'password';
+  const activeMethod = getActiveLoginMethod();
+
+  return config.loginMethod || activeMethod || 'password';
 }
 
 export async function bootstrap(loginSettings) {

diff --git a/src/accounts/openid.js b/src/accounts/openid.js
@@ -304,8 +304,7 @@ export function isValidRedirectUrl(url) {
     const redirectUrl = new URL(url);
     const serverUrl = new URL(serverHostname);
 
-    // Compare origin (protocol + hostname + port)
-    if (redirectUrl.origin === serverUrl.origin) {
+    if (redirectUrl.hostname === serverUrl.hostname) {
       return true;
     } else {
       return false;