This commit is contained in:
@@ -4,6 +4,7 @@ import com.kaidi.oa.common.ApiException;
|
||||
import com.kaidi.oa.common.ApiResp;
|
||||
import com.kaidi.oa.domain.SysUser;
|
||||
import com.kaidi.oa.service.AuthService;
|
||||
import com.kaidi.oa.service.AuthorizationService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.TreeSet;
|
||||
|
||||
/**
|
||||
* Authentication endpoints. Issues an opaque token on login; the frontend sends
|
||||
@@ -25,10 +27,13 @@ public class AuthController {
|
||||
|
||||
private final AuthService authService;
|
||||
private final CurrentUserResolver currentUser;
|
||||
private final AuthorizationService authorizationService;
|
||||
|
||||
public AuthController(AuthService authService, CurrentUserResolver currentUser) {
|
||||
public AuthController(AuthService authService, CurrentUserResolver currentUser,
|
||||
AuthorizationService authorizationService) {
|
||||
this.authService = authService;
|
||||
this.currentUser = currentUser;
|
||||
this.authorizationService = authorizationService;
|
||||
}
|
||||
|
||||
public record LoginRequest(@NotBlank String loginName, @NotBlank String password) {
|
||||
@@ -65,6 +70,7 @@ public class AuthController {
|
||||
map.put("deptId", user.getDeptId());
|
||||
map.put("title", user.getTitle());
|
||||
map.put("email", user.getEmail());
|
||||
map.put("roles", new TreeSet<>(authorizationService.roleCodesOf(user.getId())));
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user