Merge pull request #52 from TAMULib/sprint4-staging

Sprint4 staging

Author: jcreel

.gitignore

@@ -5,5 +5,6 @@ target/
 .factorypath
 .project
 .settings
+.springBeans
 bin/
 logs/

pom.xml

@@ -9,13 +9,13 @@
   <description>A System for monitoring and reporting the status of Library Services</description>
 
   <parent>
-    <groupId>edu.tamu.weaverframework</groupId>
-    <artifactId>weaver-webservice-parent</artifactId>
-    <version>1.2.1</version>
+    <groupId>edu.tamu.weaver</groupId>
+    <artifactId>webservice-parent</artifactId>
+    <version>2.0.0-RC3-SNAPSHOT</version>
   </parent>
 
   <properties>
-    <start-class>edu.tamu.app.WebServerInit</start-class>
+
   </properties>
 
   <packaging>war</packaging>
@@ -32,38 +32,68 @@
   </repositories>
 
   <dependencies>
+
     <dependency>
-      <groupId>edu.tamu.weaverframework</groupId>
-      <artifactId>weaver-webservice-core</artifactId>
-      <version>1.2.1</version>
+      <groupId>edu.tamu.weaver</groupId>
+      <artifactId>auth</artifactId>
+      <version>2.0.0-RC3-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>edu.tamu.weaver</groupId>
+      <artifactId>token-provider</artifactId>
+      <version>2.0.0-RC3-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>edu.tamu.weaver</groupId>
+      <artifactId>validation</artifactId>
+      <version>2.0.0-RC3-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>edu.tamu.weaver</groupId>
+      <artifactId>reporting</artifactId>
+      <version>2.0.0-RC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1211</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>
 
   <build>
     <finalName>ROOT</finalName>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
+        <version>3.2.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>

…ain/java/edu/tamu/app/WebServerInit.java …java/edu/tamu/app/StatusApplication.javasrc/main/java/edu/tamu/app/WebServerInit.java renamed to src/main/java/edu/tamu/app/StatusApplication.java src/main/java/edu/tamu/app/WebServerInit.java renamed to src/main/java/edu/tamu/app/StatusApplication.java

@@ -5,14 +5,16 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * Web server initialization.
  * 
  */
+@EnableScheduling
 @SpringBootApplication
-@ComponentScan(basePackages = { "edu.tamu.framework", "edu.tamu.app" })
-public class WebServerInit extends SpringBootServletInitializer {
+@ComponentScan(basePackages = { "edu.tamu.*" })
+public class StatusApplication extends SpringBootServletInitializer {
 
     /**
      * Entry point to the application from within servlet.
@@ -22,7 +24,7 @@ public class WebServerInit extends SpringBootServletInitializer {
      *
      */
     public static void main(String[] args) {
-        SpringApplication.run(WebServerInit.class, args);
+        SpringApplication.run(StatusApplication.class, args);
     }
 
     /**
@@ -36,7 +38,7 @@ public static void main(String[] args) {
      */
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(WebServerInit.class);
+        return application.sources(StatusApplication.class);
     }
 
 }

src/main/java/edu/tamu/app/aspect/AppControllerAspect.java

@@ -0,0 +1,13 @@
+package edu.tamu.app.auth.model;
+
+import edu.tamu.app.model.User;
+
+public class AppUserDetails extends User {
+
+    private static final long serialVersionUID = -7785681787331883261L;
+
+    public AppUserDetails(User user) {
+        super(user);
+    }
+
+}

src/main/java/edu/tamu/app/auth/model/AppUserDetails.java

@@ -0,0 +1,90 @@
+package edu.tamu.app.auth.service;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+
+import edu.tamu.app.enums.Role;
+import edu.tamu.app.model.User;
+import edu.tamu.app.model.repo.UserRepo;
+import edu.tamu.weaver.auth.model.Credentials;
+import edu.tamu.weaver.auth.service.UserCredentialsService;
+
+@Service
+public class AppUserCredentialsService extends UserCredentialsService<User, UserRepo> {
+
+    @Override
+    public synchronized User updateUserByCredentials(Credentials credentials) {
+
+        Optional<User> optionalUser = userRepo.findByUsername(credentials.getUin());
+
+        User user = null;
+
+        if (!optionalUser.isPresent()) {
+
+            Role role = Role.ROLE_USER;
+
+            if (credentials.getRole() == null) {
+                credentials.setRole(role.toString());
+            }
+
+            String shibUin = credentials.getUin();
+
+            for (String uin : admins) {
+                if (uin.equals(shibUin)) {
+                    role = Role.ROLE_ADMIN;
+                    credentials.setRole(role.toString());
+                }
+            }
+
+            user = userRepo.create(credentials.getUin(), credentials.getEmail(), credentials.getFirstName(), credentials.getLastName(), role);
+
+        } else {
+            user = optionalUser.get();
+
+            boolean changed = false;
+
+            if (credentials.getUin() != user.getUsername()) {
+                user.setUsername(credentials.getUin());
+                changed = true;
+            }
+
+            if (credentials.getEmail() != user.getEmail()) {
+                user.setEmail(credentials.getEmail());
+                changed = true;
+            }
+
+            if (credentials.getFirstName() != user.getFirstName()) {
+                user.setFirstName(credentials.getFirstName());
+                changed = true;
+            }
+
+            if (credentials.getLastName() != user.getLastName()) {
+                user.setLastName(credentials.getLastName());
+                changed = true;
+            }
+
+            if (credentials.getRole() != credentials.getRole().toString()) {
+                user.setRole(Role.valueOf(credentials.getRole()));
+                changed = true;
+            }
+
+            if (changed) {
+                user = userRepo.save(user);
+            }
+
+        }
+
+        credentials.setRole(user.getRole().toString());
+        credentials.setUin(user.getUsername());
+
+        return user;
+
+    }
+
+    @Override
+    public String getAnonymousRole() {
+        return Role.ROLE_ANONYMOUS.toString();
+    }
+
+}

src/main/java/edu/tamu/app/auth/service/AppUserCredentialsService.java

@@ -0,0 +1,19 @@
+package edu.tamu.app.auth.service;
+
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Service;
+
+import edu.tamu.app.auth.model.AppUserDetails;
+import edu.tamu.app.model.User;
+import edu.tamu.app.model.repo.UserRepo;
+import edu.tamu.weaver.auth.service.AbstractWeaverUserDetailsService;
+
+@Service
+public class AppUserDetailsService extends AbstractWeaverUserDetailsService<User, UserRepo> {
+
+    @Override
+    public UserDetails buildUserDetails(User user) {
+        return new AppUserDetails(user);
+    }
+
+}