github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 21:57:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: subfolder prefix should work even if url starts with the prefix (#12284)

Browse Source 
Issue was reported on https://meta.discourse.org/t/-/181798

DEV: test getURL for urls starting with the prefix without trailing slash
This commit is contained in:
Renato Atilio 2021-03-04 18:46:22 -03:00 committed by GitHub
parent 5a4d3e7576
commit 9f474b1c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse-common/addon/lib/get-url.js
View File

@ -3,8 +3,7 @@ let S3BaseUrl, S3CDN;
export default function getURL(url) {
if (baseUri === undefined) {
baseUri = $('meta[name="discourse-base-uri"]').attr("content") || "";
baseUriMatcher = new RegExp(`^${baseUri}`);
setPrefix($('meta[name="discourse-base-uri"]').attr("content") || "");
}
if (!url) {
@ -16,7 +15,7 @@ export default function getURL(url) {
return url;
}
const found = url.startsWith(baseUri);
const found = baseUriMatcher.test(url);
if (found) {
return url;
@ -51,20 +50,19 @@ export function withoutPrefix(path) {
if (!baseUri) {
return path;
} else {
return path.replace(baseUriMatcher, "");
return path.replace(baseUriMatcher, "$1");
}
}
export function setPrefix(configBaseUri) {
baseUri = configBaseUri;
baseUriMatcher = new RegExp(`^${baseUri}`);
baseUriMatcher = new RegExp(`^${baseUri}(/|$)`);
}
export function setupURL(configCdn, configBaseUrl, configBaseUri) {
cdn = configCdn;
baseUrl = configBaseUrl;
baseUri = configBaseUri;
baseUriMatcher = new RegExp(`^${baseUri}`);
setPrefix(configBaseUri);
}
export function setupS3CDN(configS3BaseUrl, configS3CDN) {

17
app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
View File

@ -37,6 +37,11 @@ module("Unit | Utility | get-url", function () {
assert.equal(withoutPrefix("/eviltrout/hello"), "/eviltrout/hello");
assert.equal(withoutPrefix("/eviltrout"), "/eviltrout");
assert.equal(withoutPrefix("/"), "/");
setPrefix("/f");
assert.equal(withoutPrefix("/faq"), "/faq");
assert.equal(withoutPrefix("/f/faq"), "/faq");
assert.equal(withoutPrefix("/f"), "");
});
test("withoutPrefix called multiple times on the same path", function (assert) {
@ -120,6 +125,18 @@ module("Unit | Utility | get-url", function () {
"/forum/t/123",
"does not prefix if the URL is already prefixed"
);
setPrefix("/f");
assert.equal(
getURL("/faq"),
"/f/faq",
"relative path has subfolder even if it starts with the prefix without trailing slash"
);
assert.equal(
getURL("/f/faq"),
"/f/faq",
"does not prefix if the URL is already prefixed"
);
});
test("getURLWithCDN on subfolder install with S3", function (assert) {