fix(auth): use new apiKeyId array
#33
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This PR will trigger a patch release when merged. |
Comment on lines
+402
to
+403
| const apiKeyId = config?.access?.admin?.apiKeyId || orgConfig?.access?.admin?.apiKeyId; | ||
| if (apiKeyId.indexOf(profile.jti) < 0) { |
Contributor
Author
There was a problem hiding this comment.
use either site config apiKeyId array, or fallback to org, if there's no site config
src/support/AdminContext.js
Outdated
Comment on lines
96
to
102
| if (attributes.orgConfig === undefined) { | ||
| const { org } = info; | ||
| if (org) { | ||
| this.attributes.orgConfig = await loadOrgConfig(this, org); | ||
| attributes.orgConfig = await loadOrgConfig(this, org); | ||
| } | ||
| } | ||
| return this.attributes.orgConfig; | ||
| return attributes.config; |
Contributor
Author
There was a problem hiding this comment.
org config is optional
There was a problem hiding this comment.
yes, but you only need to load it, if the request doesn't address a site
tripodsan
requested changes
Nov 14, 2025
src/support/AdminContext.js
Outdated
Comment on lines
96
to
102
| if (attributes.orgConfig === undefined) { | ||
| const { org } = info; | ||
| if (org) { | ||
| this.attributes.orgConfig = await loadOrgConfig(this, org); | ||
| attributes.orgConfig = await loadOrgConfig(this, org); | ||
| } | ||
| } | ||
| return this.attributes.orgConfig; | ||
| return attributes.config; |
There was a problem hiding this comment.
yes, but you only need to load it, if the request doesn't address a site
tripodsan
approved these changes
Nov 15, 2025
|
🎉 This PR is included in version 1.15.1 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.