pub-solar/obs-portal
5
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

api: Add baseUrl to redirects

Browse source
This commit is contained in:
Paul Bienkowski 2021-02-28 22:32:44 +01:00
parent a0d9c2dbc4
commit 5b4ec4d69e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
api/src/routes/auth.js
View file

@ -8,6 +8,9 @@ const auth = require('../passport');
const wrapRoute = require('../_helpers/wrapRoute'); const wrapRoute = require('../_helpers/wrapRoute');
const config = require('../config'); const config = require('../config');
const baseUrl = config.baseUrl.replace(/\/+$/, '');
// Check whether the "bigScope" fully includes the "smallScope". // Check whether the "bigScope" fully includes the "smallScope".
function scopeIncludes(smallScope, bigScope) { function scopeIncludes(smallScope, bigScope) {
const smallScopeParts = smallScope.split(/\s/); const smallScopeParts = smallScope.split(/\s/);
@ -74,7 +77,7 @@ router.post(
}, },
wrapRoute((req, res, next) => { wrapRoute((req, res, next) => {
if (!req.user) { if (!req.user) {
return res.redirect('/login'); return res.redirect(baseUrl + '/login');
} }
if (req.session.next) { if (req.session.next) {
@ -103,7 +106,7 @@ router
auth.usernameAndPasswordSession, auth.usernameAndPasswordSession,
wrapRoute(async (req, res) => { wrapRoute(async (req, res) => {
req.logout(); req.logout();
return res.redirect('/login'); return res.redirect(baseUrl + '/login');
}), }),
) )
.get((req, res) => res.render('logout')); .get((req, res) => res.render('logout'));
@ -151,7 +154,7 @@ router.get(
wrapRoute(async (req, res) => { wrapRoute(async (req, res) => {
if (!req.user) { if (!req.user) {
req.session.next = req.url; req.session.next = req.url;
return res.redirect('/login'); return res.redirect(baseUrl + '/login');
} }
try { try {
@ -409,8 +412,6 @@ router.get(
router.get( router.get(
'/.well-known/oauth-authorization-server', '/.well-known/oauth-authorization-server',
wrapRoute(async (req, res) => { wrapRoute(async (req, res) => {
const baseUrl = config.baseUrl.replace(/\/+$/, '');
return res.json({ return res.json({
issuer: baseUrl, issuer: baseUrl,
authorization_endpoint: `${baseUrl}/authorize`, authorization_endpoint: `${baseUrl}/authorize`,