Update parameter requirement functions per feedback

mattermost · Jan 27, 2017 · e017ccb · e017ccb
1 parent d24765c
commit e017ccb
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/api4/context.go b/api4/context.go
@@ -327,20 +327,32 @@ func (c *Context) GetSiteURL() string {
 }
 
 func (c *Context) RequireUserId() *Context {
+	if c.Err != nil {
+		return c
+	}
+
 	if len(c.Params.UserId) != 26 {
 		c.SetInvalidUrlParam("user_id")
 	}
 	return c
 }
 
 func (c *Context) RequireTeamId() *Context {
+	if c.Err != nil {
+		return c
+	}
+
 	if len(c.Params.TeamId) != 26 {
 		c.SetInvalidUrlParam("team_id")
 	}
 	return c
 }
 
 func (c *Context) RequireChannelId() *Context {
+	if c.Err != nil {
+		return c
+	}
+
 	if len(c.Params.ChannelId) != 26 {
 		c.SetInvalidUrlParam("channel_id")
 	}