diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 5edb9f7946..5480b7a8eb 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -387,7 +387,11 @@ class OneUserHelper < OpenNebulaHelper::OneHelper def find_token(user, token, show_expired=false) user_hash = user.to_hash - valid_tokens = [user_hash["USER"]["LOGIN_TOKEN"]].flatten.map do |e| + valid_tokens = [user_hash["USER"]["LOGIN_TOKEN"]].flatten.compact + + return [] if valid_tokens.empty? + + valid_tokens.map do |e| next unless e["TOKEN"].start_with?(token) if !show_expired @@ -395,7 +399,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper end e["TOKEN"] - end.compact + end.compact if !valid_tokens.empty? end private diff --git a/src/cli/oneuser b/src/cli/oneuser index 67bf470709..265e07c01f 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -593,6 +593,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do if options[:set] token = helper.find_token(user, options[:set]) + if token.count > 1 exit_with_code 1, "More than one token starting with '#{options[:set]}' found." elsif token.count == 0