* Removed obsolete modSorua code

* Removed redundant setting of res.handlers.sender in Members.add_action(); will be already done in Membership.notify()
This commit is contained in:
Tobi Schäfer 2010-12-21 14:08:47 +00:00
parent 9410d97946
commit 1d27d412c8

View file

@ -339,7 +339,6 @@ Members.prototype.add_action = function() {
}
} else if (req.postParams.add) {
try {
res.handlers.sender = User.getMembership();
var membership = this.addMembership(req.postParams);
membership.notify(req.action, membership.creator.email,
gettext('[{0}] Notification of membership change', root.title));
@ -404,65 +403,3 @@ Members.prototype.addMembership = function(data) {
this.add(membership);
return membership;
}
Members.prototype.modSorua_action = function() {
if (!app.data.modSorua) app.data.modSorua = new Array();
var returnUrl = req.data["sorua-return-url"];
var failUrl = req.data["sorua-fail-url"];
var userID = req.data["sorua-user"];
var action = req.data["sorua-action"];
if (action == "authenticate") { // authenticate-action
if (session.user && (userID == null || userID == "" || session.user.name == userID)) {
// store returnUrl + timestamp + userID
app.data.modSorua[returnUrl] = {time: new Date(), userID: session.user.name};
res.redirect(returnUrl);
} else if (failUrl) {
res.redirect(failUrl);
} else {
session.data.modSorua = {returnUrl: returnUrl,
userID: userID};
res.redirect(this.href("modSoruaLoginForm"));
}
} else if (action == "verify") {
// first remove outdated entries
var now = new Date();
var arr = new Array();
for (var i in app.data.modSorua) {
if (app.data.modSorua[i] && app.data.modSorua[i].time &&
now.valueOf() - app.data.modSorua[i].time.valueOf() < 1000 * 60)
arr[i] = app.data.modSorua[i];
}
app.data.modSorua = arr;
// now check whether returnUrl has been used recently
if (app.data.modSorua[returnUrl]) {
res.status = 200;
res.write("user:" + app.data.modSorua[returnUrl].userID);
return;
} else {
res.status = 403;
return;
}
} else { // handle wrong call of AuthURI
res.redirect(root.href("main"));
}
}
Members.prototype.modSoruaLoginForm_action = function() {
if (!session.data.modSorua || !session.data.modSorua.returnUrl)
res.redirect(root.href()); // should not happen anyways
if (req.data.login) {
try {
res.message = this.evalLogin(req.data.name, req.data.password);
var returnUrl = session.data.modSorua.returnUrl;
app.data.modSorua[returnUrl] = {time: new Date(), userID: req.data.name};
res.redirect(returnUrl);
} catch (err) {
res.message = err.toString();
}
}
res.data.action = this.href("modSoruaLoginForm");
this.renderSkin("modSorua");
}