Merge pull request #840 from jeschu1/AlwaysDelete

Always delete

Author: jeschu1

AzureDevOps.Authentication/Src/Authentication.cs

@@ -131,31 +131,23 @@ public override async Task<bool> DeleteCredentials(TargetUri targetUri)
             if (targetUri is null)
                 throw new ArgumentNullException(nameof(targetUri));
 
-            Credential credentials = await PersonalAccessTokenStore.ReadCredentials(targetUri);
+            await PersonalAccessTokenStore.DeleteCredentials(targetUri);
 
-            // Attempt to validate the credentials, if they're truly invalid delete them.
-            if (!await ValidateCredentials(targetUri, credentials))
-            {
-                await PersonalAccessTokenStore.DeleteCredentials(targetUri);
-
-                // Remove any related entries from the tenant cache because tenant change
-                // could the be source of the invalidation, and not purging the cache will
-                // trap the user in a limbo state of invalid credentials.
-
-                // Deserialize the cache and remove any matching entry.
-                string tenantUrl = targetUri.ToString();
-                var cache = await DeserializeTenantCache(Context);
+            // Remove any related entries from the tenant cache because tenant change
+            // could the be source of the invalidation, and not purging the cache will
+            // trap the user in a limbo state of invalid credentials.
 
-                // Attempt to remove the URL entry, if successful serialize the cache.
-                if (cache.Remove(tenantUrl))
-                {
-                    await SerializeTenantCache(Context, cache);
-                }
+            // Deserialize the cache and remove any matching entry.
+            string tenantUrl = GetTargetUrl(targetUri, keepUsername: false);
+            var cache = await DeserializeTenantCache(Context);
 
-                return true;
+            // Attempt to remove the URL entry, if successful serialize the cache.
+            if (cache.Remove(tenantUrl))
+            {
+                await SerializeTenantCache(Context, cache);
             }
 
-            return false;
+            return true;
         }
 
         /// <summary>

Cli/Askpass/Properties/AssemblyInfo.cs

@@ -12,8 +12,8 @@
 [assembly: AssemblyTrademark("Microsoft Corporation")]
 [assembly: AssemblyCulture("")]
 [assembly: Guid("19770407-63d4-1230-a9df-f1c4b473308a")]
-[assembly: AssemblyVersion("1.18.4.0")]
-[assembly: AssemblyFileVersion("1.18.4.0")]
+[assembly: AssemblyVersion("1.18.5.0")]
+[assembly: AssemblyFileVersion("1.18.5.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // Only expose internals when the binary isn't signed.

Cli/Manager/Properties/AssemblyInfo.cs

@@ -12,8 +12,8 @@
 [assembly: AssemblyTrademark("Microsoft Corporation")]
 [assembly: AssemblyCulture("")]
 [assembly: Guid("19770407-63d4-0415-a9df-f1c4b473308a")]
-[assembly: AssemblyVersion("1.18.4.0")]
-[assembly: AssemblyFileVersion("1.18.4.0")]
+[assembly: AssemblyVersion("1.18.5.0")]
+[assembly: AssemblyFileVersion("1.18.5.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // Only expose internals when the binary isn't signed.