diff --git a/server/routes/api.js b/server/routes/api.js index 4adbdb8..4ab4dff 100644 --- a/server/routes/api.js +++ b/server/routes/api.js @@ -62,10 +62,7 @@ function createSession (req, user) { if (req.session.redirectUri) { uri = req.session.redirectUri - delete req.session.redirectUri - } - - if (req.query.redirect) { + } else if (req.query.redirect) { uri = req.query.redirect } diff --git a/server/routes/index.js b/server/routes/index.js index cd75eb5..70c4601 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -38,6 +38,8 @@ function setSession (req, user) { function redirectLogin (req, res) { let uri = '/' + + console.log(req.session.redirectUri, req.session.csrf) if (req.session.redirectUri) { uri = req.session.redirectUri delete req.session.redirectUri diff --git a/server/routes/oauth2.js b/server/routes/oauth2.js index 77794be..3d66dc0 100644 --- a/server/routes/oauth2.js +++ b/server/routes/oauth2.js @@ -20,6 +20,7 @@ router.use(oauthLimiter) function ensureLoggedIn (req, res, next) { if (req.session.user) return next() req.session.redirectUri = req.originalUrl + console.log('set return uri', req.session.redirectUri, req.session.csrf) res.redirect('/login') } diff --git a/static/image/icynet-highres.png b/static/image/icynet-highres.png new file mode 100644 index 0000000..bda0598 Binary files /dev/null and b/static/image/icynet-highres.png differ diff --git a/static/image/icynet-small.png b/static/image/icynet-small.png new file mode 100644 index 0000000..73abf84 Binary files /dev/null and b/static/image/icynet-small.png differ diff --git a/static/image/icynet.svgz b/static/image/icynet.svgz new file mode 100644 index 0000000..ecaefb4 Binary files /dev/null and b/static/image/icynet.svgz differ diff --git a/views/layout.pug b/views/layout.pug index e2fb219..338e132 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -51,6 +51,8 @@ html a.scroll(href="/#home") Home li.fullview a.scroll(href="/#news") News + li.fullview + a(href="https://forum.icynet.eu/") Forum ul.fullview.floating if user li#user @@ -69,6 +71,8 @@ html a.scroll(href="/#home") Home li a.scroll(href="/#news") News + li + a(href="https://forum.icynet.eu/") Forum .division if user li#user