Changeset f6bc52d for sources/app/src/main/java/parkup/configs
- Timestamp:
- 11/04/21 16:59:49 (3 years ago)
- Branches:
- master
- Children:
- 9504a09
- Parents:
- ce6ad22
- Location:
- sources/app/src/main/java/parkup/configs
- Files:
-
- 3 added
- 1 deleted
- 3 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/configs/RegistrationRequest.java
rce6ad22 rf6bc52d 6 6 private final String email; 7 7 private final String password; 8 private final String mobile; 8 9 9 public RegistrationRequest(String firstName, String lastName, String email, String password ) {10 public RegistrationRequest(String firstName, String lastName, String email, String password, String mobile) { 10 11 this.firstName = firstName; 11 12 this.lastName = lastName; 12 13 this.email = email; 13 14 this.password = password; 15 this.mobile = mobile; 14 16 } 15 17 … … 30 32 } 31 33 34 public String getMobile(){ 35 return mobile; 36 } 37 32 38 } -
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 } -
sources/app/src/main/java/parkup/configs/WebSecurityConfig.java
rce6ad22 rf6bc52d 9 9 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; 10 10 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 11 import parkup.services.AdministratorService; 11 import parkup.services.RegistriranParkiracService; 12 import parkup.services.VrabotenService; 12 13 14 @EnableWebSecurity 13 15 @Configuration 14 @EnableWebSecurity15 16 public class WebSecurityConfig extends WebSecurityConfigurerAdapter { 17 private final VrabotenService vrabotenService; 18 private final BCryptPasswordEncoder bCryptPasswordEncoder; 19 private final RegistriranParkiracService registriranParkiracService; 16 20 17 private final AdministratorService administratorService; 18 private final BCryptPasswordEncoder bCryptPasswordEncoder; 21 public WebSecurityConfig(VrabotenService vrabotenService, BCryptPasswordEncoder bCryptPasswordEncoder, RegistriranParkiracService registriranParkiracService) { 22 this.vrabotenService = vrabotenService; 23 this.bCryptPasswordEncoder = bCryptPasswordEncoder; 24 this.registriranParkiracService = registriranParkiracService; 25 } 19 26 20 public WebSecurityConfig(AdministratorService administratorService, BCryptPasswordEncoder bCryptPasswordEncoder) { 21 this.bCryptPasswordEncoder = bCryptPasswordEncoder; 22 this.administratorService = administratorService; 27 @Override 28 protected void configure(HttpSecurity http) throws Exception { 29 http 30 .csrf().disable() 31 .authorizeRequests() 32 .antMatchers("/vraboten/registration/**") 33 .permitAll() 34 .antMatchers("/registriranParkirac/registration/**") 35 .permitAll() 36 .anyRequest() 37 .authenticated().and().formLogin(); 38 } 39 40 @Override 41 protected void configure(AuthenticationManagerBuilder auth) throws Exception { 42 auth.authenticationProvider(daoAuthenticationProviderW()); 43 auth.authenticationProvider(daoAuthenticationProviderRP()); 44 } 45 46 @Bean 47 public DaoAuthenticationProvider daoAuthenticationProviderW() { 48 DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); 49 provider.setPasswordEncoder(bCryptPasswordEncoder); 50 provider.setUserDetailsService(vrabotenService); 51 return provider; 52 } 53 54 @Bean 55 public DaoAuthenticationProvider daoAuthenticationProviderRP(){ 56 DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); 57 provider.setPasswordEncoder(bCryptPasswordEncoder); 58 provider.setUserDetailsService(registriranParkiracService); 59 return provider; 60 } 61 23 62 } 24 25 @Override26 protected void configure(HttpSecurity http) throws Exception {27 http28 .csrf().disable()29 .authorizeRequests()30 .antMatchers("/administrator/registration/**")31 .permitAll()32 .anyRequest()33 .authenticated().and()34 .formLogin();35 }36 37 @Override38 protected void configure(AuthenticationManagerBuilder auth) throws Exception {39 auth.authenticationProvider(daoAuthenticationProvider());40 }41 42 @Bean43 public DaoAuthenticationProvider daoAuthenticationProvider(){44 DaoAuthenticationProvider provider = new DaoAuthenticationProvider();45 provider.setPasswordEncoder(bCryptPasswordEncoder);46 provider.setUserDetailsService(administratorService);47 return provider;48 }49 } -
sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRepositoryW.java
rce6ad22 rf6bc52d 11 11 12 12 @Repository 13 public interface ConfirmationTokenRepository extends JpaRepository<ConfirmationToken,Integer> {13 public interface ConfirmationTokenRepositoryW extends JpaRepository<ConfirmationTokenW,Integer> { 14 14 15 Optional<ConfirmationToken> findByToken(String token); 15 Optional<ConfirmationTokenW> findByToken(String token); 16 17 void deleteByVraboten_VrabotenId(int vraboten_id); 16 18 17 19 @Transactional 18 20 @Modifying 19 @Query("UPDATE ConfirmationToken c " +21 @Query("UPDATE ConfirmationTokenW c " + 20 22 "SET c.confirmedAt = ?2 " + 21 23 "WHERE c.token = ?1") -
sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java
rce6ad22 rf6bc52d 9 9 public class ConfirmationTokenService { 10 10 11 private final ConfirmationTokenRepository confirmationTokenRepository; 11 private final ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP; 12 private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW; 12 13 13 public ConfirmationTokenService(ConfirmationTokenRepository confirmationTokenRepository) { 14 this.confirmationTokenRepository = confirmationTokenRepository; 14 public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) { 15 this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP; 16 this.confirmationTokenRepositoryW = confirmationTokenRepositoryW; 15 17 } 16 18 17 public void saveConfirmationToken (ConfirmationTokentoken){18 confirmationTokenRepository .save(token);19 public void saveConfirmationTokenRP(ConfirmationTokenRP token){ 20 confirmationTokenRepositoryRP.save(token); 19 21 } 20 22 21 public Optional<ConfirmationToken> getToken(String token) { 22 return confirmationTokenRepository.findByToken(token); 23 public void saveConfirmationTokenW(ConfirmationTokenW token){ 24 confirmationTokenRepositoryW.save(token);} 25 26 public Optional<ConfirmationTokenRP> getTokenRP(String token) { 27 return confirmationTokenRepositoryRP.findByToken(token); 28 } 29 public Optional<ConfirmationTokenW> getTokenW(String token){ 30 return confirmationTokenRepositoryW.findByToken(token); 23 31 } 24 32 25 public int setConfirmedAt(String token) { 26 return confirmationTokenRepository.updateConfirmedAt(token, LocalDateTime.now()); 33 public void deleteByVraboten_VrabotenId(int vraboten_id){ 34 confirmationTokenRepositoryW.deleteByVraboten_VrabotenId(vraboten_id); 35 } 36 37 public void deleteByRegistriranParkirac_RegParkId(int regParkId){ 38 confirmationTokenRepositoryRP.deleteByRegistriranParkirac_RegParkId(regParkId); 39 } 40 41 public int setConfirmedAtRP(String token) { 42 return confirmationTokenRepositoryRP.updateConfirmedAt(token, LocalDateTime.now()); 43 } 44 public int setConfirmedAtW(String token){ 45 return confirmationTokenRepositoryW.updateConfirmedAt(token,LocalDateTime.now()); 27 46 } 28 47 } -
sources/app/src/main/java/parkup/configs/token/ConfirmationTokenW.java
rce6ad22 rf6bc52d 1 1 package parkup.configs.token; 2 2 3 import parkup.entities. Administrator;3 import parkup.entities.Vraboten; 4 4 5 5 import javax.persistence.*; … … 7 7 8 8 @Entity 9 public class ConfirmationToken {9 public class ConfirmationTokenW { 10 10 11 11 @Id 12 12 @Column(name = "confirmation_token_id") 13 13 @SequenceGenerator( 14 name="confirmation_token_ generator",15 sequenceName = "confirmation_token_sequence ",14 name="confirmation_token_sequence_generator_W", 15 sequenceName = "confirmation_token_sequence_W", 16 16 allocationSize = 1, 17 initialValue = 90017 initialValue = 1200 18 18 ) 19 19 @GeneratedValue( //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e 20 20 strategy = GenerationType.SEQUENCE, 21 generator = "confirmation_token_sequence_generator "21 generator = "confirmation_token_sequence_generator_W" 22 22 ) 23 23 private int id; … … 34 34 private LocalDateTime confirmedAt; 35 35 36 @ManyToOne 37 @JoinColumn(nullable = false, name = " administrator_id")38 //many confirmation tokens to one administrator39 private Administrator administrator;36 @ManyToOne(cascade = {CascadeType.ALL}) 37 @JoinColumn(nullable = false, name = "vraboten_id") 38 //many confirmation tokens to one registriranParkirac 39 private Vraboten vraboten; 40 40 41 public ConfirmationToken () {}41 public ConfirmationTokenW() {} 42 42 43 public ConfirmationToken (int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {43 public ConfirmationTokenW(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) { 44 44 this.id = id; 45 45 this.token = token; 46 46 this.createdAt = createdAt; 47 47 this.expiresAt = expiresAt; 48 this. administrator = administrator;48 this.vraboten = vraboten; 49 49 } 50 50 51 public ConfirmationToken (String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {51 public ConfirmationTokenW(String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) { 52 52 this.token = token; 53 53 this.createdAt = createdAt; 54 54 this.expiresAt = expiresAt; 55 this. administrator = administrator;55 this.vraboten = vraboten; 56 56 } 57 57 … … 96 96 } 97 97 98 public Administrator getAdministrator() {99 return administrator;98 public Vraboten getRegistriranParkirac() { 99 return vraboten; 100 100 } 101 101 102 public void set Administrator(Administrator administrator) {103 this. administrator = administrator;102 public void setRegistriranParkirac(Vraboten vraboten) { 103 this.vraboten = vraboten; 104 104 } 105 105 }
Note:
See TracChangeset
for help on using the changeset viewer.