Use a block to insert extra check for authenticate_build!

Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20253762

Use a block to insert extra check for authenticate_build!
18c9fc42 · Lin Jen-Shin · a0690c4c · 18c9fc42
Commit 18c9fc42 authored Dec 20, 2016 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

helpers.rb lib/ci/api/helpers.rb +6 -3

No files found.
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -14,13 +14,16 @@ module Ci
      end

      def authenticate_build!(build)
-        not_found! unless build
-        forbidden! unless build_token_valid?(build)
-        validate_build!(build)
+        validate_build!(build) do
+          forbidden! unless build_token_valid?(build)
+        end
      end

      def validate_build!(build)
        not_found! unless build
+
+        yield if block_given?
+
        forbidden!('Project has been deleted!') unless build.project
        forbidden!('Build has been erased!') if build.erased?
      end