GetCloudAppProperties (#2824)

* GetCloudAppProperties

* Update setCloudAppProperties to use properties param

* Address comments

* Add set endpoint and app name

* Remove setAppName

* Address comment

* Address Comments

* Add return value to GetCloudAppParameters

* Add return

4 files changed, 7 insertions, 6 deletions

diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 7a59263299..15a79388c1 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -957,7 +957,7 @@ class Application : public virtual InitialApplicationData,
    * websocket open.
    * @return cloud app auth token
    */
-  virtual const std::string& cloud_app_auth_token() const = 0;
+  virtual const std::string& auth_token() const = 0;
 
   /**
    * @brief Get cloud app tranpsport type. Defines the type of websocket
@@ -994,7 +994,7 @@ class Application : public virtual InitialApplicationData,
   /**
    * @brief Set cloud app auth token
    */
-  virtual void set_cloud_app_auth_token(const std::string& auth_token) = 0;
+  virtual void set_auth_token(const std::string& auth_token) = 0;
 
   /**
    * @brief Set cloud app transport type
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index 6d627d0c67..aedb973b31 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -420,7 +420,7 @@ class ApplicationImpl : public virtual Application,
    * websocket open.
    * @return cloud app auth token
    */
-  const std::string& cloud_app_auth_token() const OVERRIDE;
+  const std::string& auth_token() const OVERRIDE;
 
   /**
    * @brief Get cloud app tranpsport type. Defines the type of websocket
@@ -457,7 +457,7 @@ class ApplicationImpl : public virtual Application,
   /**
    * @brief Set cloud app auth token
    */
-  void set_cloud_app_auth_token(const std::string& auth_token) OVERRIDE;
+  void set_auth_token(const std::string& auth_token) OVERRIDE;
 
   /**
    * @brief Set cloud app transport type
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index b912c489e4..2b6919eac0 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -433,7 +433,7 @@ class PolicyHandler : public PolicyHandlerInterface,
    * @param hybrid_app_preference Filled with the hybrid app preference for the
    * cloud application set by the user
    */
-  void GetCloudAppParameters(const std::string& policy_app_id,
+  bool GetCloudAppParameters(const std::string& policy_app_id,
                              bool& enabled,
                              std::string& endpoint,
                              std::string& certificate,
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 5e6a3bb377..aaca228eda 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -189,11 +189,12 @@ extern const char* blue;
 extern const char* display_layout;
 extern const char* icon_resumed;
 extern const char* enabled;
-extern const char* cloud_app_auth_token;
+extern const char* auth_token;
 extern const char* cloud_transport_type;
 extern const char* hybrid_app_preference;
 extern const char* is_cloud_application;
 extern const char* cloud_connection_status;
+extern const char* endpoint;
 
 // PutFile
 extern const char* sync_file_name;