🐛 Fixes for OpenID with the new config

packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx

@@ -134,7 +134,7 @@ export function OpenIdForm({
     setLoading(true);
     await onSetOpenId({
       selectedProvider: providerName,
-      issuer: issuer ?? '',
+      discoveryURL: issuer ?? '',
       client_id: clientId ?? '',
       client_secret: clientSecret ?? '',
       server_hostname: serverUrl ?? '',

packages/loot-core/src/server/main.ts

@@ -1267,23 +1267,6 @@ handlers['get-openid-config'] = async function () {
   }
 };
 
-handlers['enable-openid'] = async function (loginConfig) {
-  try {
-    const userToken = await asyncStorage.getItem('user-token');
-
-    if (!userToken) {
-      return { error: 'unauthorized' };
-    }
-
-    await post(getServer().BASE_SERVER + '/openid/enable', loginConfig, {
-      'X-ACTUAL-TOKEN': userToken,
-    });
-  } catch (err) {
-    return { error: err.reason || 'network-failure' };
-  }
-  return {};
-};
-
 handlers['enable-password'] = async function (loginConfig) {
   try {
     const userToken = await asyncStorage.getItem('user-token');

packages/loot-core/src/types/models/openid.d.ts

@@ -1,7 +1,8 @@
 export type OpenIdConfig = {
   selectedProvider: string;
-  issuer: string;
+  issuer?: string;
   client_id: string;
   client_secret: string;
   server_hostname: string;
+  discoveryURL: string;
 };

packages/sync-server/src/accounts/openid.js

@@ -10,7 +10,7 @@ import {
 import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js';
 
 export async function bootstrapOpenId(configParameter) {
-  if (!('issuer' in configParameter) || !('discoveryURL' in configParameter)) {
+  if (!('issuer' in configParameter) && !('discoveryURL' in configParameter)) {
     return { error: 'missing-issuer-or-discoveryURL' };
   }
   if (!('client_id' in configParameter)) {
@@ -24,6 +24,13 @@ export async function bootstrapOpenId(configParameter) {
   }
 
   try {
+    //FOR BACKWARD COMPATIBLITY:
+    //If we don't put discoverURL into the issuer, it will break already enabled openid instances
+    if (configParameter.discoveryURL) {
+      configParameter.issuer = configParameter.discoveryURL;
+      delete configParameter.discoveryURL;
+    }
+
     await setupOpenIdClient(configParameter);
   } catch (err) {
     console.error('Error setting up OpenID client:', err);
@@ -49,14 +56,15 @@ export async function bootstrapOpenId(configParameter) {
 }
 
 async function setupOpenIdClient(configParameter) {
-  const issuer = configParameter.discoveryURL
-    ? await Issuer.discover(configParameter.discoveryURL)
-    : new Issuer({
-        issuer: configParameter.issuer.name,
-        authorization_endpoint: configParameter.issuer.authorization_endpoint,
-        token_endpoint: configParameter.issuer.token_endpoint,
-        userinfo_endpoint: configParameter.issuer.userinfo_endpoint,
-      });
+  const issuer =
+    typeof configParameter.issuer === 'string'
+      ? await Issuer.discover(configParameter.issuer)
+      : new Issuer({
+          issuer: configParameter.issuer.name,
+          authorization_endpoint: configParameter.issuer.authorization_endpoint,
+          token_endpoint: configParameter.issuer.token_endpoint,
+          userinfo_endpoint: configParameter.issuer.userinfo_endpoint,
+        });
 
   const client = new issuer.Client({
     client_id: configParameter.client_id,

upcoming-release-notes/4530.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+Fix for OpenId new variable `ACTUAL_OPENID_DISCOVERY_URL`