User service bugfix

imCodePartnerAB · Feb 1, 2016 · ece5202 · ece5202
1 parent 973bb97
commit ece5202
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java b/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java
@@ -417,14 +417,17 @@ public void setServicePackage(String servicePackage) {
     public static void main(String[] args) {
         ResourceOwnerPasswordResourceDetails resource = new ResourceOwnerPasswordResourceDetails();
         resource.setId("ivis");
-        resource.setClientId("b4251265-409d-43b3-928d-a290228a2b59");
+//        resource.setClientId("b4251265-409d-43b3-928d-a290228a2b59"); //admin
+        resource.setClientId("08d32c33-91cf-4452-8be8-4d120fbc504e"); //ivis
 //        resource.setGrantType("authorization_code");
         resource.setGrantType("password");
         resource.setClientSecret("secret");
         resource.setAccessTokenUri("http://localhost:8080/ivis/oauth/token");
         resource.setScope(Arrays.asList("read"));
-        resource.setUsername("admin");
-        resource.setPassword("pass");
+//        resource.setUsername("admin");
+//        resource.setPassword("pass");
+        resource.setUsername("ivis");
+        resource.setPassword("111");
 //        resource.setUserAuthorizationUri("http://localhost:8080/ivis/oauth/authorize");
 //        resource.set();
 

diff --git a/ivis-server/src/main/java/com/imcode/controllers/restful/UserRestControllerImpl.java b/ivis-server/src/main/java/com/imcode/controllers/restful/UserRestControllerImpl.java
@@ -4,6 +4,7 @@
 import com.imcode.entities.Person;
 import com.imcode.entities.User;
 import com.imcode.services.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,8 @@
 @RestController
 @RequestMapping("/v1/{format}/users")
 public class UserRestControllerImpl extends AbstractRestController<User, Long, UserService>{
+    @Autowired
+    private UserService userService;
 //    @RequestMapping(method = RequestMethod.GET, params = {"personalId"})
 //    public User getByPersonalId(WebRequest webRequest, @RequestParam("personalId") String personId) {
 //        return null;
@@ -30,6 +33,7 @@ public User getCurrentUser(WebRequest webRequest) {
         try {
             Authentication authentication = (Authentication) webRequest.getUserPrincipal();
             user = (User) authentication.getPrincipal();
+            user = userService.find(user.getId());
         } catch (Exception e) {
             e.printStackTrace();
         }

diff --git a/ivis-server/src/main/java/com/imcode/services/AbstractNamedService.java b/ivis-server/src/main/java/com/imcode/services/AbstractNamedService.java
@@ -10,6 +10,7 @@
  */
 public class AbstractNamedService<T, ID extends Serializable, REPOSITORY_TYPE extends JpaRepository<T, ID>> extends AbstractService<T, ID, REPOSITORY_TYPE> implements NamedService<T> {
     @Override
+    @SuppressWarnings("unchecked")
     public T findFirstByName(String name) {
         if (repo instanceof NamedService) {
             NamedService<T> namedRepo = (NamedService<T>) repo;
@@ -19,9 +20,10 @@ public T findFirstByName(String name) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<T> findByName(String name) {
         if (repo instanceof NamedService) {
-            NamedService<T> namedRepo = (NamedService) repo;
+            NamedService<T> namedRepo = (NamedService<T>) repo;
             return  namedRepo.findByName(name);
         }
 

diff --git a/ivis-server/src/main/java/com/imcode/services/jpa/UserServiceRepoImpl.java b/ivis-server/src/main/java/com/imcode/services/jpa/UserServiceRepoImpl.java
@@ -6,11 +6,13 @@
 import com.imcode.repositories.UserRepository;
 import com.imcode.services.AbstractPersonalizedEntityService;
 import com.imcode.services.AbstractService;
+import com.imcode.services.NamedService;
 import com.imcode.services.UserService;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Set;
 
 @Service