|
|
@@ -3,9 +3,9 @@ var http = require("http")
|
|
|
,sleep = require("sleep").sleep
|
|
|
|
|
|
,Url = require("./url.js").Url
|
|
|
- ,Slack = require("./slack.js").Slack
|
|
|
,config = require("../config.js")
|
|
|
- ,sessionManager = require("./session.js").SessionManager;
|
|
|
+ ,sessionManager = require("./session.js").SessionManager
|
|
|
+ ,slackManager = require("./slackManager.js").SlackManager;
|
|
|
|
|
|
function Server(port) {
|
|
|
var ctx = this;
|
|
|
@@ -74,7 +74,7 @@ Server.prototype.onRequest = function(req, res) {
|
|
|
res.writeHeader("302", {
|
|
|
Location: "https://slack.com/oauth/authorize"
|
|
|
+"?client_id=" +config.clientId
|
|
|
- +"&scope=" +Slack.getScope().join(" ")
|
|
|
+ +"&scope=" +slackManager.getScope().join(" ")
|
|
|
+"&redirect=" +config.rootUrl
|
|
|
});
|
|
|
}
|
|
|
@@ -83,14 +83,13 @@ Server.prototype.onRequest = function(req, res) {
|
|
|
res.setHeader('Content-Length', req.urlObj.serve.stat.size);
|
|
|
res.writeHeader("200");
|
|
|
req.urlObj.getReadStream().pipe(res, { end: true });
|
|
|
+ sessionManager.saveSession(req.session);
|
|
|
return; // async pipe will close when finished
|
|
|
} else {
|
|
|
res.writeHeader("200");
|
|
|
res.write('"' +Math.floor(Date.now() /1000) +'"');
|
|
|
}
|
|
|
- if (req.session && req.session.modifiedAt === req.reqT) {
|
|
|
- sessionManager.saveSession(req.session);
|
|
|
- }
|
|
|
+ sessionManager.saveSession(req.session);
|
|
|
res.end();
|
|
|
}
|
|
|
|