diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb new file mode 100644 index 0000000..e69de29 diff --git a/admin/src/main/java/org/saleban/admin/repository/PasswordResetTokenRepository.java b/admin/src/main/java/org/saleban/admin/repository/PasswordResetTokenRepository.java index 24432da..fcd70c0 100644 --- a/admin/src/main/java/org/saleban/admin/repository/PasswordResetTokenRepository.java +++ b/admin/src/main/java/org/saleban/admin/repository/PasswordResetTokenRepository.java @@ -1,20 +1,18 @@ package org.saleban.admin.repository; -import org.saleban.admin.domain.User; + import org.saleban.admin.domain.security.PasswordResetToken; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; import java.util.Date; -import java.util.stream.Stream; +@Repository public interface PasswordResetTokenRepository extends JpaRepository { PasswordResetToken findByToken(String token); - PasswordResetToken findByUser(User user); - - Stream findAllByExpiryDateLessThan(Date now); @Modifying @Query("delete from PasswordResetToken t where t.expiryDate <= ?1") diff --git a/admin/src/main/java/org/saleban/admin/service/impl/UserServiceImpl.java b/admin/src/main/java/org/saleban/admin/service/impl/UserServiceImpl.java index 4dd0f84..fee63d8 100644 --- a/admin/src/main/java/org/saleban/admin/service/impl/UserServiceImpl.java +++ b/admin/src/main/java/org/saleban/admin/service/impl/UserServiceImpl.java @@ -47,7 +47,7 @@ public User findByEmail(String email) { } @Override - public User createUser(User user, Set userRoles) throws Exception{ + public User createUser(User user, Set userRoles) throws Exception { User localUser = userRepository.findByUsername(user.getUsername()); if(localUser != null){ throw new Exception("User already exists"); diff --git a/admin/src/main/java/org/saleban/admin/util/Mappings.java b/admin/src/main/java/org/saleban/admin/util/Mappings.java index 1cd525c..1f1cc9a 100644 --- a/admin/src/main/java/org/saleban/admin/util/Mappings.java +++ b/admin/src/main/java/org/saleban/admin/util/Mappings.java @@ -4,7 +4,6 @@ public final class Mappings { //Constants public static final String HOME = "/"; public static final String LOGIN = "/login"; - public static final String REDIRECT = "redirect:/home"; public static final String INDEX = "/home"; public static final String LOGOUT = "/logout"; public static final String ADD_PRODUCT = "/product"; diff --git a/admin/src/main/resources/application.properties b/admin/src/main/resources/application.properties index 6162b02..0db682a 100644 --- a/admin/src/main/resources/application.properties +++ b/admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port = 8081 +server.port = 8056 server.servlet.context-path=/admin spring.thymeleaf.cache=false @@ -12,9 +12,9 @@ spring.resources.static-locations[1]=classpath:/static/ spring.output.ansi.enabled=always ## database connection -spring.datasource.url = jdbc:mysql://localhost:3306/autoparts?useSSL=false -spring.datasource.username=saleban -spring.datasource.password=saleban +spring.datasource.url=jdbc:mysql://localhost:3306/ECommerceDB?serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password= spring.jpa.show-sql=true spring.datasource.testWhileIdle=true diff --git a/car-parts/src/main/resources/application.properties b/car-parts/src/main/resources/application.properties index cd621f3..0f6a230 100644 --- a/car-parts/src/main/resources/application.properties +++ b/car-parts/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port = 8083 +server.port = 8057 # Enable ansi output spring.output.ansi.enabled=always @@ -8,9 +8,9 @@ spring.thymeleaf.cache=false # ## database connection -spring.datasource.url = jdbc:mysql://localhost:3306/autoparts?useSSL=false -spring.datasource.username=saleban -spring.datasource.password=saleban +spring.datasource.url=jdbc:mysql://localhost:3306/ECommerceDB?serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password= spring.jpa.show-sql=true spring.datasource.testWhileIdle=true @@ -21,13 +21,17 @@ spring.jpa.hibernate.ddl-auto=update # Allows Hibernate to generate SQL optimized for a particular DBMS spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect + + + spring.mail.host=smtp.gmail.com -spring.mail.username= -spring.mail.password= +spring.mail.port=587 +spring.mail.username=g.praveenvarma95@gmail.com +spring.mail.password=hicgucjkdfggkjve spring.mail.properties.mail.smtp.auth=true spring.mail.properties.mail.smtp.socketFactory.port=465 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory spring.mail.properties.mail.smtp.socketFactory.failback=false -support.email= + spring.security.ignored=/products