From 8511b68c975c7990429d0f4e34609796002fe7da Mon Sep 17 00:00:00 2001
From: aavalang <56377848+aavalang@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:41:23 -0800
Subject: [PATCH] removing preview and fixing issue with aad (#7042)

---
 src/bastion/HISTORY.rst                       | 5 +++++
 src/bastion/azext_bastion/azext_metadata.json | 2 +-
 src/bastion/azext_bastion/custom.py           | 6 ++++--
 src/bastion/setup.py                          | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/bastion/HISTORY.rst b/src/bastion/HISTORY.rst
index 5aae6e11c11..221fb81c4b3 100644
--- a/src/bastion/HISTORY.rst
+++ b/src/bastion/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+0.3.0
+++++++
+* Removing preview flag.
+* Fix for AAD login.
+
 0.2.7
 ++++++
 * add support for auth type password in RDP connection
diff --git a/src/bastion/azext_bastion/azext_metadata.json b/src/bastion/azext_bastion/azext_metadata.json
index 1acdf060eb7..5b0134cbc75 100644
--- a/src/bastion/azext_bastion/azext_metadata.json
+++ b/src/bastion/azext_bastion/azext_metadata.json
@@ -1,4 +1,4 @@
 {
-    "azext.isPreview": true,
+    "azext.isPreview": false,
     "azext.minCliCoreVersion": "2.43.0"
 }
\ No newline at end of file
diff --git a/src/bastion/azext_bastion/custom.py b/src/bastion/azext_bastion/custom.py
index 066fbf0bde7..17cce617dfa 100644
--- a/src/bastion/azext_bastion/custom.py
+++ b/src/bastion/azext_bastion/custom.py
@@ -289,8 +289,8 @@ def rdp_bastion_host(cmd, target_resource_id, target_ip_address, resource_group_
             profile = Profile(cli_ctx=cmd.cli_ctx)
             access_token = profile.get_raw_token()[0][2].get("accessToken")
             logger.debug("Response %s", access_token)
-            web_address = f"https://{bastion_endpoint}/api/rdpfile?resourceId={target_resource_id}&format=rdp"
-            f"&rdpport={resource_port}&enablerdsaad={enable_mfa}"
+            web_address = f"https://{bastion_endpoint}/api/rdpfile?resourceId={target_resource_id}&format=rdp" \
+                          f"&rdpport={resource_port}&enablerdsaad={enable_mfa}"
 
             headers = {
                 "Authorization": f"Bearer {access_token}",
@@ -310,6 +310,8 @@ def rdp_bastion_host(cmd, target_resource_id, target_ip_address, resource_group_
             rdpfilepath = os.path.join(tempdir, 'conn_{}.rdp'.format(uuid.uuid4().hex))
             _write_to_file(response, rdpfilepath)
 
+            logger.warning("Saving RDP file to: %s", rdpfilepath)
+
             command = [_get_rdp_path()]
             if configure:
                 command.append("/edit")
diff --git a/src/bastion/setup.py b/src/bastion/setup.py
index 025dd8a4692..f467435116a 100644
--- a/src/bastion/setup.py
+++ b/src/bastion/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '0.2.7'
+VERSION = '0.3.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers