Merge pull request octokit#231 from airpair/master

addTeamMebership, editOrganizationMemebership + fix for querying all pull requests

Author: mikedeboer

api/v3.0.0/orgs.js

@@ -808,6 +808,47 @@ var orgs = module.exports = {
         });
     };
 
+    /** section: github
+     *  orgs#addTeamMembership(msg, callback) -> null
+     *      - msg (Object): Object that contains the parameters and their values to be sent to the server.
+     *      - callback (Function): function to call when the request is finished with an error as first argument and result data as second argument.
+     *
+     *  ##### Params on the `msg` object:
+     *
+     *  - headers (Object): Optional. Key/ value pair of request headers to pass along with the HTTP request. Valid headers are: 'If-Modified-Since', 'If-None-Match', 'Cookie', 'User-Agent', 'Accept', 'X-GitHub-OTP'.
+     *  - id (String): Required.
+     *  - user (String): Required.
+     **/
+    this.addTeamMembership = function(msg, block, callback) {
+        var self = this;
+        this.client.httpSend(msg, block, function(err, res) {
+            if (err)
+                return self.sendError(err, null, msg, callback);
+
+            var ret;
+            try {
+                ret = res.data && JSON.parse(res.data);
+            }
+            catch (ex) {
+                if (callback)
+                    callback(new error.InternalServerError(ex.message), res);
+                return;
+            }
+
+            if (!ret)
+                ret = {};
+            if (!ret.meta)
+                ret.meta = {};
+            ["x-ratelimit-limit", "x-ratelimit-remaining", "x-ratelimit-reset", "x-oauth-scopes", "link", "location", "last-modified", "etag", "status"].forEach(function(header) {
+                if (res.headers[header])
+                    ret.meta[header] = res.headers[header];
+            });
+
+            if (callback)
+                callback(null, ret);
+        });
+    };
+    
     /** section: github
      *  orgs#getTeamRepos(msg, callback) -> null
      *      - msg (Object): Object that contains the parameters and their values to be sent to the server.

api/v3.0.0/routes.json

@@ -1509,6 +1509,15 @@
             }
         },
 
+        "add-team-membership": {
+            "url": "/teams/:id/memberships/:user",
+            "method": "PUT",
+            "params": {
+                "$id": null,
+                "$user": null
+            }
+        },
+
         "get-team-repos": {
             "url": "/teams/:id/repos",
             "method": "GET",
@@ -1624,8 +1633,20 @@
                     "invalidmsg": "open, closed, all, default: open",
                     "description": "open, closed, or all"
                 },
-                "$head": null,
-                "$base": null,
+                "head": {
+                    "type": "String",
+                    "required": false,
+                    "validation": "",
+                    "invalidmsg": "",
+                    "description": ""
+                },
+                "base": {
+                    "type": "String",
+                    "required": false,
+                    "validation": "",
+                    "invalidmsg": "",
+                    "description": ""
+                },
                 "$page": null,
                 "$per_page": null,
                 "sort": {
@@ -3012,6 +3033,21 @@
             }
         },
 
+        "edit-organization-membership": {
+            "url": "/user/memberships/orgs/:org",
+            "method": "PATCH",
+            "params": {
+                "$org": null,
+                "state": {
+                    "type": "String",
+                    "required": true,
+                    "validation": "^(open|closed|active)$",
+                    "invalidmsg": "",
+                    "description": ""
+                }
+            }
+        },
+
         "get-teams": {
             "url": "/user/teams",
             "method": "GET",

api/v3.0.0/user.js

@@ -225,7 +225,48 @@ var user = module.exports = {
                 callback(null, ret);
         });
     };
+    
+    /** section: github
+     *  user#editOrgMembership(msg, callback) -> null
+     *      - msg (Object): Object that contains the parameters and their values to be sent to the server.
+     *      - callback (Function): function to call when the request is finished with an error as first argument and result data as second argument.
+     *
+     *  ##### Params on the `msg` object:
+     *
+     *  - headers (Object): Optional. Key/ value pair of request headers to pass along with the HTTP request. Valid headers are: 'If-Modified-Since', 'If-None-Match', 'Cookie', 'User-Agent', 'Accept', 'X-GitHub-OTP'.
+     *  - org (String): Required.
+     *  - state (String): Required
+     **/
+    this.editOrganizationMembership = function(msg, block, callback) {
+        var self = this;
+        this.client.httpSend(msg, block, function(err, res) {
+            if (err)
+                return self.sendError(err, null, msg, callback);
 
+            var ret;
+            try {
+                ret = res.data && JSON.parse(res.data);
+            }
+            catch (ex) {
+                if (callback)
+                    callback(new error.InternalServerError(ex.message), res);
+                return;
+            }
+
+            if (!ret)
+                ret = {};
+            if (!ret.meta)
+                ret.meta = {};
+            ["x-ratelimit-limit", "x-ratelimit-remaining", "x-ratelimit-reset", "x-oauth-scopes", "link", "location", "last-modified", "etag", "status"].forEach(function(header) {
+                if (res.headers[header])
+                    ret.meta[header] = res.headers[header];
+            });
+
+            if (callback)
+                callback(null, ret);
+        });
+    };
+    
     /** section: github
      *  user#getTeams(msg, callback) -> null
      *      - msg (Object): Object that contains the parameters and their values to be sent to the server.