From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 4 Nov 2023 01:13:25 +0000 (+0100)
Subject: auth: sasl-server-mech-oauth2 - Refactor mechanism continue functions
X-Git-Tag: 2.4.2~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda446ea957a2c27d8c5f382339f5c1bb6961056;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server-mech-oauth2 - Refactor mechanism continue functions
---

diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c
index 8632ce3681..c8141b8151 100644
--- a/src/auth/sasl-server-mech-oauth2.c
+++ b/src/auth/sasl-server-mech-oauth2.c
@@ -291,15 +291,16 @@ mech_xoauth2_auth_continue(struct sasl_server_mech_request *request,
 		oauth2_fail_invalid_request(oauth2_req);
 		return;
 	}
-	if (user_given && token != NULL)
-		mech_oauth2_verify_token(oauth2_req, token);
-	else if (token == NULL) {
+	if (token == NULL) {
 		e_info(request->mech_event, "Missing token");
 		oauth2_fail_invalid_request(oauth2_req);
-	} else {
+		return;
+	} else if (!user_given) {
 		e_info(request->mech_event, "Missing username");
 		oauth2_fail_invalid_request(oauth2_req);
+		return;
 	}
+	mech_oauth2_verify_token(oauth2_req, token);
 }
 
 static struct sasl_server_mech_request *