From f9004e9236203979b08ca57900ad534dee7eea9d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 20 Apr 2020 12:15:42 -0400 Subject: [PATCH] Fix checks in GenerateCredentialsHandler --- .../Components/Repository/RepositoryFactory.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Repository/RepositoryFactory.cs b/src/Tgstation.Server.Host/Components/Repository/RepositoryFactory.cs index f687a75c33..5c6e4e2667 100644 --- a/src/Tgstation.Server.Host/Components/Repository/RepositoryFactory.cs +++ b/src/Tgstation.Server.Host/Components/Repository/RepositoryFactory.cs @@ -62,20 +62,17 @@ namespace Tgstation.Server.Host.Components.Repository var supportsAnonymous = supportedCredentialTypes.HasFlag(SupportedCredentialTypes.Default); logger.LogTrace("Credentials requested. Present: {0}. Supports anonymous: {1}. Supports user/pass: {2}", hasCreds, supportsAnonymous, supportsUserPass); - if (supportsUserPass) - { - if (hasCreds) - return new UsernamePasswordCredentials - { - Username = username, - Password = password - }; - } + if (supportsUserPass && hasCreds) + return new UsernamePasswordCredentials + { + Username = username, + Password = password + }; if (supportsAnonymous) return new DefaultCredentials(); - if (hasCreds) + if (!hasCreds) throw new JobException("Remote does not support anonymous authentication!"); throw new JobException("Server does not support anonymous or username/password authentication!");