From fb891c9265ac326301d05f765e89f3153af66779 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 20 Apr 2015 10:35:29 -0700 Subject: [PATCH] Restructure 'GET /token/:token' --- lib/vmpooler/api/v1.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 5ba5b3e..1fbdb43 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -180,11 +180,11 @@ 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]) + result[params[:token]] = Vmpooler::API.settings.redis.hgetall('vmpooler__token__' + params[:token]) + + if Vmpooler::API.settings.config[:auth] and not result[params[:token]].nil? status(200) result['ok'] = true - - result[params[:token]] = Vmpooler::API.settings.redis.hgetall('vmpooler__token__' + params[:token]) end JSON.pretty_generate(result)