Cleaning up a chunk of code, update version to 1.5 (#394)

Version updated since we now have BitBucket support #392

Project.toml

@@ -1,7 +1,7 @@
 name = "Registrator"
 uuid = "4418983a-e44d-11e8-3aec-9789530b3b3e"
 authors = ["Stefan Karpinski <stefan@karpinski.org>"]
-version = "1.4.2"
+version = "1.5"
 
 [deps]
 AutoHashEquals = "15f4f7f2-30c1-5605-9d31-71845cf9641f"

src/webui/gitutils.jl

@@ -115,17 +115,14 @@ function isauthorized(u::User{GitLab.User}, repo::GitLab.Project, fetch = true)
     end
     # Same as above: group membership then collaborator check.
     nspath = split(repo.namespace.full_path, "/")
-    ismember = @gf_bool @mock is_collaborator(u.forge, repo.namespace.full_path, repo.name, u.user.id)
-    if !ismember
-        accns = ""
-        for ns in nspath
-            accns = joinpath(accns, ns)
-            ismember = @gf_bool @mock is_member(forge, accns, u.user.id)
-            ismember &&
-                break
-        end
+    (@gf_bool @mock is_collaborator(u.forge, repo.namespace.full_path, repo.name, u.user.id)) &&
+        return AuthSuccess()
+    accns = ""
+    for ns in nspath
+        accns = joinpath(accns, ns)
+        (@gf_bool @mock is_member(forge, accns, u.user.id)) &&
+            return AuthSuccess()
     end
-    ismember && return AuthSuccess()
     AuthFailure("Project $(repo.name) belongs to the group $(repo.namespace.full_path), and user $(u.user.name) is not a member of that group or its parent group(s)")
 end