improved GitHub repo permission verification as pointed out by #15

buildasaurs · May 1, 2015 · 6642a08 · 6642a08
1 parent 9639c5c
commit 6642a08
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/BuildaGitServer/GitHubServer.swift b/BuildaGitServer/GitHubServer.swift
@@ -428,4 +428,36 @@ extension GitHubServer {
             }
         }
     }
+
+    /**
+    *   GET repo metadata
+    */
+    public func getRepo(repo: String, completion: (repo: Repo?, error: NSError?) -> ()) {
+
+        let params = [
+            "repo": repo
+        ]
+
+        self.sendRequestWithMethod(.GET, endpoint: .Repos, params: params, query: nil, body: nil) {
+            (response, body, error) -> () in
+
+            if error != nil {
+                completion(repo: nil, error: error)
+                return
+            }
+
+            if let body = body as? NSDictionary {
+                let repository: Repo = Repo(json: body)
+                completion(repo: repository, error: nil)
+            } else {
+                completion(repo: nil, error: Errors.errorWithInfo("Wrong body \(body)"))
+            }
+        }
+    }
+
 }
+
+
+
+
+
diff --git a/BuildaGitServer/Repo.swift b/BuildaGitServer/Repo.swift
@@ -9,19 +9,21 @@
 import Foundation
 
 public class Repo : GitHubEntity {
-
+    
     public let name: String
     public let fullName: String
     public let repoUrlHTTPS: String
     public let repoUrlSSH: String
+    public let permissions: NSDictionary
 
     public required init(json: NSDictionary) {
 
         self.name = json.stringForKey("name")
         self.fullName = json.stringForKey("full_name")
         self.repoUrlHTTPS = json.stringForKey("clone_url")
         self.repoUrlSSH = json.stringForKey("ssh_url")
-
+        self.permissions = json.dictionaryForKey("permissions")
+
         super.init(json: json)
     }
 }
diff --git a/Buildasaur/NetworkUtils.swift b/Buildasaur/NetworkUtils.swift
@@ -22,15 +22,26 @@ class NetworkUtils {
         if let repoName = project.githubRepoName() {
 
             //we have a repo name
-            server.getOpenPullRequests(repoName, completion: { (prs, error) -> () in
+            server.getRepo(repoName, completion: { (repo, error) -> () in
 
                 if error != nil {
                     completion(success: false, error: error)
                     return
                 }
 
-                //seems like we got PRs!
-                completion(success: true, error: nil)
+                if
+                    let repo = repo,
+                    let readPermission = repo.permissions["pull"] as? Bool,
+                    let writePermission = repo.permissions["push"] as? Bool
+                {
+
+                    let hasPermissions = readPermission && writePermission
+
+                    //look at the permissions in the PR metadata
+                    completion(success: hasPermissions, error: nil)
+                } else {
+                    completion(success: false, error: nil)
+                }
             })
 
         } else {