Expands APIC plugins exception handling

waldekmastykarz · waldekmastykarz · commit 2a6ca02bd5b9 · 2024-05-13T16:20:51.000+02:00
diff --git a/dev-proxy-plugins/RequestLogs/ApiCenterOnboardingPlugin.cs b/dev-proxy-plugins/RequestLogs/ApiCenterOnboardingPlugin.cs
@@ -142,11 +142,7 @@ public override void Register(IPluginEvents pluginEvents,
         {
             _ = authenticationHandler.GetAccessToken(CancellationToken.None).Result;
         }
-        catch (Exception ex) when
-            // dev credential
-            (ex is AuthenticationFailedException ||
-            // prod credential
-            ex is AggregateException && ex.InnerException is CredentialUnavailableException)
+        catch (Exception ex)
         {
             _logger?.LogError(ex, "Failed to authenticate with Azure. The {plugin} will not be used.", Name);
             return;
diff --git a/dev-proxy-plugins/RequestLogs/ApiCenterProductionVersionPlugin.cs b/dev-proxy-plugins/RequestLogs/ApiCenterProductionVersionPlugin.cs
@@ -153,11 +153,7 @@ public override void Register(IPluginEvents pluginEvents,
         {
             _ = authenticationHandler.GetAccessToken(CancellationToken.None).Result;
         }
-        catch (Exception ex) when
-            // dev credential
-            (ex is AuthenticationFailedException ||
-            // prod credential
-            ex is AggregateException && ex.InnerException is CredentialUnavailableException)
+        catch (Exception ex)
         {
             _logger?.LogError(ex, "Failed to authenticate with Azure. The {plugin} will not be used.", Name);
             return;

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,7 @@ public override void Register(IPluginEvents pluginEvents,`
`142`	`142`	`{`
`143`	`143`	`_ = authenticationHandler.GetAccessToken(CancellationToken.None).Result;`
`144`	`144`	`}`
`145`		`- catch (Exception ex) when`
`146`		`- // dev credential`
`147`		`- (ex is AuthenticationFailedException \|\|`
`148`		`- // prod credential`
`149`		`- ex is AggregateException && ex.InnerException is CredentialUnavailableException)`
	`145`	`+ catch (Exception ex)`
`150`	`146`	`{`
`151`	`147`	`_logger?.LogError(ex, "Failed to authenticate with Azure. The {plugin} will not be used.", Name);`
`152`	`148`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,7 @@ public override void Register(IPluginEvents pluginEvents,`
`153`	`153`	`{`
`154`	`154`	`_ = authenticationHandler.GetAccessToken(CancellationToken.None).Result;`
`155`	`155`	`}`
`156`		`- catch (Exception ex) when`
`157`		`- // dev credential`
`158`		`- (ex is AuthenticationFailedException \|\|`
`159`		`- // prod credential`
`160`		`- ex is AggregateException && ex.InnerException is CredentialUnavailableException)`
	`156`	`+ catch (Exception ex)`
`161`	`157`	`{`
`162`	`158`	`_logger?.LogError(ex, "Failed to authenticate with Azure. The {plugin} will not be used.", Name);`
`163`	`159`	`return;`