From 1b9c8a212dc4acd7106cef554fcdf5e5d303df40 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 20 Oct 2020 00:48:37 +0200
Subject: [PATCH] [DEV] commit before formating

---
 pom.xml                                  | 105 ++++++++++++++++++++++-
 src/io/scenarium/oauth/UserResource.java |  18 ++--
 2 files changed, 113 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index e2fb3ec..d673614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,6 @@
 				<configuration>
 					<source>${maven.compiler.source}</source>
 					<target>${maven.compiler.target}</target>
-					<encoding>${project.build.sourceEncoding}</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -102,6 +101,110 @@
 			  </configuration>
 			</plugin>
 
+			<!-- Create the source bundle -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- junit results -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M5</version>
+			</plugin>
+			<!-- Create coverage -->
+			<!--
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.5</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			-->
+			<!-- Java-doc generation for stand-alone site -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<show>private</show>
+					<nohelp>true</nohelp>
+				</configuration>
+			</plugin>
+			<!-- Check the style of the code -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<configLocation>CheckStyle.xml</configLocation>
+					<consoleOutput>true</consoleOutput>
+					<failOnViolation>true</failOnViolation>
+					<failsOnError>true</failsOnError>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>net.revelc.code.formatter</groupId>
+				<artifactId>formatter-maven-plugin</artifactId>
+				<version>2.12.2</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<lineEnding>LF</lineEnding>
+					<configFile>Formatter.xml</configFile>
+					<directories>
+						<directory>src/</directory>
+						<directory>test/src</directory>
+					</directories>
+					<includes>
+						<include>**/*.java</include>
+					</includes>
+					<excludes>
+						<exclude>module-info.java</exclude>
+					</excludes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>validate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
+	<!-- Generate Java-docs As Part Of Project Reports -->
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<show>public</show>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>
\ No newline at end of file
diff --git a/src/io/scenarium/oauth/UserResource.java b/src/io/scenarium/oauth/UserResource.java
index 70cf5a2..953b9fa 100755
--- a/src/io/scenarium/oauth/UserResource.java
+++ b/src/io/scenarium/oauth/UserResource.java
@@ -302,7 +302,7 @@ public class UserResource {
 		// create token:
 		String tok = randomString(128);
 		long idToken = -1;
-		query = "INSERT INTO `token` (`userId`, `token`, `createTime`, `endValidityTime`) VALUES (?, ?, now(), ADDTIME(now(),'23:45:0'));";
+		query = "INSERT INTO `token` (`userId`, `token`, `createTime`, `endValidityTime`) VALUES (?, ?, now(), ADDTIME(now(),'20:12:18'));";
 		try {
 			PreparedStatement ps = entry.connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
 			ps.setLong(1, user.id);
@@ -360,19 +360,19 @@ public class UserResource {
 
 	 */
 
-
-
-
+	public static String bytesToHex(byte[] bytes) {
+		StringBuilder sb = new StringBuilder();
+		for (byte b : bytes) {
+			sb.append(String.format("%02x", b));
+		}
+		return sb.toString();
+	}
 
 	public String getSHA512(String passwordToHash){
 		try {
 			MessageDigest md = MessageDigest.getInstance("SHA-512");
 			byte[] bytes = md.digest(passwordToHash.getBytes(StandardCharsets.UTF_8));
-			StringBuilder sb = new StringBuilder();
-			for(int i=0; i< bytes.length ;i++){
-				sb.append(Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1));
-			}
-			return sb.toString();
+			return bytesToHex(bytes);
 		} catch (NoSuchAlgorithmException e) {
 			e.printStackTrace();
 		}