From de66bded589477b643f1195d92f89e5db8a39f7b Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 13 Sep 2014 15:40:19 +0200
Subject: [PATCH] Show auth token if it cannot be written to ONE_AUTH
---
src/cli/one_helper/oneuser_helper.rb | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb
index 6a0db32b98..b816995f75 100644
--- a/src/cli/one_helper/oneuser_helper.rb
+++ b/src/cli/one_helper/oneuser_helper.rb
@@ -158,13 +158,6 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
auth = TokenAuth.new() #oned generated token
end
- #-----------------------------------------------------------------------
- # Check that ONE_AUTH target can be written
- #-----------------------------------------------------------------------
- if File.file?(ONE_AUTH) && !options[:force]
- return -1, "File #{ONE_AUTH} exists, use --force to overwrite"
- end
-
#-----------------------------------------------------------------------
# Authenticate with oned using the token/passwd and set/generate the
# authentication token for the user
@@ -178,6 +171,14 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
return -1, token_oned.message if OpenNebula.is_error?(token_oned)
+ #-----------------------------------------------------------------------
+ # Check that ONE_AUTH target can be written
+ #-----------------------------------------------------------------------
+ if File.file?(ONE_AUTH) && !options[:force]
+ return 0, "File #{ONE_AUTH} exists, use --force to overwrite."\
+ "\nAuthentication Token is:\n#{username}:#{token_oned}"
+ end
+
#-----------------------------------------------------------------------
# Store the token in ONE_AUTH.
#-----------------------------------------------------------------------