- Timestamp:
- 11/04/21 16:59:49 (3 years ago)
- Branches:
- master
- Children:
- 9504a09
- Parents:
- ce6ad22
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/configs/RegistrationServiceW.java
rce6ad22 rf6bc52d 5 5 import parkup.configs.email.EmailSender; 6 6 import parkup.configs.email.EmailValidator; 7 import parkup.configs.token.ConfirmationToken ;7 import parkup.configs.token.ConfirmationTokenW; 8 8 import parkup.configs.token.ConfirmationTokenService; 9 import parkup.entities. Administrator;10 import parkup.services. AdministratorService;9 import parkup.entities.Vraboten; 10 import parkup.services.VrabotenService; 11 11 12 12 import javax.transaction.Transactional; … … 14 14 15 15 @Service 16 public class RegistrationService {17 private final AdministratorService administratorService;16 public class RegistrationServiceW { 17 private final VrabotenService vrabotenService; 18 18 private final EmailValidator emailValidator; 19 19 private final ConfirmationTokenService confirmationTokenService; … … 21 21 22 22 @Autowired 23 public RegistrationService (AdministratorService administratorService, EmailValidator emailValidator,24 ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {25 this. administratorService = administratorService;23 public RegistrationServiceW(VrabotenService vrabotenService, EmailValidator emailValidator, 24 ConfirmationTokenService confirmationTokenService, EmailSender emailSender) { 25 this.vrabotenService = vrabotenService; 26 26 this.emailValidator = emailValidator; 27 27 this.confirmationTokenService = confirmationTokenService; … … 37 37 } 38 38 39 String token = administratorService.signUpAdministrator(40 new Administrator(39 String token = vrabotenService.signUpVraboten( 40 new Vraboten( 41 41 request.getFirstName(), 42 42 request.getLastName(), 43 43 request.getEmail(), 44 request.getPassword() 44 request.getPassword(), 45 request.getMobile() 45 46 ) 46 47 ); 47 48 48 String link = "http://localhost:8080/ administrator/registration/confirm?token=" + token;49 String link = "http://localhost:8080/vraboten/registration/confirm?token=" + token; 49 50 emailSender.send( 50 51 request.getEmail(), … … 56 57 @Transactional 57 58 public String confirmToken(String token) { 58 ConfirmationToken confirmationToken= confirmationTokenService59 .getToken (token)59 ConfirmationTokenW confirmationTokenW = confirmationTokenService 60 .getTokenW(token) 60 61 .orElseThrow(() -> 61 62 new IllegalStateException("token not found")); 62 63 63 if (confirmationToken .getConfirmedAt() != null) {64 if (confirmationTokenW.getConfirmedAt() != null) { 64 65 throw new IllegalStateException("email already confirmed"); 65 66 } 66 67 67 LocalDateTime expiredAt = confirmationToken .getExpiresAt();68 LocalDateTime expiredAt = confirmationTokenW.getExpiresAt(); 68 69 69 70 if (expiredAt.isBefore(LocalDateTime.now())) { … … 71 72 } 72 73 73 confirmationTokenService.setConfirmedAt (token);74 confirmationTokenService.setConfirmedAtW(token); 74 75 75 administratorService.enableAdministrator(confirmationToken.getAdministrator().getEmail());76 vrabotenService.enableVraboten(confirmationTokenW.getRegistriranParkirac().getEmail()); 76 77 return "confirmed"; 77 78 }
Note:
See TracChangeset
for help on using the changeset viewer.