Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fixes for OpenID with the new config #4530

Merged
merged 2 commits into from
Mar 4, 2025

Conversation

lelemm
Copy link
Contributor

@lelemm lelemm commented Mar 4, 2025

I had to introduce a new env var to make this work, its not working properly. this fixes the new variable usage

@actual-github-bot actual-github-bot bot changed the title 🐛 Fixes for OpenID with the new config [WIP] 🐛 Fixes for OpenID with the new config Mar 4, 2025
Copy link

netlify bot commented Mar 4, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 4e6f4c6
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67c71342890b270008aa65dd
😎 Deploy Preview https://deploy-preview-4530.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@lelemm lelemm changed the title [WIP] 🐛 Fixes for OpenID with the new config 🐛 Fixes for OpenID with the new config Mar 4, 2025
Copy link
Contributor

github-actions bot commented Mar 4, 2025

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
18 8.08 MB → 8.08 MB (+6 B) +0.00%
Changeset
File Δ Size
src/components/manager/subscribe/OpenIdForm.tsx 📈 +6 B (+0.04%) 14.62 kB → 14.62 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 5.34 MB → 5.34 MB (+6 B) +0.00%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/en-GB.js 96.66 kB 0%
static/js/de.js 115.52 kB 0%
static/js/es.js 58.26 kB 0%
static/js/nl.js 95.51 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/en.js 103.78 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/pt-BR.js 110.52 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/fr.js 116.48 kB 0%
static/js/uk.js 111.06 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/narrow.js 86.27 kB 0%
static/js/useAccountPreviewTransactions.js 1.69 kB 0%
static/js/AppliedFilters.js 10.8 kB 0%
static/js/wide.js 102.3 kB 0%
static/js/ReportRouter.js 1.59 MB 0%

Copy link
Contributor

github-actions bot commented Mar 4, 2025

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.34 MB → 1.34 MB (-234 B) -0.02%
Changeset
File Δ Size
packages/loot-core/src/server/main.ts 📉 -499 B (-1.07%) 45.54 kB → 45.06 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

Asset File Size % Changed
kcab.worker.js 1.34 MB → 1.34 MB (-234 B) -0.02%

Unchanged

No assets were unchanged

Copy link
Contributor

coderabbitai bot commented Mar 4, 2025

Walkthrough

The changes update the OpenID configuration across several modules. In the desktop client’s OpenIdForm component, the key provided to the onSetOpenId function is changed from issuer to discoveryURL, while retaining the original value logic. In the loot-core server, the handlers['enable-openid'] function has been removed, eliminating the server-side process for enabling OpenID authentication. Meanwhile, the OpenIdConfig type in loot-core has been revised so that the issuer property is now optional and a new discoveryURL property is introduced. The sync-server’s OpenID-related logic has been updated to change the conditional error check from an OR to an AND condition for the absence of both issuer and discoveryURL, and it now handles backward compatibility by mapping discoveryURL to issuer when present.

Suggested labels

:sparkles: Merged

Suggested reviewers

  • youngcw
  • matt-fidd
✨ Finishing Touches
  • 📝 Generate Docstrings

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Nitpick comments (4)
packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx (1)

136-138: Update field name in UI to match property name in API

The property name in the API has changed from issuer to discoveryURL, but the UI still refers to this field as "issuer" (state, input field ID, labels, etc.). This disconnect between UI terminology and API property names could cause confusion for developers maintaining the code.

Consider either:

  1. Renaming the UI elements to match the API:
-  const [issuer, setIssuer] = useState('');
+  const [discoveryURL, setDiscoveryURL] = useState('');

// And update all relevant references to use discoveryURL instead of issuer
  1. Or add a comment explaining the mapping between the UI field and the API property:
  await onSetOpenId({
    selectedProvider: providerName,
+   // Map the issuer field from UI to discoveryURL expected by the API
    discoveryURL: issuer ?? '',
    client_id: clientId ?? '',
packages/loot-core/src/types/models/openid.d.ts (1)

2-7: Add documentation for OpenID properties

The addition of discoveryURL alongside the optional issuer field is a significant change to the API structure, but there's no JSDoc comment explaining the purpose of each field and the relationship between them.

Consider adding documentation to clarify the usage of these fields:

 export type OpenIdConfig = {
+  /**
+   * The OpenID provider selected by the user
+   */
   selectedProvider: string;
+  /**
+   * Optional issuer identifier (legacy field, prefer using discoveryURL)
+   * @deprecated Use discoveryURL instead
+   */
   issuer?: string;
+  /**
+   * Client ID generated by the OpenID provider
+   */
   client_id: string;
+  /**
+   * Client secret associated with the client ID
+   */
   client_secret: string;
+  /**
+   * Hostname of the server
+   */
   server_hostname: string;
+  /**
+   * The URL used for OpenID Connect discovery
+   */
   discoveryURL: string;
 };
packages/sync-server/src/accounts/openid.js (2)

27-32: Use property assignment instead of delete operator

Using the delete operator can impact performance as noted by the static analysis. Additionally, since this is for backward compatibility, it would be clearer to document the purpose of this logic.

  //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;
+    configParameter.discoveryURL = undefined; // Use undefined assignment instead of delete
  }
🧰 Tools
🪛 Biome (1.9.4)

[error] 31-31: Avoid the delete operator which can impact performance.

Unsafe fix: Use an undefined assignment instead.

(lint/performance/noDelete)


12-26: Add validation for discoveryURL format

Now that discoveryURL is a primary field for OpenID configuration, it should be validated to ensure it's a valid URL format to prevent downstream errors during discovery.

Add validation for the discoveryURL format:

 export async function bootstrapOpenId(configParameter) {
   if (!('issuer' in configParameter) && !('discoveryURL' in configParameter)) {
     return { error: 'missing-issuer-or-discoveryURL' };
   }
+  if ('discoveryURL' in configParameter) {
+    try {
+      new URL(configParameter.discoveryURL);
+    } catch (e) {
+      return { error: 'invalid-discoveryURL-format' };
+    }
+  }
   if (!('client_id' in configParameter)) {
     return { error: 'missing-client-id' };
   }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 98e4ece and 4e6f4c6.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4530.md is excluded by !**/*.md
📒 Files selected for processing (4)
  • packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx (1 hunks)
  • packages/loot-core/src/server/main.ts (0 hunks)
  • packages/loot-core/src/types/models/openid.d.ts (1 hunks)
  • packages/sync-server/src/accounts/openid.js (3 hunks)
💤 Files with no reviewable changes (1)
  • packages/loot-core/src/server/main.ts
🧰 Additional context used
🪛 Biome (1.9.4)
packages/sync-server/src/accounts/openid.js

[error] 31-31: Avoid the delete operator which can impact performance.

Unsafe fix: Use an undefined assignment instead.

(lint/performance/noDelete)

⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: build (macos-latest)
  • GitHub Check: Wait for Netlify build to finish
  • GitHub Check: build (windows-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Analyze
  • GitHub Check: Build Docker image (alpine)
  • GitHub Check: Build Docker image (ubuntu)

@lelemm lelemm merged commit 90af046 into actualbudget:master Mar 4, 2025
23 checks passed
@lelemm lelemm deleted the bugfix/openid_new_loadconfig branch March 4, 2025 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants