external login redirect, include logo images

server/routes/api.js

@@ -62,10 +62,7 @@ function createSession (req, user) {
 
   if (req.session.redirectUri) {
     uri = req.session.redirectUri
-    delete req.session.redirectUri
+  } else if (req.query.redirect) {
-  }
-
-  if (req.query.redirect) {
     uri = req.query.redirect
   }
 

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

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')
 }
 

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