improving permissions

client/app.js

@@ -28,4 +28,25 @@ $.fn.exists = function () {
 
 $(document).bind('keyup', 'ctrl+n', function(){
 	$('.notifications').toggleClass('hidden');
+});
+
+Handlebars.registerHelper('canView', function(redirect) {
+	var redirect=(redirect=="true");
+	return canView(Meteor.user(), redirect);
+});
+Handlebars.registerHelper('canPost', function(redirect) {
+	var redirect=(redirect=="true");
+	return canPost(Meteor.user(), redirect);
+});
+Handlebars.registerHelper('canComment', function(redirect) {
+	var redirect=(redirect=="true");
+	return canComment(Meteor.user(), redirect);
+});
+Handlebars.registerHelper('canUpvote', function(collection, redirect) {
+	var redirect=(redirect=="true");
+	return canUpvote(Meteor.user()), collection, redirect;
+});
+Handlebars.registerHelper('canDownvote', function(collection, redirect) {
+	var redirect=(redirect=="true");
+	return canDownvote(Meteor.user(), collection, redirect);
 });

client/body.html

@@ -1,8 +1,10 @@
 <template name="body">
-  {{> nav}}
-  {{> error}}
-  {{{render currentPage}}}
-  {{> notifications}}
-  {{> footer}}
-  <div class="overlay hidden"></div>
+	{{#if canView}}
+  		{{> nav}}
+  	{{/if}}
+	{{> error}}
+	{{{render currentPage}}}
+	{{> notifications}}
+	{{> footer}}
+	<div class="overlay hidden"></div>
 </template>

client/lib/router.js

@@ -8,7 +8,6 @@ SimpleRouter = FilteredRouter.extend({
 	start_request: function(page){
 		// runs at every new page change
 
-		Session.set("error", null);
 		Session.set("openedComments", null);
 		document.title = getSetting("title");
 
@@ -94,6 +93,7 @@ SimpleRouter = FilteredRouter.extend({
 		'posts/:id':'post',
 		'comments/deleted':'comment_deleted',	  
 		'comments/:id':'comment',
+		'comments/:id/reply':'comment_reply',
 		'comments/:id/edit':'comment_edit',
 		'settings':'settings',
 		'admin':'admin',
@@ -134,12 +134,19 @@ SimpleRouter = FilteredRouter.extend({
 	},
 	comment: function(id) {
 		console.log("comment, id="+id);
-		window.template='comment_page';
 		Session.set('selectedCommentId', id);
 		this.goto('comment_page');
 		window.repress_recursion=true;
 		window.newCommentTimestamp=new Date();
 	},
+	comment_reply: function(id) {
+		console.log("comment reply, id="+id);
+		window.template='comment_reply';
+		Session.set('selectedCommentId', id);
+		this.goto('comment_reply');
+		window.repress_recursion=true;
+		window.newCommentTimestamp=new Date();
+	},
 	comment_edit: function(id) {
 		console.log("comment_edit, id="+id);
 		window.template='comment_edit'; 

client/views/comments/comment_form.js

@@ -11,7 +11,7 @@ Template.comment_form.events = {
 	var $comment = $('#comment');
 	var content = instance.editor.exportFile();
 
-    if(window.template=='comment_page'){
+    if(window.template=='comment_reply'){
         // child comment
         var parentCommentId=Session.get('selectedCommentId');
         var parentComment=Comments.findOne(parentCommentId);

client/views/comments/comment_item.html

@@ -28,7 +28,7 @@
             {{/if}}
           </div>
           <div class="comment-text markdown">{{{body_formatted}}}</div>
-          <a href="/comments/{{_id}}" class="comment-reply goto-comment">Reply</a>
+          <a href="/comments/{{_id}}/reply" class="comment-reply goto-comment">Reply</a>
         </div>
       </div>
       {{#unless repress_recursion}}

client/views/comments/comment_page.html

@@ -1,11 +1,6 @@
 <template name="comment_page">
   {{#if canView}}
   <div class="post grid comment-page">
-    {{#if post}}
-    {{#with post}}
-      {{> post_item}}
-    {{/with}}
-    {{/if}}
 
     {{#if comment}}
     {{#with comment}}
@@ -15,9 +10,6 @@
     {{/with}}
     {{/if}}
 
-    {{#if canPostComment}}
-      {{> comment_form}}
-    {{/if}}
   </div>
   {{/if}}
 </template>

client/views/comments/comment_page.js

@@ -8,11 +8,5 @@ Template.comment_page.helpers({
 		var comment = Comments.findOne(Session.get('selectedCommentId'));
 		Template.comment_page.repress_recursion = true;
 		return comment;
-	},
-	canComment: function(){
-		return canComment(Meteor.user());
-	},
-	canView: function(){
-		return canView(Meteor.user());
 	}
 });

client/views/comments/comment_reply.html

@@ -0,0 +1,21 @@
+<template name="comment_reply">
+  {{#if canComment true}}
+  <div class="post grid comment-page">
+    {{#if post}}
+    {{#with post}}
+      {{> post_item}}
+    {{/with}}
+    {{/if}}
+
+    {{#if comment}}
+    {{#with comment}}
+      <ul class="selected-comment">
+       {{> comment_item}}
+      </ul>
+    {{/with}}
+    {{/if}}
+
+    {{> comment_form}}
+  </div>
+  {{/if}}
+</template>

client/views/comments/comment_reply.js

@@ -0,0 +1,12 @@
+Template.comment_reply.post = function(){
+  var selectedComment = Comments.findOne(Session.get('selectedCommentId'));
+  return selectedComment && Posts.findOne(selectedComment.post);
+};
+
+Template.comment_reply.helpers({
+	comment: function(){
+		var comment = Comments.findOne(Session.get('selectedCommentId'));
+		Template.comment_page.repress_recursion = true;
+		return comment;
+	}
+});

client/views/common/error.html

@@ -2,7 +2,9 @@
 	{{#if message}}
 		<div class="grid">
 			<div class="error">
+				{{#constant}}
 				{{message}}
+				{{/constant}}
 			</div>
 		</div>
 	{{/if}}

client/views/common/error.js

@@ -1,6 +1,22 @@
 Template.error.message= function(){
-	return Session.get("error");
+	var outerContext = Meteor.deps.Context.current;
+    var innerContext = new Meteor.deps.Context;
+    var error;
+    
+    innerContext.onInvalidate(function() {
+      // we don't need to send the invalidate through anymore if post is set
+      error || outerContext.invalidate();
+    });
+    
+    innerContext.run(function() {
+      error = Session.get("error");
+    });
+    
+    return error;
 }
 
 Template.error.rendered = function(){
+	Meteor.setTimeout(function(){
+		Session.set("error", null);
+	}, 100);
 }

client/views/posts/post_edit.js

@@ -26,7 +26,7 @@ Template.post_edit.helpers({
     
     innerContext.run(function() {
       post = Posts.findOne(Session.get('selectedPostId'));
-    })
+    });
     
     return post;
   }

lib/users.js

@@ -48,61 +48,75 @@ userProfileComplete = function(user) {
 
 // Permissions
 
-canView = function(user){
+// user: 		Defaults to Meteor.user()
+// redirect: 	Defaults to false. If false, the permission check will fail silently
+// 				If true, a failed permission check will throw an error message and redirect the user
+canView = function(user, redirect){
+	var user=(typeof user === 'undefined') ? Meteor.user() : user;
+	var redirect=(typeof redirect === 'undefined') ? false : redirect;
 	if(getSetting('requireViewInvite')==true){
+		try{
+			if(!user){
+				throw "no_account";
+			}else if(isAdmin(user) || user.isInvited){
+				return true;
+			}else{
+				throw "no_invite";
+			}
+		}catch(error){
+			if(redirect)
+				Router.goto(error);
+			return false;
+		}
+	}else{
+		return true;
+	}
+}
+canPost = function(user, redirect){
+	var user=(typeof user === 'undefined') ? Meteor.user() : user;
+	var redirect=(typeof redirect === 'undefined') ? false : redirect;
+	try{
 		if(!user){
-			Router.goto('no_account');
-			return false;
-		}
-		if(isAdmin(user))
-			return true;
-		if(user.isInvited){
+			throw "no_account";
+		}else if(isAdmin(user)){
 			return true;
+		}else if(getSetting('requirePostInvite')){
+			if(user.isInvited){
+				return true;
+			}else{
+				throw "no_invite";
+			}
 		}else{
-			Router.goto('no_invite');
-			return false;
+			return true;
 		}
-
-	}
-	return true;
-}
-canUpvote = function(user, collection){
-	if(!user)
-		return false
-	if(isAdmin(user))
-		return true;
-	if(getSetting('requirePostInvite')==true){
-		return user.isInvited;
-	}
-	return true;
-}
-canDownvote = function(user, collection){
-	if(!user)
-		return false
-	if(isAdmin(user))
-		return true;
-	if(getSetting('requirePostInvite')==true){
-		return user.isInvited;
-	}
-	return true;
-}
-canPost = function(user){
-	if(!user)
-		return false
-	if(isAdmin(user))
-		return true;
-	if(getSetting('requirePostInvite')==true){
-		return user.isInvited;
-	}
-	return true;
-}
-canComment = function(user){
-	if(!user)
+	}catch(error){
+		if(redirect){
+			switch(error){
+				case "no_account":
+					throwError("Please sign in or create an account first.");
+            		Router.goto('signin');
+					break;
+				case "no_invite":
+					throwError("Sorry, you need to have an invitation to do this.");
+					Router.goto("no_invite");
+					break;		
+			}
+		}	
 		return false;
-	if(isAdmin(user))
-		return true;
-	if(getSetting('requirePostInvite')==true){
-		return user.isInvited;
 	}
-	return true;
+}
+canComment = function(user, redirect){
+	var user=(typeof user === 'undefined') ? Meteor.user() : user;
+	var redirect=(typeof redirect === 'undefined') ? false : redirect;
+	return canPost(user, redirect);
+}
+canUpvote = function(user, collection, redirect){
+	var user=(typeof user === 'undefined') ? Meteor.user() : user;
+	var redirect=(typeof redirect === 'undefined') ? false : redirect;
+	return canPost(user, redirect);
+}
+canDownvote = function(user, collection, redirect){
+	var user=(typeof user === 'undefined') ? Meteor.user() : user;
+	var redirect=(typeof redirect === 'undefined') ? false : redirect;
+	return canPost(user, redirect);
 }