Skip to content

Commit

Permalink
Merge 3d16823 into f6f8036
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwelling
wwelling committed Sep 4, 2018
2 parents f6f8036 + 3d16823 commit e4e8ebb
Show file tree
Hide file tree
Showing 20 changed files with 109 additions and 60 deletions.
10 changes: 5 additions & 5 deletions auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>core</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>user</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>token</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>email</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 3 additions & 1 deletion auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ public class AuthConstants {
public final static byte[] ERROR_RESPONSE;

public final static byte[] UNAUTHORIZED_RESPONSE;

public final static ApiResponse UNAUTHORIZED_API_RESPONSE = new ApiResponse(UNAUTHORIZED);

public final static ApiResponse SERVER_ERROR_API_RESPONSE = new ApiResponse(ERROR);

static {
ObjectMapper objectMapper = new ObjectMapper();
byte[] expiredResponse = new byte[0];
Expand Down
18 changes: 17 additions & 1 deletion auth/src/main/java/edu/tamu/weaver/auth/controller/handler/AuthRestExceptionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import edu.tamu.weaver.auth.exception.CredentialsNotFoundException;
import edu.tamu.weaver.auth.exception.UserNotFoundException;
import edu.tamu.weaver.response.ApiResponse;
import edu.tamu.weaver.response.ApiStatus;

@RestController
@ControllerAdvice
Expand All @@ -19,8 +22,21 @@ public class AuthRestExceptionHandler {
@ExceptionHandler(AccessDeniedException.class)
@ResponseStatus(value = HttpStatus.UNAUTHORIZED)
@ResponseBody
public ApiResponse handleAccessDeniedExceptionRest(AccessDeniedException exception) {
public ApiResponse handleAccessDeniedException(AccessDeniedException exception) {
return UNAUTHORIZED_API_RESPONSE;
}

@ExceptionHandler(CredentialsNotFoundException.class)
@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
@ResponseBody
public ApiResponse handleCredentialsNotFoundException(CredentialsNotFoundException exception) {
return new ApiResponse(ApiStatus.ERROR, exception.getMessage());
}

@ExceptionHandler(UserNotFoundException.class)
@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
@ResponseBody
public ApiResponse handleUserNotFoundException(UserNotFoundException exception) {
return new ApiResponse(ApiStatus.ERROR, exception.getMessage());
}
}
11 changes: 11 additions & 0 deletions auth/src/main/java/edu/tamu/weaver/auth/exception/CredentialsNotFoundException.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package edu.tamu.weaver.auth.exception;

public class CredentialsNotFoundException extends RuntimeException {

private static final long serialVersionUID = -4128620872122571673L;

public CredentialsNotFoundException(String message) {
super(message);
}

}
11 changes: 11 additions & 0 deletions auth/src/main/java/edu/tamu/weaver/auth/exception/UserNotFoundException.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package edu.tamu.weaver.auth.exception;

public class UserNotFoundException extends RuntimeException {

private static final long serialVersionUID = -7779314921709249299L;

public UserNotFoundException(String message) {
super(message);
}

}
9 changes: 6 additions & 3 deletions auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,27 @@
import org.springframework.web.method.support.ModelAndViewContainer;

import edu.tamu.weaver.auth.annotation.WeaverCredentials;
import edu.tamu.weaver.auth.exception.CredentialsNotFoundException;
import edu.tamu.weaver.auth.model.Credentials;
import edu.tamu.weaver.utility.AnnotationUtility;

public final class WeaverCredentialsArgumentResolver implements HandlerMethodArgumentResolver {

@Override
public boolean supportsParameter(MethodParameter parameter) {
return AnnotationUtility.findMethodAnnotation(WeaverCredentials.class, parameter) != null;
}

@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return null;
throw new CredentialsNotFoundException("Authentication Object Not Found");
}
if (!(authentication.getCredentials() instanceof Credentials)) {
return null;
throw new CredentialsNotFoundException("Authentication Object Missing Credentials");
}
return (Credentials) authentication.getCredentials();
return authentication.getCredentials();
}

}
7 changes: 5 additions & 2 deletions auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.springframework.web.method.support.ModelAndViewContainer;

import edu.tamu.weaver.auth.annotation.WeaverUser;
import edu.tamu.weaver.auth.exception.UserNotFoundException;
import edu.tamu.weaver.auth.model.repo.AbstractWeaverUserRepo;
import edu.tamu.weaver.user.model.AbstractWeaverUser;
import edu.tamu.weaver.utility.AnnotationUtility;
Expand All @@ -23,18 +24,20 @@ public WeaverUserArgumentResolver(R userRepo) {
this.userRepo = userRepo;
}

@Override
public boolean supportsParameter(MethodParameter parameter) {
return AnnotationUtility.findMethodAnnotation(WeaverUser.class, parameter) != null;
}

@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return null;
throw new UserNotFoundException("Authentication Object Not Found");
}
Optional<U> user = userRepo.findByUsername(authentication.getName());
if (!user.isPresent()) {
return null;
throw new UserNotFoundException("No User With Username " + authentication.getName());
}
return user.get();
}
Expand Down
22 changes: 0 additions & 22 deletions cli/pom.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>core</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion email/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<artifactId>webservice-parent</artifactId>

<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>

<name>Weaver Webservice Parent</name>

Expand All @@ -26,7 +26,6 @@

<module>email</module>
<module>reporting</module>
<module>cli</module>
<module>wro</module>

</modules>
Expand Down
6 changes: 3 additions & 3 deletions reporting/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>core</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>email</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions token-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -25,13 +25,13 @@
<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>token</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>core</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion token/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions user/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -21,13 +21,13 @@
<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>data</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>validation</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>data</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
23 changes: 20 additions & 3 deletions wro/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
Expand All @@ -12,7 +13,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -21,7 +22,7 @@
<dependency>
<groupId>edu.tamu.weaver</groupId>
<artifactId>data</artifactId>
<version>2.0.0-RC4-SNAPSHOT</version>
<version>2.0.0-RC5-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -34,6 +35,22 @@
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
<version>1.8.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-1.7</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator-core</artifactId>
<version>0.35</version>
</dependency>

</dependencies>
Expand Down

0 comments on commit e4e8ebb

Please sign in to comment.