KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[auth] oauth - handle subdomains - include unpublished versions

This commit is contained in:
Avris 2021-12-03 17:49:14 +01:00
parent d5ce2c9e5e
commit 7fd9a4e46a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/routes/user.js
View File

@ -439,7 +439,7 @@ router.get('/user/social/:provider', handleErrorAsync(async (req, res) => {
if (!req.session.socialRedirect) { if (!req.session.socialRedirect) {
return '/' + config.user.route; return '/' + config.user.route;
} }
const host = buildLocaleList(config.locale)[req.session.socialRedirect].url; const host = buildLocaleList(config.locale, true)[req.session.socialRedirect].url;
delete req.session.socialRedirect; delete req.session.socialRedirect;
return `${host}/api/user/social-redirect-callback/${encodeURIComponent(token)}`; return `${host}/api/user/social-redirect-callback/${encodeURIComponent(token)}`;

4
src/helpers.js
View File

@ -149,10 +149,10 @@ export const isTroll = (body) => {
return ['cipeusz', 'feminazi', 'bruksela', 'zboczeń'].some(t => body.indexOf(t) > -1); return ['cipeusz', 'feminazi', 'bruksela', 'zboczeń'].some(t => body.indexOf(t) > -1);
} }
export const buildLocaleList = (current) => { export const buildLocaleList = (current, includeUnpublished = false) => {
return buildDict(function* () { return buildDict(function* () {
for (let [code, name, url, published] of locales) { for (let [code, name, url, published] of locales) {
if (published || current === code) { if (published || current === code || includeUnpublished) {
yield [code, {name, url, published}]; yield [code, {name, url, published}];
} }
} }