From e7d5b17113a84c27cbe16e221fa1706ebbf2add1 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 10 Jan 2024 16:04:40 +0100 Subject: [PATCH] Readability improvements. (#175) * Improve readability of switch statement for auth mechanism choice We have enough space in the width here, so it is not necessary to span the cases over two lines. --- xmpp.go | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/xmpp.go b/xmpp.go index ac341a3..8cc3a88 100644 --- a/xmpp.go +++ b/xmpp.go @@ -412,32 +412,23 @@ func (c *Client) init(o *Options) error { } } else { switch { - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-512-PLUS") && tlsConnOK: + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-512-PLUS") && tlsConnOK: mechanism = "SCRAM-SHA-512-PLUS" - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-256-PLUS") && tlsConnOK: + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-256-PLUS") && tlsConnOK: mechanism = "SCRAM-SHA-256-PLUS" - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-1-PLUS") && tlsConnOK: + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-1-PLUS") && tlsConnOK: mechanism = "SCRAM-SHA-1-PLUS" - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-512"): + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-512"): mechanism = "SCRAM-SHA-512" - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-256"): + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-256"): mechanism = "SCRAM-SHA-256" - case slices.Contains(f.Mechanisms.Mechanism, - "SCRAM-SHA-1"): + case slices.Contains(f.Mechanisms.Mechanism, "SCRAM-SHA-1"): mechanism = "SCRAM-SHA-1" - case slices.Contains(f.Mechanisms.Mechanism, - "X-OAUTH2"): + case slices.Contains(f.Mechanisms.Mechanism, "X-OAUTH2"): mechanism = "X-OAUTH2" - case slices.Contains(f.Mechanisms.Mechanism, - "PLAIN") && tlsConnOK: + case slices.Contains(f.Mechanisms.Mechanism, "PLAIN") && tlsConnOK: mechanism = "PLAIN" - case slices.Contains(f.Mechanisms.Mechanism, - "DIGEST-MD5"): + case slices.Contains(f.Mechanisms.Mechanism, "DIGEST-MD5"): mechanism = "DIGEST-MD5" } }