get user through profile

Author: borysn

src/main/java/io/abnd/rvep/security/service/impl/RvepJwtGenerator.java

@@ -4,7 +4,7 @@
 import io.abnd.rvep.security.model.RvepRole;
 import io.abnd.rvep.security.model.RvepUserRole;
 import io.abnd.rvep.security.service.intf.JwtGenerator;
-import io.abnd.rvep.user.dao.intf.RvepUserDAO;
+import io.abnd.rvep.user.dao.intf.RvepUserProfileDAO;
 import io.abnd.rvep.user.model.RvepUser;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -18,17 +18,18 @@ public class RvepJwtGenerator implements JwtGenerator {
     @Autowired
     private RvepUserRoleDAO rvepUserRoleDAO;
     @Autowired
-    private RvepUserDAO rvepUserDAO;
+    private RvepUserProfileDAO rvepUserProfileDAO;
 
     @Override
     public String generateIdToken(String email, String provider, String firebaseIdToken) {
         // get user
-        RvepUser user = rvepUserDAO.findByEmail(email);
+        RvepUser user = rvepUserProfileDAO.findByEmail(email).getRvepUser();
         // get user role
         RvepUserRole userRole = rvepUserRoleDAO.findByRvepUserId(user.getId());
         // get role
         RvepRole role = userRole.getRvepRole();
 
+        // return idToken
         return Jwts.builder().setSubject(email)
                 .claim("provider", provider)
                 .claim("firebaseIdToken", firebaseIdToken)

src/main/java/io/abnd/rvep/user/dao/intf/RvepUserDAO.java

@@ -14,12 +14,5 @@ public interface RvepUserDAO extends JpaRepository<RvepUser, Integer> {
 	 * @return
 	 */
 	RvepUser findById(int id);
-
-	/**
-	 * 
-	 * @param email
-	 * @return
-	 */
-	RvepUser findByEmail(String email);
 
 }