Skip to content

chore: remove oauthRedirectUri override (dead code after Meteor OAuth removal) #40354

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.

Sign up for GitHub

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

Open
billywithaw1lly wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

chore: remove oauthRedirectUri override (dead code after Meteor OAuth removal) #40354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9c2e70
Remove useCorsSSLConfig hook and absoluteUrl startup patch
billywithaw1lly Apr 30, 2026
f426021
chore: add changeset
billywithaw1lly Apr 30, 2026
5c6e552
chore: fix changeset bump type to patch
billywithaw1lly Apr 30, 2026
02de1e7
chore: remove oauthRedirectUri override (dead code after Meteor OAuth…
billywithaw1lly Apr 30, 2026
23ca536
chore: add changeset
billywithaw1lly Apr 30, 2026
42a7f04
Merge branch 'develop' into remove-oauthRedirectUri-override
billywithaw1lly May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/honest-plants-heal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Remove oauthRedirectUri override (dead code after Meteor OAuth stack removal)
Comment on lines +1 to +5
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Apr 30, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Make the changeset note more explicit (non-functional + reference).

The front matter looks correct, but the body is extremely brief. Please consider expanding it to explicitly state this is non-breaking / no functional changes, and optionally reference the relevant issue/PR (e.g., #40346 / PR #40354) so release notes are self-contained and auditable later.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.changeset/honest-plants-heal.md around lines 1 - 5, Update the changeset
body to be explicit that this is a non-functional, non-breaking change by adding
a sentence like "This change only removes a dead-code override
(oauthRedirectUri) and does not affect runtime behavior or public APIs." Also
include a reference to the related issue/PR (e.g., "#40346 / PR `#40354`") for
traceability; keep the existing front-matter ('@rocket.chat/meteor': patch)
unchanged and ensure the markdown remains concise and audit-friendly.

5 changes: 5 additions & 0 deletions .changeset/tame-falcons-watch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Remove useCorsSSLConfig hook and absoluteUrl startup patch (dead code after Meteor DDP removal)
Comment on lines +1 to +5
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Apr 30, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Update changeset description to match the full PR scope.

This changeset body only mentions removing useCorsSSLConfig and the absoluteUrl startup patch, but the PR summary/objectives also include deleting the oauthRedirectUri override. To avoid incomplete/misleading release notes, update line 5 to mention oauthRedirectUri as well (or otherwise ensure the text matches exactly what this PR removes).

Suggested change 
-Remove useCorsSSLConfig hook and absoluteUrl startup patch (dead code after Meteor DDP removal)
+Remove dead Meteor OAuth/DDP compatibility patches: `oauthRedirectUri` override, `useCorsSSLConfig` hook, and `absoluteUrl` startup patch
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
---
'@rocket.chat/meteor': patch
---
Remove useCorsSSLConfig hook and absoluteUrl startup patch (dead code after Meteor DDP removal)
---
'@rocket.chat/meteor': patch
---
Remove dead Meteor OAuth/DDP compatibility patches: `oauthRedirectUri` override, `useCorsSSLConfig` hook, and `absoluteUrl` startup patch
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.changeset/tame-falcons-watch.md around lines 1 - 5, The changeset message
only lists removing useCorsSSLConfig hook and the absoluteUrl startup patch but
omits deletion of the oauthRedirectUri override; update the
.changeset/tame-falcons-watch.md body so the description explicitly lists
oauthRedirectUri alongside useCorsSSLConfig and the absoluteUrl startup patch
(or reword it to cover all three removals) to ensure release notes match the PR
scope and summary.

1 change: 0 additions & 1 deletion apps/meteor/client/meteor/overrides/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import './ddpOverREST';
import './desktopInjection';
import './oauthRedirectUri';
import './settings';
import './totpOnCall';
import './unstoreLoginToken';
Expand Down
30 changes: 0 additions & 30 deletions apps/meteor/client/meteor/overrides/oauthRedirectUri.ts
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions apps/meteor/client/meteor/startup/absoluteUrl.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/client/meteor/startup/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
import './absoluteUrl';
import './accounts';
2 changes: 0 additions & 2 deletions apps/meteor/client/views/root/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { useAnalytics } from './hooks/useAnalytics';
import { useAnalyticsEventTracking } from './hooks/useAnalyticsEventTracking';
import { useAutoupdate } from './hooks/useAutoupdate';
import { useCodeHighlight } from './hooks/useCodeHighlight';
import { useCorsSSLConfig } from './hooks/useCorsSSLConfig';
import { useDesktopFavicon } from './hooks/useDesktopFavicon';
import { useDesktopTitle } from './hooks/useDesktopTitle';
import { useEmojiOne } from './hooks/useEmojiOne';
Expand Down Expand Up @@ -66,7 +65,6 @@ const AppLayout = () => {
useAppleOAuth();
useWordPressOAuth();
useCustomOAuth();
useCorsSSLConfig();
useAutoupdate();
useCodeHighlight();
useLoginViaQuery();
Expand Down
15 changes: 0 additions & 15 deletions apps/meteor/client/views/root/hooks/useCorsSSLConfig.ts
View file
Open in desktop

This file was deleted.