|
|
|
'use strict';
|
|
|
|
|
|
|
|
const request = require('request');
|
|
|
|
const requestAsync = require('request-promise-native');
|
|
|
|
const nconf = require('nconf');
|
|
|
|
const fs = require('fs');
|
|
|
|
const winston = require('winston');
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
const utils = require('../../src/utils');
|
|
|
|
|
|
|
|
const helpers = module.exports;
|
|
|
|
|
|
|
|
helpers.getCsrfToken = async (jar) => {
|
|
|
|
const { csrf_token: token } = await requestAsync({
|
|
|
|
url: `${nconf.get('url')}/api/config`,
|
|
|
|
json: true,
|
|
|
|
jar,
|
|
|
|
});
|
|
|
|
|
|
|
|
return token;
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.request = async function (method, uri, options) {
|
|
|
|
const ignoreMethods = ['GET', 'HEAD', 'OPTIONS'];
|
|
|
|
const lowercaseMethod = String(method).toLowerCase();
|
|
|
|
let csrf_token;
|
|
|
|
if (!ignoreMethods.some(method => method.toLowerCase() === lowercaseMethod)) {
|
|
|
|
csrf_token = await helpers.getCsrfToken(options.jar);
|
|
|
|
}
|
|
|
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
options.headers = options.headers || {};
|
|
|
|
if (csrf_token) {
|
|
|
|
options.headers['x-csrf-token'] = csrf_token;
|
|
|
|
}
|
|
|
|
request[lowercaseMethod](`${nconf.get('url')}${uri}`, options, (err, res, body) => {
|
|
|
|
if (err) reject(err);
|
|
|
|
else resolve({ res, body });
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.loginUser = function (username, password, callback) {
|
|
|
|
const jar = request.jar();
|
|
|
|
|
|
|
|
request({
|
|
|
|
url: `${nconf.get('url')}/api/config`,
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
}, (err, res, body) => {
|
|
|
|
if (err || res.statusCode !== 200) {
|
|
|
|
return callback(err || new Error('[[error:invalid-response]]'));
|
|
|
|
}
|
|
|
|
const { csrf_token } = body;
|
|
|
|
request.post(`${nconf.get('url')}/login`, {
|
|
|
|
form: {
|
|
|
|
username: username,
|
|
|
|
password: password,
|
|
|
|
},
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': csrf_token,
|
|
|
|
},
|
|
|
|
}, (err, res, body) => {
|
|
|
|
if (err) {
|
|
|
|
return callback(err || new Error('[[error:invalid-response]]'));
|
|
|
|
}
|
|
|
|
callback(null, { jar, res, body, csrf_token: csrf_token });
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
helpers.logoutUser = function (jar, callback) {
|
|
|
|
request({
|
|
|
|
url: `${nconf.get('url')}/api/config`,
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
}, (err, response, body) => {
|
|
|
|
if (err) {
|
|
|
|
return callback(err, response, body);
|
|
|
|
}
|
|
|
|
|
|
|
|
request.post(`${nconf.get('url')}/logout`, {
|
|
|
|
form: {},
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': body.csrf_token,
|
|
|
|
},
|
|
|
|
}, (err, response, body) => {
|
|
|
|
callback(err, response, body);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.connectSocketIO = function (res, callback) {
|
|
|
|
const io = require('socket.io-client');
|
|
|
|
let cookies = res.headers['set-cookie'];
|
|
|
|
cookies = cookies.filter(c => /express.sid=[^;]+;/.test(c));
|
|
|
|
const cookie = cookies[0];
|
|
|
|
const socket = io(nconf.get('base_url'), {
|
|
|
|
path: `${nconf.get('relative_path')}/socket.io`,
|
|
|
|
extraHeaders: {
|
|
|
|
Origin: nconf.get('url'),
|
|
|
|
Cookie: cookie,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.on('connect', () => {
|
|
|
|
callback(null, socket);
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.on('error', (err) => {
|
|
|
|
callback(err);
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.uploadFile = function (uploadEndPoint, filePath, body, jar, csrf_token, callback) {
|
|
|
|
let formData = {
|
|
|
|
files: [
|
|
|
|
fs.createReadStream(filePath),
|
|
|
|
fs.createReadStream(filePath), // see https://github.com/request/request/issues/2445
|
|
|
|
],
|
|
|
|
};
|
|
|
|
formData = utils.merge(formData, body);
|
|
|
|
request.post({
|
|
|
|
url: uploadEndPoint,
|
|
|
|
formData: formData,
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': csrf_token,
|
|
|
|
},
|
|
|
|
}, (err, res, body) => {
|
|
|
|
if (err) {
|
|
|
|
return callback(err);
|
|
|
|
}
|
|
|
|
if (res.statusCode !== 200) {
|
|
|
|
winston.error(JSON.stringify(body));
|
|
|
|
}
|
|
|
|
callback(null, res, body);
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.registerUser = function (data, callback) {
|
|
|
|
const jar = request.jar();
|
|
|
|
request({
|
|
|
|
url: `${nconf.get('url')}/api/config`,
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
}, (err, response, body) => {
|
|
|
|
if (err) {
|
|
|
|
return callback(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!data.hasOwnProperty('password-confirm')) {
|
|
|
|
data['password-confirm'] = data.password;
|
|
|
|
}
|
|
|
|
|
|
|
|
request.post(`${nconf.get('url')}/register`, {
|
|
|
|
form: data,
|
|
|
|
json: true,
|
|
|
|
jar: jar,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': body.csrf_token,
|
|
|
|
},
|
|
|
|
}, (err, response, body) => {
|
|
|
|
callback(err, jar, response, body);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// http://stackoverflow.com/a/14387791/583363
|
|
|
|
helpers.copyFile = function (source, target, callback) {
|
|
|
|
let cbCalled = false;
|
|
|
|
|
|
|
|
const rd = fs.createReadStream(source);
|
|
|
|
rd.on('error', (err) => {
|
|
|
|
done(err);
|
|
|
|
});
|
|
|
|
const wr = fs.createWriteStream(target);
|
|
|
|
wr.on('error', (err) => {
|
|
|
|
done(err);
|
|
|
|
});
|
|
|
|
wr.on('close', () => {
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
rd.pipe(wr);
|
|
|
|
|
|
|
|
function done(err) {
|
|
|
|
if (!cbCalled) {
|
|
|
|
callback(err);
|
|
|
|
cbCalled = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.invite = async function (body, uid, jar, csrf_token) {
|
|
|
|
const res = await requestAsync.post(`${nconf.get('url')}/api/v3/users/${uid}/invites`, {
|
|
|
|
jar: jar,
|
|
|
|
// using "form" since client "api" module make requests with "application/x-www-form-urlencoded" content-type
|
|
|
|
form: body,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': csrf_token,
|
|
|
|
},
|
|
|
|
simple: false,
|
|
|
|
resolveWithFullResponse: true,
|
|
|
|
});
|
|
|
|
|
|
|
|
res.body = JSON.parse(res.body);
|
|
|
|
return { res, body };
|
|
|
|
};
|
|
|
|
|
|
|
|
helpers.createFolder = function (path, folderName, jar, csrf_token) {
|
|
|
|
return requestAsync.put(`${nconf.get('url')}/api/v3/files/folder`, {
|
|
|
|
jar,
|
|
|
|
body: {
|
|
|
|
path,
|
|
|
|
folderName,
|
|
|
|
},
|
|
|
|
json: true,
|
|
|
|
headers: {
|
|
|
|
'x-csrf-token': csrf_token,
|
|
|
|
},
|
|
|
|
simple: false,
|
|
|
|
resolveWithFullResponse: true,
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
require('../../src/promisify')(helpers);
|