From b3bd1f8f99d168286ff1ffa9cbb80815e3995151 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Fri, 30 Oct 2020 09:17:06 -0700
Subject: [PATCH] Revert "Added additional code path if user.UniqueId not set
 (#1105)" (#1108)

This reverts commit 2354dfc4c702ad59f68f800c740d9ab911666fbb.
---
 .../AzureAuthenticationManager.cs                          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureAuthenticationManager.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureAuthenticationManager.cs
index b7fc23f1..43a07b05 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureAuthenticationManager.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureAuthenticationManager.cs
@@ -222,10 +222,9 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             
             if (user != null)
             {
-                if (user.UniqueId != "") {
-                    result = _subscriptionCache.Get(user.UniqueId);
-                }
-                else {
+                result = _subscriptionCache.Get(user.UniqueId);
+                if (result == null)
+                {
                     result = await GetSubscriptionFromServiceAsync(user);
                     _subscriptionCache.UpdateCache(user.UniqueId, result);
                 }