Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: allow http proto on ci

Browse Source
This commit is contained in:
Julian Lam
2023-12-13 13:38:52 -05:00
parent 48fd2e6441
commit 24c1dfac8c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/activitypub/helpers.js
View File

@@ -71,18 +71,29 @@ Helpers.generateKeys = async (uid) => {
Helpers.resolveLocalUid = async (input) => { Helpers.resolveLocalUid = async (input) => {
let slug; let slug;
const protocols = ['https'];
if (process.env.CI === 'true') {
protocols.push('http');
}
console.log(input, nconf.get('url'), nconf.get('url_parsed'), protocols, validator.isURL(input, {
require_protocol: true,
require_host: true,
require_tld: false,
protocols,
require_valid_protocol: true,
}), nconf.get('ci'));
if (validator.isURL(input, { if (validator.isURL(input, {
require_protocol: true, require_protocol: true,
require_host: true, require_host: true,
require_tld: false, require_tld: false,
protocols: ['https'], protocols,
require_valid_protocol: true, require_valid_protocol: true,
})) { })) {
const { host, pathname } = new URL(input); const { host, pathname } = new URL(input);
if (host === nconf.get('url_parsed').host) { if (host === nconf.get('url_parsed').host) {
slug = pathname.split('/').filter(Boolean)[1]; slug = pathname.replace(nconf.get('relative_path'), '').split('/').filter(Boolean)[1];
} else { } else {
throw new Error('[[activitypub:invalid-id]]'); throw new Error('[[activitypub:invalid-id]]');
} }

2
test/activitypub.js
View File

@@ -100,7 +100,7 @@ describe('ActivityPub integration', () => {
}); });
}); });
describe.only('Helpers', () => { describe('Helpers', () => {
describe('.query()', () => { describe('.query()', () => {
}); });