This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch 4.22 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 65e54091ff23f8fe2f70e166a498a65d95f4f577 Merge: 6516f7f1aa7 56dc11980f6 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Wed Mar 4 21:12:15 2026 +0530 Merge branch '4.20' into 4.22 .../org/apache/cloudstack/api/ApiServerService.java | 2 ++ .../api/command/OauthLoginAPIAuthenticatorCmd.java | 8 ++++---- .../command/OauthLoginAPIAuthenticatorCmdTest.java | 19 +++++++++++++++++++ server/src/main/java/com/cloud/api/ApiServer.java | 20 ++++++++++++++++++++ .../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 9 +++++---- 5 files changed, 50 insertions(+), 8 deletions(-) diff --cc api/src/main/java/org/apache/cloudstack/api/ApiServerService.java index cb75939d6bc,a422129ad21..18c96c37159 --- a/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java @@@ -49,5 -49,5 +49,7 @@@ public interface ApiServerService boolean resetPassword(UserAccount userAccount, String token, String password); + String getDomainId(Map<String, Object[]> params); ++ + boolean isPostRequestsAndTimestampsEnforced(); } diff --cc server/src/main/java/com/cloud/api/ApiServer.java index 5a3c8c2c717,3a89c7bde23..05ea166e13b --- a/server/src/main/java/com/cloud/api/ApiServer.java +++ b/server/src/main/java/com/cloud/api/ApiServer.java @@@ -117,8 -114,8 +117,9 @@@ import org.apache.cloudstack.framework. import org.apache.cloudstack.framework.messagebus.MessageHandler; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.user.UserPasswordResetManager; +import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.commons.codec.binary.Base64; + import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.EnumUtils; import org.apache.http.ConnectionClosedException; import org.apache.http.HttpException;
