') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); chore(clerk-js): Fix broken Organization methods by panteliselef · Pull Request #1871 · clerk/javascript · GitHub
Skip to content

chore(clerk-js): Fix broken Organization methods - #1871

Merged
panteliselef merged 1 commit into
mainfrom
ORG-238
Oct 12, 2023
Merged

chore(clerk-js): Fix broken Organization methods#1871
panteliselef merged 1 commit into
mainfrom
ORG-238

Conversation

@panteliselef

@panteliselefpanteliselef commented Oct 12, 2023•
edited by dimkl
Loading

Copy link
Copy Markdown
Contributor

Description

This PR fixes 2 methods that seems to be flawed.

https://github.com/clerkinc/javascript/blob/214f658cf79983b8b44ae3228b0500d88e215345/packages/clerk-js/src/core/resources/Organization.ts#L325

https://github.com/clerkinc/javascript/blob/214f658cf79983b8b44ae3228b0500d88e215345/packages/clerk-js/src/core/clerk.ts#L1086

To provide you with more context, these 2 methods rely on endpoints that resolve with paginated data and the iterate through them and filter the array based on an organizationID. This concept is flawed, as there is great chance that the organization id you are looking for, might not be part of the first page of the results.

Checklist

  • npm test runs as expected.
  • npm run build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@panteliselef
panteliselef requested a review from a team as a code ownerOctober 12, 2023 10:46
@changeset-bot

changeset-botBot commented Oct 12, 2023•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: c0bf9fd

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 12 packages
NameType
@clerk/clerk-jsPatch
@clerk/clerk-reactPatch
@clerk/typesPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/remixPatch
@clerk/backendPatch
@clerk/fastifyPatch
@clerk/localizationsPatch
@clerk/clerk-sdk-nodePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

anagstef
anagstef approved these changes Oct 12, 2023
View reviewed changes

@anagstefanagstef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

chanioxaris
chanioxaris approved these changes Oct 12, 2023
View reviewed changes
Comment threadpackages/clerk-js/src/core/resources/Organization.ts
path: `/me/organization_memberships`,
rotatingTokenNonce,
},
{ forceUpdateClient: true },

@chanioxarischanioxarisOct 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Don't we need to include this parameter as well?

@panteliselefpanteliselefOct 12, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

brought it back

@panteliselefpanteliselef self-assigned this Oct 12, 2023
@panteliselef
panteliselef added this pull request to the merge queue Oct 12, 2023
Merged via the queue into main with commit 70f2510Oct 12, 2023
@panteliselef
panteliselef deleted the ORG-238 branch October 12, 2023 12:47
@clerk-cookieclerk-cookie mentioned this pull request Oct 12, 2023
Merged
dimkl
dimkl reviewed Oct 12, 2023
View reviewed changes
Comment thread.changeset/unlucky-carrots-exist.md
'@clerk/types': patch
---

Fix methods in clerk-js that consumede paginated endpoints in order to retrieve single resources.

@dimkldimklOct 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃 Should we replace consumede with consume ?

@clerk-cookie

clerk-cookie commented Oct 12, 2024

Copy link
Copy Markdown
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerkclerk locked as resolved and limited conversation to collaborators Oct 12, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers
@dimkldimkldimkl left review comments
@anagstefanagstefanagstef approved these changes
@chanioxarischanioxarischanioxaris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@panteliselefpanteliselef

Labels

clerk-jsreacttypes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@panteliselef@clerk-cookie@dimkl@anagstef@chanioxaris