Repository navigation
fix: generate asset permalinks on the canonical Commons host #1003
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -218,6 +218,48 @@ export const getProductionURL = () => { | |
| return process.env.CONDUCTOR_DOMAIN || ''; | ||
| }; | ||
|
|
||
| const DEFAULT_COMMONS_CANONICAL_URL = "https://commons.libretexts.org"; | ||
|
|
||
| /** | ||
| * Origin of the permanent Commons host. Asset permalinks are generated and | ||
| * resolved against this origin, not the instance's own CONDUCTOR_DOMAIN. | ||
| * Set COMMONS_CANONICAL_DOMAIN (host or absolute URL) so staging points at | ||
| * the staging commons host. | ||
| * | ||
| * @returns {string} Origin with no trailing slash. | ||
| */ | ||
| export const getCommonsCanonicalURL = () => { | ||
| const configured = (process.env.COMMONS_CANONICAL_DOMAIN || "").trim(); | ||
| const raw = configured || DEFAULT_COMMONS_CANONICAL_URL; | ||
| const withProtocol = /^https?:\/\//i.test(raw) ? raw : `https://${raw}`; | ||
| try { | ||
| return new URL(withProtocol).origin; | ||
| } catch { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add |
||
| logger.warn( | ||
| { configured }, | ||
| "Invalid COMMONS_CANONICAL_DOMAIN, falling back to default" | ||
| ); | ||
| return DEFAULT_COMMONS_CANONICAL_URL; | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Whether this Conductor instance is the permanent Commons host. | ||
| * Compares CONDUCTOR_DOMAIN (this instance) to getCommonsCanonicalURL(). | ||
| * | ||
| * @returns {boolean} | ||
| */ | ||
| export const isCanonicalCommonsInstance = () => { | ||
| const self = (process.env.CONDUCTOR_DOMAIN || "").trim(); | ||
| if (!self) return false; | ||
| const withProtocol = /^https?:\/\//i.test(self) ? self : `https://${self}`; | ||
| try { | ||
| return new URL(withProtocol).origin === getCommonsCanonicalURL(); | ||
| } catch { | ||
| return false; | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Removes a leading slash, if any, from a string. | ||
| * | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add
here. This is a cheap guard that will help us see if a mismatch on the canonical instance itself is happening