diff --git a/changelogger/app/controllers/webhooks_controller.rb b/changelogger/app/controllers/webhooks_controller.rb index 872aa422..204d61fd 100644 --- a/changelogger/app/controllers/webhooks_controller.rb +++ b/changelogger/app/controllers/webhooks_controller.rb @@ -2,12 +2,12 @@ class WebhooksController < ApplicationController WEBHOOK_HEADERS = ["HTTP_USER_AGENT", "CONTENT_TYPE", "HTTP_X_GITHUB_EVENT", "HTTP_X_GITHUB_DELIVERY", "HTTP_X_HUB_SIGNATURE"] # before_action :verify_signature! -# before_action :verify_event_type! + before_action :verify_event_type! def create -# return error("not labeled") unless labeled? -# return error("not closed") unless closed? -# return error("not merged") unless merged_into_master? + return error("not labeled") unless labeled? + return error("not closed") unless closed? + return error("not merged") unless merged_into_master? # create_changelog_entry @@ -29,32 +29,32 @@ def error(msg) render(status: 422, json: text) end -# def verify_event_type! -# type = request.headers["HTTP_X_GITHUB_EVENT"] -# return if type == "pull_request" -# error("unallowed event type: #{type}") -# end + def verify_event_type! + type = request.headers["HTTP_X_GITHUB_EVENT"] + return if type == "pull_request" + error("unallowed event type: #{type}") + end -# def labeled? -# payload["pull_request"]["labels"].any? do |label| -# label["name"] == "documentation" -# end -# end + def labeled? + payload["pull_request"]["labels"].any? do |label| + label["name"] == "documentation" + end + end -# def closed? -# payload["action"] == "closed" -# end + def closed? + payload["action"] == "closed" + end -# def merged_into_master? -# merged = payload["pull_request"]["merged"] == true -# in_to_master = payload["pull_request"]["base"]["ref"] == "master" + def merged_into_master? + merged = payload["pull_request"]["merged"] == true + in_to_master = payload["pull_request"]["base"]["ref"] == "master" -# merged && in_to_master -# end + merged && in_to_master + end -# def octokit -# Octokit::Client.new(access_token: ENV["GITHUB_PERSONAL_ACCESS_TOKEN"]) -# end + def octokit + Octokit::Client.new(access_token: ENV["GITHUB_PERSONAL_ACCESS_TOKEN"]) + end # def create_changelog_entry # content, sha = get_file