use the new method

This commit is contained in:
Renée Hendricksen 2016-07-07 00:31:35 -04:00
parent 21f445ad64
commit b94d9c8637
15 changed files with 15 additions and 29 deletions

View File

@ -68,7 +68,7 @@ module Travis::API::V3
def check_login_and_find(*args)
raise LoginRequired unless access_control.full_access_or_logged_in?
find(*args)
find(*args) # should this raise NotFound if nil? Can it return nil? see above?
end
def not_found(actually_not_found = false, type = nil)

View File

@ -2,8 +2,7 @@ module Travis::API::V3
class Services::Build::Cancel < Service
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless build = find(:build)
build = check_login_and_find(:build)
access_control.permissions(build).cancel!
query.cancel(access_control.user)

View File

@ -2,8 +2,7 @@ module Travis::API::V3
class Services::Build::Restart < Service
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless build = find(:build)
build = check_login_and_find(:build)
access_control.permissions(build).restart!
query.restart(access_control.user)

View File

@ -4,8 +4,7 @@ module Travis::API::V3
params :interval, :disable_by_build
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
raise NotFound unless branch = find(:branch, repository)
raise Error.new('Crons can only be set up for branches existing on GitHub!', status: 422) unless branch.exists_on_github
raise Error.new('Invalid value for interval. Interval must be "daily", "weekly" or "monthly"!', status: 422) unless ["daily", "weekly", "monthly"].include?(params["interval"])

View File

@ -3,8 +3,7 @@ module Travis::API::V3
#params :id
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
cron = find
cron = check_login_and_find
access_control.permissions(cron).delete!
cron.destroy
end

View File

@ -2,8 +2,7 @@ module Travis::API::V3
class Services::Job::Cancel < Service
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless job = find(:job)
job = check_login_and_find(:job)
access_control.permissions(job).cancel!
query.cancel(access_control.user)

View File

@ -5,8 +5,7 @@ module Travis::API::V3
attr_reader :job
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless @job = find(:job)
@job = check_login_and_find(:job)
raise WrongCredentials unless Travis.config.debug_tools_enabled or Travis::Features.active?(:debug_tools, job.repository)
access_control.permissions(job).debug!

View File

@ -2,8 +2,7 @@ module Travis::API::V3
class Services::Job::Restart < Service
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless job = find(:job)
job = check_login_and_find(:job)
access_control.permissions(job).restart!
query.restart(access_control.user)

View File

@ -1,8 +1,7 @@
module Travis::API::V3
class Services::Repository::Disable < Service
def run!(activate = false)
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
check_access(repository)
admin = access_control.admin_for(repository)

View File

@ -1,8 +1,7 @@
module Travis::API::V3
class Services::Repository::Star < Service
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
check_access(repository)
current_user = access_control.user
query.star(current_user)

View File

@ -1,8 +1,7 @@
module Travis::API::V3
class Services::Repository::Unstar < Service
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
check_access(repository)
current_user = access_control.user
query.unstar(current_user)

View File

@ -8,8 +8,7 @@ module Travis::API::V3
params "request", "user", :config, :message, :branch, :token
def run
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
access_control.permissions(repository).create_request!
user = find(:user) if access_control.full_access? and params_for? 'user'.freeze

View File

@ -1,8 +1,7 @@
module Travis::API::V3
class Services::Settings::Find < Service
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repo = find(:repository)
repository = check_login_and_find(:repository)
find(:settings, repo)
end
end

View File

@ -3,8 +3,7 @@ module Travis::API::V3
params :builds_only_with_travis_yml, :build_pushes, :build_pull_requests, :maximum_number_of_builds, prefix: :settings
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless repository = find(:repository)
repository = check_login_and_find(:repository)
query.update(repository)
end
end

View File

@ -2,8 +2,7 @@ module Travis::API::V3
class Services::User::Sync < Service
def run!
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
raise NotFound unless user = find(:user)
user = check_login_and_find(:user)
access_control.permissions(user).sync!
query.sync(user)