Better login
This commit is contained in:
		@ -24,7 +24,6 @@ public class AuthenticatorService {
 | 
			
		||||
        return tokenService.getUserFromToken(token);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    public String login(String identifier, String password, Date expirationDate){
 | 
			
		||||
        User user = userService.getUser(identifier);
 | 
			
		||||
        if (user == null){return null;}
 | 
			
		||||
 | 
			
		||||
@ -28,6 +28,7 @@ public class InscriptionService {
 | 
			
		||||
    private final MinervalRepository minervalRepository;
 | 
			
		||||
    private final ExternalCurriculumRepository externalCurriculumRepository;
 | 
			
		||||
    private final UserService userService;
 | 
			
		||||
 | 
			
		||||
    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository, ExternalCurriculumRepository externalCurriculumRepository, UserService userService){
 | 
			
		||||
        this.inscriptionRepo = inscriptionRepo;
 | 
			
		||||
        this.userRepo = userRepo;
 | 
			
		||||
 | 
			
		||||
@ -117,6 +117,7 @@ public class ProtectionService {
 | 
			
		||||
        toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
 | 
			
		||||
        toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
 | 
			
		||||
        toReturn.put("equivalenceState", inscriptionRequest.getEquivalenceState());
 | 
			
		||||
        toReturn.put("admissionDocUrl", inscriptionRequest.getAdmissionDocUrl());
 | 
			
		||||
        return toReturn;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user