* add CRUD group

* add bumpversion

Author: MYassin16

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+bumpversion.sh

.gitignore

@@ -0,0 +1,26 @@
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/

README.md

@@ -1,21 +1,23 @@
 Springboot 2.0.x oauth2 JWT
 ============================
 
-Sample Spring Boot 2.0.x OAuth2 JWT Authorization Server (JPA, Hibernate, PostgreSQL, Dockerize).
+Sample Spring Boot 2.0.x OAuth2 JWT Authorization Server **(JWT, JPA, Hibernate, PostgreSQL, Dockerize)**.
 
 You can use this project to boostraping Authorization your own Application.
 
-If you feel happy **give a star** to this repository.
+If you feel happy **Give me a STAR** to this **repository**.
 
 ## Features
 
 * OAuth2.0 Authorization Server
 * OAuth2.0 Resource Server
+* We use [PostgreSQL](https://www.postgresql.org/)
 * We use [Liquibase](https://www.liquibase.org/)
 * We use [Gradle 4.10.2](https://gradle.org/install/)
-* We use Docker, to simplify understanding application flow.
-* We use JWT Token RSA, production ready.
+* We use [Docker](https://docs.docker.com/install/), to simplify understanding application flow.
+* We use [JWT](https://jwt.io/) Token RSA, production ready.
 * File upload API (Using Oauth2 Resource Server)
+* How to use Validation.
 
 ## Oauth2 user credential
 
@@ -37,8 +39,12 @@ If you feel happy **give a star** to this repository.
 
 For running on Docker instance, it's really simple.
 
-* Clone this repo
-* Run ```docker-compose up -d```
+* Clone this repository.
+* ```bash cd springboot-oauth2-jwt```
+* ```bash docker network create odenktools-net```
+* Run ```bash docker-compose up -d```
+* make a cup of coffee...
+* You're done! application ready to test.
 
 ## Testing Apps
 
@@ -156,7 +162,7 @@ curl --request POST \
   --header 'Authorization: Bearer {{YOUR_ACCESS_TOKEN}}' \
   --header 'Content-Type: application/x-www-form-urlencoded' \
   --header 'content-type: multipart/form-data' \
-  --form 'file=@/opt/pictures/your-images.jpg'
+  --form 'file=@/opt/pictures/{{IMAGE_WANT_TO_UPLOAD}}.jpg'
 ```
 
 ## Build Application from source
@@ -165,14 +171,14 @@ First clone this repo. To build the sources you need to have [Gradle 4x](https:/
 
 After the clone, create database
 
-- For **Authorization Server**
+- **Authorization Server**
 
 ```bash
 su - postgres
 createdb auth_server
 ```
 
-- For **Resource Server**
+- **Resource Server**
 
 ```bash
 su - postgres
@@ -181,14 +187,14 @@ createdb file_server
 
 After **create database**, build the entire project.
 
-For **Authorization Server**
+- **Authorization Server**
 
 ```bash
 cd authorization_server
 gradle build
 ```
 
-For **Resource Server**
+- **Resource Server**
 
 ```bash
 cd resource_server
@@ -201,10 +207,14 @@ gradle build
 keytool -genkey -alias jwt -storetype PKCS12 -keyalg RSA -keysize 2048 -keystore jwt.p12 -keypass odenktools123 -validity 3650
 ```
 
+paste to ```main/resources/certificate``` folder
+
 ```bash
 keytool -list -rfc --keystore jwt.p12 | openssl x509 -inform pem -pubkey
 ```
 
+paste to ```main/resources/certificate``` folder
+
 ## Todo List
 
 - [x] Oauth2.0 JWT Token
@@ -215,17 +225,19 @@ keytool -list -rfc --keystore jwt.p12 | openssl x509 -inform pem -pubkey
 
 ## References
 
-[Official Oauth2 Sample Code](https://oauth.net/code/)
+[Official - Oauth2 Sample Code](https://oauth.net/code/)
 
-[Oauth Playground](https://developers.google.com/oauthplayground/)
+[Official - Spring Oauth2 Docs](https://projects.spring.io/spring-security-oauth/docs/oauth2.html)
 
-[Spring Oauth2 Docs](https://projects.spring.io/spring-security-oauth/docs/oauth2.html)
+[Official - Spring Oauth2 ref](https://docs.spring.io/spring-security-oauth2-boot/docs/current/reference/html5/)
 
-[Secure Server To Server](https://dzone.com/articles/build-a-spring-boot-app-with-secure-server-to-serv)
+[Official - Spring Oauth2 Tutorial](https://spring.io/guides/tutorials/spring-boot-oauth2/)
+
+[Oauth Playground](https://developers.google.com/oauthplayground/)
 
-[Tutorial Oauth2](https://spring.io/guides/tutorials/spring-boot-oauth2/)
+[Dzone - Build a Spring Boot App With Secure Server-to-Server Communication via OAuth 2.0](https://dzone.com/articles/build-a-spring-boot-app-with-secure-server-to-serv)
 
-[Okta](https://developer.okta.com/blog/2018/04/02/client-creds-with-spring-boot)
+[Okta - Secure Server-to-Server Communication with Spring Boot and OAuth 2.0](https://developer.okta.com/blog/2018/04/02/client-creds-with-spring-boot)
 
 # LICENSE
 

authorization_server/README.md

@@ -9,9 +9,21 @@ gradle bootRun
 
 #### Running as a Packaged Application
 
+Build Jar
+
 ```bash
 gradle build -x test
+```
+
+Or Build Jar without test
 
+```bash
+gradle build -x test
+```
+
+Execute Jar Package
+
+```bash
 java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8090,suspend=n -jar build/libs/authserver-0.1.0.jar
 ```
 
@@ -20,6 +32,8 @@ java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8090,suspend=n -jar
 ```bash
 docker build --tag odenktools/oauth2-authorization-server:0.1.0 --build-arg JAR_FILE=build/libs/authserver-0.1.0.jar .
 docker push odenktools/oauth2-authorization-server:0.1.0
+docker tag odenktools/oauth2-authorization-server:0.1.0 odenktools/oauth2-authorization-server:latest
+docker push odenktools/oauth2-authorization-server:latest
 ```
 
 # LICENSE

authorization_server/src/main/java/com/odenktools/authserver/controller/AdminAuth.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonObject;
 import com.odenktools.authserver.dto.group.GroupDto;
+import com.odenktools.authserver.entity.Group;
 import com.odenktools.authserver.service.GroupService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,9 +14,10 @@
 
 import javax.validation.Valid;
 import java.security.Principal;
+import java.util.Optional;
 
 /**
- * Oauth2 Admin Management.
+ * Oauth2 Admin Api Management.
  *
  * @author Odenktools.
  */
@@ -32,6 +34,12 @@ public AdminAuth(GroupService groupService) {
 		this.groupService = groupService;
 	}
 
+	/**
+	 * Check Authorize.
+	 *
+	 * @param principal Pricipal Person.
+	 * @return JsonObject.
+	 */
 	@GetMapping(value = "/me",
 			produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> user(Principal principal) {
@@ -46,8 +54,56 @@ public ResponseEntity<?> user(Principal principal) {
 		return new ResponseEntity<>(jsonObject.toString(), HttpStatus.OK);
 	}
 
+	//=========================== #START GROUP# ==============================//
+
+	/**
+	 * Get Group detail.
+	 *
+	 * @param id id do you want to check.
+	 * @return GroupDto
+	 */
+	@GetMapping(value = "/group/{id}",
+			produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> findGroupById(@PathVariable Long id) {
+
+		Optional<Group> groupOptional = this.groupService.findById(id);
+
+		JsonObject jsonObject = new JsonObject();
+
+		if (!groupOptional.isPresent()) {
+			jsonObject.addProperty("code", HttpStatus.BAD_REQUEST.value());
+			jsonObject.addProperty("messages",
+					String.format("Group with id ``%s`` not exist", id));
+			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(jsonObject.toString());
+		}
+
+		Group group = groupOptional.get();
+
+		jsonObject.addProperty("code", HttpStatus.OK.value());
+
+		JsonObject jsonData = new JsonObject();
+		jsonData.addProperty("named", group.getNamed());
+		jsonData.addProperty("coded", group.getCoded());
+		jsonData.addProperty("namedDescription", group.getNamedDescription());
+		jsonData.addProperty("isActive", group.getIsActive());
+		jsonData.addProperty("createdAt", group.getCreatedAt().toInstant().toString());
+		jsonData.addProperty("updatedAt", group.getUpdatedAt() != null ?
+				group.getUpdatedAt().toInstant().toString() : null);
+
+		//Add to sub-object
+		jsonObject.add("data", jsonData);
+
+		return new ResponseEntity<>(jsonObject.toString(), HttpStatus.OK);
+	}
+
+	/**
+	 * Create a new Group.
+	 *
+	 * @param request GroupDto.
+	 * @return GroupDto.
+	 */
 	@PostMapping(
-			value = "/create",
+			value = "/group/create",
 			consumes = MediaType.APPLICATION_JSON_VALUE,
 			produces = MediaType.APPLICATION_JSON_VALUE
 	)
@@ -75,8 +131,14 @@ public ResponseEntity<?> createGroup(@RequestBody @Valid GroupDto request) {
 		return new ResponseEntity<>(jsonObject.toString(), HttpStatus.OK);
 	}
 
+	/**
+	 * Update existing group.
+	 *
+	 * @param request GroupDto want to update.
+	 * @return GroupDto.
+	 */
 	@PutMapping(
-			value = "/update",
+			value = "/group/update",
 			consumes = MediaType.APPLICATION_JSON_VALUE,
 			produces = MediaType.APPLICATION_JSON_VALUE
 	)
@@ -103,4 +165,40 @@ public ResponseEntity<?> updateGroup(@RequestBody @Valid GroupDto request) {
 		jsonObject.addProperty("messages", "Group was unsuccessfuly updated.");
 		return new ResponseEntity<>(jsonObject.toString(), HttpStatus.BAD_REQUEST);
 	}
+
+	/**
+	 * Delete existing group.
+	 *
+	 * @param request Group do you want to delete.
+	 * @return JsonObject.
+	 */
+	@PutMapping(
+			value = "/group/delete",
+			consumes = MediaType.APPLICATION_JSON_VALUE,
+			produces = MediaType.APPLICATION_JSON_VALUE
+	)
+	public ResponseEntity<?> removeGroup(@RequestBody @Valid GroupDto request) {
+
+		JsonObject jsonObject = new JsonObject();
+
+		if (!groupService.existById(request.getId())) {
+			jsonObject.addProperty("code", HttpStatus.BAD_REQUEST.value());
+			jsonObject.addProperty("messages", String.format("Group with code ``%s`` not exist",
+					request.getCoded()));
+			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(jsonObject.toString());
+		}
+
+		boolean removed = this.groupService.removeGroup(request);
+
+		if (removed) {
+			jsonObject.addProperty("code", HttpStatus.OK.value());
+			jsonObject.addProperty("messages", "Group was successfuly removed.");
+			return new ResponseEntity<>(jsonObject.toString(), HttpStatus.OK);
+		}
+
+		jsonObject.addProperty("code", HttpStatus.BAD_REQUEST.value());
+		jsonObject.addProperty("messages", "Group was unsuccessfuly removed.");
+		return new ResponseEntity<>(jsonObject.toString(), HttpStatus.BAD_REQUEST);
+	}
+	//=========================== #END GROUP# ==============================//
 }

authorization_server/src/main/java/com/odenktools/authserver/entity/OauthClientDetails.java

@@ -30,16 +30,15 @@ public class OauthClientDetails implements ClientDetails, Serializable {
 	private static final ObjectMapper mapper = new ObjectMapper();
 
 	@Id
-	@Column(nullable = false, unique = true)
+	@Column(name = "client_id", nullable = false, unique = true)
 	private String clientId;
 
-	@Column(name = "client_secret", nullable = false)
+	@Column(name = "client_secret", nullable = false, unique = true)
 	private String clientSecret;
 
 	@Column(name = "resource_ids")
 	private String resourceIds;
 
-
 	@Column(name = "scope")
 	private String scope;
 
@@ -64,6 +63,10 @@ public class OauthClientDetails implements ClientDetails, Serializable {
 	@Column
 	private String additionalInformation;
 
+	private Set<String> getAutoApproveScope() {
+		return StringUtils.commaDelimitedListToSet(this.autoApproveScope);
+	}
+
 	@Override
 	public String getClientId() {
 		return this.clientId;
@@ -133,7 +136,19 @@ public Integer getRefreshTokenValiditySeconds() {
 
 	@Override
 	public boolean isAutoApprove(String scope) {
-		return this.getAutoApproveScope().contains(scope);
+		if (this.autoApproveScope == null) {
+			return false;
+		} else {
+			Iterator scopeIterator = this.getAutoApproveScope().iterator();
+			String auto;
+			do {
+				if (!scopeIterator.hasNext()) {
+					return false;
+				}
+				auto = (String) scopeIterator.next();
+			} while (!auto.equals("true") && !scope.matches(auto));
+			return true;
+		}
 	}
 
 	@Override
@@ -146,10 +161,6 @@ public Map<String, Object> getAdditionalInformation() {
 		}
 	}
 
-	public Set<String> getAutoApproveScope() {
-		return StringUtils.commaDelimitedListToSet(this.autoApproveScope);
-	}
-
 	public void setClientId(String clientId) {
 		this.clientId = clientId;
 	}