mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

basic import functionality; dockerfile fixes; session and cookie handling fixes

Browse Source
This commit is contained in:
Lukas F. Hartmann
2018-03-30 22:34:27 +02:00
parent 462e9edaab 820203625c
commit 6d2d2310b6
18 changed files with 209 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
routes/api/sessions.js
View File

@@ -5,6 +5,7 @@ require('../../models/schema');
var bcrypt = require('bcryptjs');
var crypo = require('crypto');
var URL = require('url').URL;
var express = require('express');
var router = express.Router();
@@ -40,11 +41,11 @@ router.post('/', function(req, res) {
user.sessions.push(session);
user.save(function(err, result) {
// FIXME
var secure = process.env.NODE_ENV == "production" || process.env.NODE_ENV == "staging";
var domain = (process.env.NODE_ENV == "production") ? ".example.org" : "localhost";
if (err) console.error("Error saving user:",err);
var domain = (process.env.NODE_ENV == "production") ? new URL(config.get('endpoint')).hostname : "localhost";
res.cookie('sdsession', token, { domain: domain, httpOnly: true, secure: secure});
res.cookie('sdsession', token, { domain: domain, httpOnly: true });
res.status(201).json(session);
});
});
@@ -69,8 +70,7 @@ router.delete('/current', function(req, res, next) {
});
user.sessions = newSessions;
user.save(function(err, result) {
// FIXME
var domain = (process.env.NODE_ENV == "production") ? ".example.org" : "localhost";
var domain = new URL(config.get('endpoint')).hostname;
res.clearCookie('sdsession', { domain: domain });
res.sendStatus(204);
});

4
routes/api/users.js
View File

@@ -16,6 +16,7 @@ var fs = require('fs');
var request = require('request');
var gm = require('gm');
var validator = require('validator');
var URL = require('url').URL;
var express = require('express');
var router = express.Router();
@@ -182,8 +183,7 @@ router.get('/loginorsignupviagoogle', function(req, res) {
var apiUrl = "https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=" + tokens.access_token;
var finalizeLogin = function(session){
var secure = process.env.NODE_ENV == "production" || process.env.NODE_ENV == "staging";
res.cookie('sdsession', session.token, { httpOnly: true, secure: secure});
res.cookie('sdsession', session.token, { httpOnly: true });
res.status(201).json(session);
};