auth: db-oauth2 - Split off db_oauth2_lookup_continue_valid()

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index 775673c24f8adc9754960b24fb473e6ccf9ca895..489256a18a5e29b483ed35dbfd517ae760734378 100644 (file)
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -686,6 +686,31 @@ static void db_oauth2_local_validation(struct db_oauth2_request *req,
        db_oauth2_callback(req, passdb_result, error);
 }
 
+static void
+db_oauth2_lookup_continue_valid(struct db_oauth2_request *req,
+                               ARRAY_TYPE(oauth2_field) *fields)
+{
+       enum passdb_result passdb_result;
+       const char *error;
+
+       db_oauth2_fields_merge(req, fields);
+       if (db_oauth2_have_all_fields(req) &&
+           !req->db->set.force_introspection) {
+               /* pass */
+       } else if (req->db->oauth2_set.introspection_mode == INTROSPECTION_MODE_LOCAL) {
+               db_oauth2_local_validation(req, req->token);
+               return;
+       } else if (!db_oauth2_user_is_enabled(req, &passdb_result, &error)) {
+               db_oauth2_callback(req, passdb_result, error);
+               return;
+       } else if (*req->db->set.introspection_url != '\0') {
+               db_oauth2_lookup_introspect(req);
+               return;
+       }
+       db_oauth2_process_fields(req, &passdb_result, &error);
+       db_oauth2_callback(req, passdb_result, error);
+}
+
 static void
 db_oauth2_lookup_continue(struct oauth2_request_result *result,
                          struct db_oauth2_request *req)
@@ -703,20 +728,8 @@ db_oauth2_lookup_continue(struct oauth2_request_result *result,
                passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;
                error = "Invalid token";
        } else {
-               db_oauth2_fields_merge(req, result->fields);
-               if (db_oauth2_have_all_fields(req) &&
-                   !req->db->set.force_introspection) {
-                       /* pass */
-               } else if (req->db->oauth2_set.introspection_mode == INTROSPECTION_MODE_LOCAL) {
-                       db_oauth2_local_validation(req, req->token);
-                       return;
-               } else if (!db_oauth2_user_is_enabled(req, &passdb_result, &error)) {
-                       db_oauth2_callback(req, passdb_result, error);
-               } else if (*req->db->set.introspection_url != '\0') {
-                       db_oauth2_lookup_introspect(req);
-                       return;
-               }
-               db_oauth2_process_fields(req, &passdb_result, &error);
+               db_oauth2_lookup_continue_valid(req, result->fields);
+               return;
        }
        db_oauth2_callback(req, passdb_result, error);
 }