From 389655343247e3f5b161623c79bd9da386fd5147 Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@rhelmer.org>
Date: Wed, 23 Jan 2013 15:18:26 -0800
Subject: [PATCH] redirect to teampad area if not allowed to access this pad

---
 src/node/hooks/express/teampad.js | 12 ++++++------
 src/static/js/pad.js              |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/node/hooks/express/teampad.js b/src/node/hooks/express/teampad.js
index 97b880ced..9598d1fed 100644
--- a/src/node/hooks/express/teampad.js
+++ b/src/node/hooks/express/teampad.js
@@ -53,7 +53,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   });
 
   args.app.post('/teampad/createteam', function(req, res) {
-    var sessionID = req.cookies.express_sid,
+    var sessionID = req.signedCookies.express_sid,
         currentUser = null,
         signedIn = false,
         teamName = null,
@@ -91,7 +91,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   });
 
   args.app.post('/teampad/createpad', function(req, res) {
-    var sessionID = req.cookies.express_sid;
+    var sessionID = req.signedCookies.express_sid;
 
     var teamName = null,
         padName = null,
@@ -134,7 +134,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   });
 
   args.app.post('/teampad/addaccount', function(req, res) {
-    var sessionID = req.cookies.express_sid,
+    var sessionID = req.signedCookies.express_sid,
         currentUser = null,
         signedIn = false,
         teamName = null,
@@ -168,7 +168,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   });
 
   args.app.get('/teampad', function(req, res) { 
-    var sessionID = req.cookies.express_sid;
+    var sessionID = req.signedCookies.express_sid;
     var currentUser = null;
     var signedIn = false;
 
@@ -206,7 +206,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   });
 
   args.app.get('/teampad/:teamName', function(req, res) { 
-    var sessionID = req.cookies.express_sid;
+    var sessionID = req.signedCookies.express_sid;
     var currentUser = null;
     var signedIn = false;
 
@@ -253,7 +253,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
   // TODO implement, for now we are linking to normal pads via templates
   args.app.get('/teampad/:teamName/:padName', function(req, res) { 
-    var sessionID = req.cookies.express_sid;
+    var sessionID = req.signedCookies.express_sid;
     var currentUser = null;
     var signedIn = false;
 
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 27dd3b737..a99e3e148 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -275,6 +275,11 @@ function handshake()
         $('#passwordRequired').show();
         $("#passwordinput").focus();
       }
+      else if(obj.accessStatus == "denyTeamPad")
+      {
+        $("#editorloadingbox").html("<b>This is a Team pad</b><br>" +
+                                    "<a href='/teampad'>Manage teampads</a>");
+      }
     }
     
     //if we haven't recieved the clientVars yet, then this message should it be