Use ClientModel wherever possible

forms/login-api/src/main/java/org/keycloak/login/LoginForms.java

@@ -1,5 +1,6 @@
 package org.keycloak.login;
 
+import org.keycloak.models.ClientModel;
 import org.keycloak.models.RoleModel;
 import org.keycloak.models.UserModel;
 
@@ -38,7 +39,7 @@ public interface LoginForms {
 
     public LoginForms setUser(UserModel user);
 
-    public LoginForms setClient(UserModel client);
+    public LoginForms setClient(ClientModel client);
 
     public LoginForms setFormData(MultivaluedMap<String, String> formData);
 

forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java

@@ -17,6 +17,7 @@ import org.keycloak.login.freemarker.model.RegisterBean;
 import org.keycloak.login.freemarker.model.SocialBean;
 import org.keycloak.login.freemarker.model.TotpBean;
 import org.keycloak.login.freemarker.model.UrlBean;
+import org.keycloak.models.ClientModel;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RoleModel;
 import org.keycloak.models.UserModel;
@@ -63,7 +64,7 @@ public class FreeMarkerLoginForms implements LoginForms {
 
     private UserModel user;
 
-    private UserModel client;
+    private ClientModel client;
 
     private UriInfo uriInfo;
 
@@ -240,7 +241,7 @@ public class FreeMarkerLoginForms implements LoginForms {
         return this;
     }
 
-    public FreeMarkerLoginForms setClient(UserModel client) {
+    public FreeMarkerLoginForms setClient(ClientModel client) {
         this.client = client;
         return this;
     }

forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java

@@ -21,6 +21,7 @@
  */
 package org.keycloak.login.freemarker.model;
 
+import org.keycloak.models.ClientModel;
 import org.keycloak.models.RoleModel;
 import org.keycloak.models.UserModel;
 
@@ -36,11 +37,11 @@ public class OAuthGrantBean {
     private List<RoleModel> realmRolesRequested;
     private MultivaluedMap<String, RoleModel> resourceRolesRequested;
     private String code;
-    private UserModel client;
+    private ClientModel client;
     private String oAuthCode;
     private String action;
 
-    public OAuthGrantBean(String code, UserModel client, List<RoleModel> realmRolesRequested, MultivaluedMap<String, RoleModel> resourceRolesRequested) {
+    public OAuthGrantBean(String code, ClientModel client, List<RoleModel> realmRolesRequested, MultivaluedMap<String, RoleModel> resourceRolesRequested) {
         this.code = code;
         this.client = client;
         this.realmRolesRequested = realmRolesRequested;
@@ -60,7 +61,7 @@ public class OAuthGrantBean {
     }
 
     public String getClient() {
-        return client.getLoginName();
+        return client.getAgent().getLoginName();
     }
 
 }