From 76d66c1b200d4add56ff31e2c43f17b530817cc9 Mon Sep 17 00:00:00 2001
From: Lathifah Nurrahmah <13515046@std.stei.itb.ac.id>
Date: Wed, 8 Nov 2017 15:44:05 +0700
Subject: [PATCH] add sql for token
---
.gitignore | 4 +-
IdentityService/src/java/validate/SignIn.java | 8 +--
build.xml | 71 -------------------
data/account.sql | 12 +++-
4 files changed, 16 insertions(+), 79 deletions(-)
delete mode 100644 build.xml
diff --git a/.gitignore b/.gitignore
index 0f3f5e9..39f709b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
/WebApp/nbproject/private/
/IdentityService/nbproject/private/
/OjekOnlineWebservice/nbproject/private/
-/WebApp/build/
\ No newline at end of file
+/WebApp/build/
+/IdentityService/build/
+/OjekOnlineWebservice/build/
\ No newline at end of file
diff --git a/IdentityService/src/java/validate/SignIn.java b/IdentityService/src/java/validate/SignIn.java
index c4db844..efaba05 100644
--- a/IdentityService/src/java/validate/SignIn.java
+++ b/IdentityService/src/java/validate/SignIn.java
@@ -28,7 +28,6 @@ import org.json.simple.JSONObject;
/**
*
- * @author raudi
*/
@WebServlet(name = "SignIn", urlPatterns = {"/SignIn"})
public class SignIn extends HttpServlet {
@@ -58,7 +57,7 @@ public class SignIn extends HttpServlet {
}
try
( Connection conn = DriverManager.getConnection(
- "jdbc:mysql://localhost:3306/Identity?zeroDateTimeBehavior=convertToNull",
+ "jdbc:mysql://localhost:3306/Account?zeroDateTimeBehavior=convertToNull",
"root",
"");
Statement stmt = conn.createStatement()) {
@@ -109,9 +108,8 @@ public class SignIn extends HttpServlet {
json.put("id",rs.getInt("id"));
json.put("fullname",rs.getString("fullname"));
json.put("username",rs.getString("username"));
- json.put("address",rs.getString("address"));
- json.put("postalcode",rs.getString("postalcode"));
- json.put("phonenumber",rs.getString("phonenumber"));
+ json.put("email",rs.getString("email"));
+ json.put("phone_no",rs.getString("phone_no"));
json.put("token",token);
} else {
String sqlEmail;
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 2ac0950..0000000
--- a/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="SabebTeam" default="default" basedir=".">
- <description>Builds, tests, and runs the project SabebTeam.</description>
- <import file="nbproject/build-impl.xml"/>
- <!--
-
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
- -pre-compile-single: called before javac compilation of single file
- -post-compile-single: called after javac compilation of single file
- -pre-compile-test: called before javac compilation of JUnit tests
- -post-compile-test: called after javac compilation of JUnit tests
- -pre-compile-test-single: called before javac compilation of single JUnit test
- -post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
- -pre-run-deploy: called before deploying
- -post-run-deploy: called after deploying
-
- Example of pluging an obfuscator after the compilation could look like
-
- <target name="-post-compile">
- <obfuscate>
- <fileset dir="${build.classes.dir}"/>
- </obfuscate>
- </target>
-
- For list of available properties check the imported
- nbproject/build-impl.xml file.
-
-
- Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
-
- init-macrodef-javac: defines macro for javac compilation
- init-macrodef-junit: defines macro for junit execution
- init-macrodef-debug: defines macro for class debugging
- do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
-
- Example of overriding the target for project execution could look like
-
- <target name="run" depends="<PROJNAME>-impl.jar">
- <exec dir="bin" executable="launcher.exe">
- <arg file="${dist.jar}"/>
- </exec>
- </target>
-
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
-
- -->
-</project>
diff --git a/data/account.sql b/data/account.sql
index 644af00..6a2bf62 100644
--- a/data/account.sql
+++ b/data/account.sql
@@ -15,10 +15,18 @@ CREATE TABLE account (
--
-- Dumping data for table `user`
--
-
-
INSERT INTO account (username, email, fullname, password, phone_no) VALUES
('ahlfaith','tipehtipeh@google.com','Lathifah Nurrahmah','ewewew','0899999999'),
('kucing','sayamaung@google.com','Sebastian Loki','yuyuyu','081208120812'),
('lazuardilazu','lazuardifirdaus369@yahoo.com','Lazuardi Firdaus','mamayugero','08567718483'),
('matthewrichard','mattrich34@yahoo.com','Richard Matthew','uwouwo','08179222323');
+
+CREATE TABLE token (
+ token VARCHAR(32) NOT NULL,
+ id integer NOT NULL,
+ date_expire date NOT NULL,
+ time_expire time NOT NULL,
+ PRIMARY KEY (token),
+ UNIQUE KEY id_UNIQUE(id),
+ CONSTRAINT id_foreign_user FOREIGN KEY (id) REFERENCES account (id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
--
GitLab