From 662584dd7fccfae1e42f18133ff549b66f5ae1f8 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 20 Apr 2015 10:37:29 -0700 Subject: [PATCH] Restructure 'DELETE /token/:token' --- lib/vmpooler/api/v1.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 1fbdb43..ca3136c 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -182,9 +182,11 @@ module Vmpooler 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) result['ok'] = true + else + result.delete(params[:token]) end JSON.pretty_generate(result) @@ -197,11 +199,9 @@ module Vmpooler 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) result['ok'] = true - - Vmpooler::API.settings.redis.del('vmpooler__token__' + params[:token]) end JSON.pretty_generate(result)