puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 18:08:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructure 'DELETE /token/:token'

Browse source
This commit is contained in:
Scott Schneider 2015-04-20 10:37:29 -07:00
parent fb891c9265
commit 662584dd7f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmpooler/api/v1.rb
View file

@ -182,9 +182,11 @@ module Vmpooler
result[params[:token]] = Vmpooler::API.settings.redis.hgetall('vmpooler__token__' + params[:token]) result[params[:token]] = Vmpooler::API.settings.redis.hgetall('vmpooler__token__' + params[:token])
if Vmpooler::API.settings.config[:auth] and not result[params[:token]].nil? if Vmpooler::API.settings.config[:auth] and result[params[:token]]['timestamp']
status(200) status(200)
result['ok'] = true result['ok'] = true
else
result.delete(params[:token])
end end
JSON.pretty_generate(result) JSON.pretty_generate(result)
@ -197,11 +199,9 @@ module Vmpooler
Vmpooler::API.settings.config[:auth] ? status(401) : status(404) Vmpooler::API.settings.config[:auth] ? status(401) : status(404)
if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.exists('vmpooler__token__' + params[:token]) if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.del('vmpooler__token__' + params[:token])
status(200) status(200)
result['ok'] = true result['ok'] = true
Vmpooler::API.settings.redis.del('vmpooler__token__' + params[:token])
end end
JSON.pretty_generate(result) JSON.pretty_generate(result)