From 8d8ef627aacc5d3bd8f433a8054f35dbe7f11537 Mon Sep 17 00:00:00 2001
From: Justin Kwan <justinpkwan@outlook.com>
Date: Tue, 2 Jul 2019 22:15:37 -0400
Subject: [PATCH] refactoring

---
 server/src/DatabaseAccessor.py                |  19 +-
 server/src/InputHandler.py                    |  66 +++---
 server/src/User.py                            |  19 +-
 .../DatabaseAccessor.cpython-36.pyc           | Bin 2132 -> 2258 bytes
 .../__pycache__/InputHandler.cpython-36.pyc   | Bin 2449 -> 2858 bytes
 server/src/__pycache__/User.cpython-36.pyc    | Bin 1843 -> 2126 bytes
 server/src/__pycache__/index.cpython-36.pyc   | Bin 2589 -> 2602 bytes
 server/src/controllers/LoginController.py     |  27 ++-
 server/src/controllers/SignUpController.py    |  28 +--
 .../LoginController.cpython-36.pyc            | Bin 823 -> 1329 bytes
 .../SignUpController.cpython-36.pyc           | Bin 1599 -> 1600 bytes
 server/src/todo.txt                           |   1 -
 ...est_DatabaseAccessor.cpython-36-PYTEST.pyc | Bin 10103 -> 9333 bytes
 .../test_InputHandler.cpython-36-PYTEST.pyc   | Bin 16327 -> 20272 bytes
 ...est_SignUpController.cpython-36-PYTEST.pyc | Bin 11269 -> 12384 bytes
 .../test_User.cpython-36-PYTEST.pyc           | Bin 8571 -> 11240 bytes
 server/test/test_DatabaseAccessor.py          | 159 ++++++++------
 server/test/test_InputHandler.py              | 200 ++++++++++++++----
 server/test/test_SignUpController.py          |  14 +-
 server/test/test_User.py                      |  42 ++--
 20 files changed, 385 insertions(+), 190 deletions(-)

diff --git a/server/src/DatabaseAccessor.py b/server/src/DatabaseAccessor.py
index 4bdc48c..221babc 100644
--- a/server/src/DatabaseAccessor.py
+++ b/server/src/DatabaseAccessor.py
@@ -11,27 +11,30 @@
 
 class DatabaseAccessor():
 
-    def selectUsername(self, username):
+    def selectUsername(self, user):
+        username = user.getUsername()
         cursor.execute("SELECT Username from Users WHERE Username = %s", (username,))
         selectedUsername = cursor.fetchone()
         return self.handleQueryReturn(selectedUsername)
 
-    # selects user's hashed password based on username
-    def selectHashedPassword(self, username):
+    def selectHashedPassword(self, user):
+        username = user.getUsername()
         cursor.execute("SELECT HashedPass from Users WHERE Username = %s", (username,))
         selectedHashedPassword = cursor.fetchone()
         return self.handleQueryReturn(selectedHashedPassword)
 
-    def selectUserId(self, userId):
-        cursor.execute("SELECT UserId from Users WHERE UserId = %s", (userId,))
+    def selectUserId(self, user):
+        username = user.getUsername()
+        cursor.execute("SELECT UserId from Users WHERE Username = %s", (username,))
         selectedUserId = cursor.fetchone()
         return self.handleQueryReturn(selectedUserId)
 
-    def insertUserInfo(self, username, hashedPassword, userId):
+    def insertUserInfo(self, user):
+        username = user.getUsername()
+        hashedPassword = user.getHashedPassword()
+        userId = user.getUserId()
         cursor.execute("INSERT INTO Users(Username, HashedPass, UserId) VALUES(%s, %s, %s)", (username, hashedPassword, userId))
         connection.commit()
-        username = ''
-        hashedPassword = ''
 
     def clearDatabase(self):
         cursor.execute('DELETE FROM Users')
diff --git a/server/src/InputHandler.py b/server/src/InputHandler.py
index a3675ae..62015cd 100644
--- a/server/src/InputHandler.py
+++ b/server/src/InputHandler.py
@@ -5,27 +5,27 @@
 
 import bcrypt
 from DatabaseAccessor import DatabaseAccessor
-from ResultCodes import ResultCodes
+from ResultCodes      import ResultCodes
 
 DBA = DatabaseAccessor()
 resultCodes = ResultCodes()
 
 class InputHandler():
 
-    # def handleEmptyFields(self, username, password):
-    #     isUsernameEmpty = self.checkTextEmpty(username)
-    #     isPasswordEmpty = self.checkTextEmpty(password)
-    #
-    #     if(isUsernameEmpty and isPasswordEmpty):
-    #         return resultCodes.ERROR_EMPTY_FIELDS
-    #     elif(isUsernameEmpty):
-    #         return resultCodes.ERROR_EMPTY_USERNAME
-    #     elif(isPasswordEmpty):
-    #         return resultCodes.ERROR_EMPTY_PASSWORD
-    #     else:
-    #         return resultCodes.SUCCESS_FIELDS_FILLED
-
-    def handleEmptyFields(self, username, password):
+    def checkInputNull(self, username, password):
+        if(username == None and password == None):
+            return resultCodes.ERROR_EMPTY_FIELDS
+        elif(username == None and password != None):
+            return resultCodes.ERROR_EMPTY_USERNAME
+        elif(password == None and username != None):
+            return resultCodes.ERROR_EMPTY_PASSWORD
+        return resultCodes.SUCCESS_FIELDS_FILLED
+
+    def handleEmptyFields(self, user):
+
+        username = user.getUsername()
+        password = user.getTextPassword()
+
         isUsernameEmpty = self.checkTextEmpty(username)
         isPasswordEmpty = self.checkTextEmpty(password)
 
@@ -38,7 +38,16 @@ def handleEmptyFields(self, username, password):
         else:
             return resultCodes.SUCCESS_FIELDS_FILLED
 
-    def handleInputLengthChecks(self, username, password):
+    def checkTextEmpty(self, text):
+        if(len(text) == 0):
+            return True
+        return False
+
+    def handleInputLengthChecks(self, user):
+
+        username = user.getUsername()
+        password = user.getTextPassword()
+
         isUsernameLengthOk = self.checkInputLength('USERNAME', username)
         isPasswordLengthOk = self.checkInputLength('PASSWORD', password)
 
@@ -51,27 +60,28 @@ def handleInputLengthChecks(self, username, password):
         else:
             return resultCodes.ERROR_USERNAME_LENGTH_INVALID
 
-    def checkTextEmpty(self, text):
-        return text == ''
-
     def checkInputLength(self, inputType, input):
         if(inputType == 'USERNAME'):
             return len(input) >= 6 and len(input) <= 35
         elif(inputType == 'PASSWORD'):
             return len(input) >= 8 and len(input) <= 65
 
-    def checkForInvalidUsernameChars(self, username):
+    def checkForInvalidUsernameChars(self, user):
+        username = user.getUsername()
+
         for currentChar in username:
             if(currentChar.isalpha() == False and currentChar.isdigit() == False):
                 return False
         return True
 
-    def checkForExistingUsername(self, username):
-        selectedUsername = DBA.selectUsername(username)
-        return selectedUsername == username
+    def checkForExistingUsername(self, user):
+        selectedUsername = DBA.selectUsername(user)
+        return selectedUsername == user.getUsername()
+        
+    def verifyPassword(self, user):
+        password = user.getTextPassword().encode('utf-8')
+        selectedHashedPassword = DBA.selectHashedPassword(user).encode('utf-8')
 
-    '''test!'''
-    def verifyPassword(self, username, password):
-        selectedHashedPassword = DBA.selectHashedPassword(username)
-        isPasswordCorrect = bcrypt.check_password_hash(selectedHashedPassword, password)
-        return isPasswordCorrect
+        if(bcrypt.checkpw(password, selectedHashedPassword) == False):
+            return False
+        return True
diff --git a/server/src/User.py b/server/src/User.py
index 1e7805d..d523244 100644
--- a/server/src/User.py
+++ b/server/src/User.py
@@ -8,9 +8,9 @@ class User():
     def __init__(self, username, textPassword):
         self.username       = username
         self.textPassword   = textPassword
-        self.hashedPassword = ''
-        self.userId         = str(uuid.uuid4())
-        self.securityToken  = ''
+        self.hashedPassword = None
+        self.userId         = None
+        self.securityToken  = None
 
     def getUsername(self):
         return self.username
@@ -27,15 +27,16 @@ def getUserId(self):
     def getSecurityToken(self):
         return self.securityToken
 
-    # update User Id!
-
-    
+    def updateUserId(self, userId):
+        self.userId = userId
 
     def encryptAndUpdatePassword(self, password):
-        hashedPassword = bcrypt.hashpw(password.encode('utf8'), bcrypt.gensalt())
-        self.hashedPassword = str(hashedPassword)
+        hashedPassword = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+        # generated password is encoded so must decode before storing in db
+        self.hashedPassword = hashedPassword.decode()
 
-    # generate and update user id!
+    def generateAndUpdateUserId(self):
+        self.userId = str(uuid.uuid4())
 
     def generateAndUpdateSecurityToken(self):
         username = self.getUsername()
diff --git a/server/src/__pycache__/DatabaseAccessor.cpython-36.pyc b/server/src/__pycache__/DatabaseAccessor.cpython-36.pyc
index d2886f214e438435e9c214d595b5d44414e02ce3..3aa12dd6eedbb9b812564b360d01d8f30c47e219 100644
GIT binary patch
delta 964
zcmbVKON-P%5bjqxne04ve2k*7E3Bfyl@VlR^dQJ8I2T<N4-P8Eq{p2&lR$SCK_VXJ
z7ii!71KtGBf@i&o7jy9J&#=1Z!Hld2H=!%3M_1KXU;SA9-mF}z)%+vhPCgc&DjRr<
zA%rNLZ8+*2hyo{Qj9!x*CnUxN>EkiM2s8>-TA+j#R6oR>x>K$^7x@DvWEzfyeuvvt
zRx%}qeQA>FuXr6d^lvO&4^)IbeUG#cSnngbddHD2q>(0>tQg@Nu>vAsvTFWKSy=;7
zwxA6W<s!Zns$CK9gi5{4WGovd!irUWfv(Lv+o4<64m61|zK;TO`_-oYOgHo|;>Z8f
zW_{MCnPPXTJ%ge;aZj8lz@lc8yw1+tC15a*Gd-5U%b?5{gfF(70h91$IZc>hw4ep+
zQ_HH8@G-(DMh1ocz;3<?Ts!7o6S!R-UavBx8ycOHQ2J4prZDP3mX<uqMx#L<IDgU6
ztM4w+Q1ZQf@zw|F8aV7ub<=)!3cx7CGAxgM59ue)i!1ZuvIQ=A3`Bq@B^USwYgvni
zB9u46JbV@^aaI%lv}10UPBhG*lDYqns|_2mJqLGQzvqKZlRqG~R?n9r-;-%K7o)|!
xf(W~mZQXVs@upD^>$mRlqh?bV0;gN}#ces<<DRR3x}9|k$l~MsMql(!{{cwn!%+YL

delta 869
zcmb7CUuzRV5Z^y{mrHCev5H0?+DKd5lS&I>iGmNMD&|E55uyIU^KL^Ek~`SFB9to@
z;y2h2AwDShRf<ph4Se>^2XSUE32nuP-Z8VgvorIX-^?Cg{L!r5sn=^;f3ClAzE_v%
zZB7V5*#S{)P&paUgch_%$Bg2MjmaS^$bc72N3=s7{h4m8a^om5>=}Pw37JMCVVZCj
zaW0Y<6U!GO1I?IlJxEJ*$~Ml4cFgVr+70LOX2|6Q$RX!InJZJECz09{$+JkQ51CA4
zfF4#g^eetFfj#1Px6Va!OrMjGJw3RkfAOViH)%g;uc*-0@pw{)@sM>lF~PJH<lH?~
z0#-U#UYD2Gz@o}ld~#N{9XR5Ls|#WWa1%Du0Tis@J#L4<27F8?N!TF;VF`f>x&G}u
z`e;b#$O=SBAC#%ZS(?HS`dMncI2(=nIo!`$w;Sx8ZrLS_JkdAI5%g0aliQ-xUbX->
zg~<t>r#^M)!Q#UxkKRX0Y{&Yi`}W=pUS0(+*#Z^P67)>!dOQ@7oQ5y!Bkx@Yqm3I6
zGXTZ-|AaQI$Igu2nr>D4>zF@e7HhXAMZPc7ZZ1Y=D9IYQt?RFq*IpBLa$Yz5)+QQH
lIF=6wZ8#%*XbMd}^F7~%-_tMs&Z1>#38U9P;rg4u{1=^#v=jgU

diff --git a/server/src/__pycache__/InputHandler.cpython-36.pyc b/server/src/__pycache__/InputHandler.cpython-36.pyc
index defb075a5ffb376282405ccef5efbde49c4b8f21..90063aac5d0002d977fcd33a6855ef1cad9d5665 100644
GIT binary patch
literal 2858
zcmZ`*TTdHD6yCcRV~nA>wM`<cH`Qtyq*SW<5T!BL1SH}R>@@01>B`wz@S4STX4WAf
z=ZXB8{-t@XREfXPr+#PFyI@0Bnloq4TztNB^)E|H#eWNT-xwuL`$xO<nc$ydh;<OA
zc^cE15$m3g*^G@N!!vY}S+RL!dZw<0#+l|>p$Td~)0oYiPa1R149{UkTdNgL|0-7T
zCA~;ggSab1wbvc6I26^f2zfOcjK)dzI7)ie{qZ13qTxVPM<GwT(I6TeRFfgDhU)B~
zdlag-aKAdjOUFabis#T%Yt?jFX>^nB+pY-fK@bWt<d7}yg<>2h8$%X~fDUG#0p=-&
z*Z~POz|%Z~pnlRklbOuIY^7j4n-!RgwZj%z5p#hpvJz&OEwM7@1-8s8n2T%$fLCQ{
zn=oxDlsq7V(nmA>>IR0`0-4}94-I~6Vx)7T_4RfpeW0W!e*h`WI6bqj?wEWXQnRgr
zTKGl1RkP(Hzd$Nin|pgN_Wb7a-Oiu>=5}+Z(UvzZ%U-pcd#(EO=B#wL-fq8svDc6{
z+pjh@n(g-VE~cHGW}{|GON8;hbjfq%4e4fX_*>&k!1Uj<wO7~^YyGiEqQT*Dcd*tN
z2IHe}kchR{;oJIXB-D}mIO(n7==+eb2_CFnw%Nnci7W@bFgR4w);Nxr$!cW~O|R%q
zK2E=$xi@<!Aam2_VC1IX#bToOwKMIbfmz3FPGIDTai)K?6la37Cl-G+vH7FKBqL+>
z7@Q5x=9}OgnBVLd+Q^aA1+H8?2oplDEVGP7C;X7?PUCb6h(yh!QF6j<=)p-dULfKU
zSpcayyogC!WMsZbV&tgiEk`1ITs=U7?D6zPa)9yzCqv1VG|$xDW)#Lu+<{o!0?`at
zca5T6#O&x+I*il%Gse7fJ+~*>GPmaqED~7s3>5<5T%oLI2+o?-;yU&^o5({m4hJ=3
z3M_#QQazQ%q%2<rsbL7Rh^CjI)OEhi&6n#!=P9*RS|wnv^DWciT_g1_GbSc@_?MZ`
z_sPUg=giN{g0wT0cBVd0&-Nju-G1(W#Dns`-I8veQ*M?=fL`Dg=)_k*WaT0}cf!Fz
z(o-?uRkLKv9`LjK{!X*?th43aOH()BPsRRr>yP@*b|c%KyOnKE<B5MkdR&Cl>P0xE
z%Dg!AAj={ulg;@_-cF-J1xk8mgYr~7#Os$rtE88VOL=OXes@i1U3ujCTG_zUsCyJ#
zRRkK+lo^Ni@cxuH57Vkij(Iwj+1P(F<sI5rPAatcZM=0(A#?sM2&aTNr_4LAgVc0>
zlO|KeskabO8Sk8oLTM{@&KCSj9R3|c&<mRG>US_s@68~ccX=MS7Ov!R`zsb%+<y3R
zVl=cjRa7ODs*?g<29G|Q@(h69m0xSBznZPh4m74HlZ8lh<590m42uq;q-H577ryrv
zgE8kQ#v8pZpTi^XDrGl^e0%V|8%HcFH*{7s@dJVi6M&*}D5$loP(O1!hfR?4(m|z&
zx*in|6k{sK0C`A%8_?5CX*SmDvW%7!26<ssNT)7RxMU?g5a#;M<GPdKYJP~QD;;FO
zp5ylgIYQHm`sw%AqM5&wBl(O2`-oIRlNf!Ia81`{V)bnxMCn2F8vN0vGI?r`ll`B6
zgCCu=P&nZrz&{pFF)DAQ@V2_57qToprSmr6C!@qGC~TwS8BbHckhe0k%-)<gP8kh2
z+CRx2eu=A7H<$Gaa`;Leo;}~HElSt-spa{;Ec*V@kd0&FOTPbZ+>O&6PW_uxt5B7m
ze?=VS5C4Y94@7<<a?!&sdIMRSR)T`uHQWVv#kDaU*L5vUyS0KW_&ys3zR#(Pa0)R_
gv8HU8_F6i4-TTsgoGSf<P6#rdg}z87%+Vd=f8$KHegFUf

literal 2449
zcmZ`)+iu%N5M3@Qik9U|+_VkqBxREpsDQu%TA=Mi8(5L#3*g9xW!ETyl%Tn5ixy2O
zyOeKGo}Az42lSWrwNL(qK6Pd(%95Ot*xBLiZO)#V;g1UorJw&=eRnZO$UkJ_F+pF4
zCf|Ty#3RgLG&Vc~dNZcy)T0L4tk^s^J<}kZ-V)E^Cdk4jVFhM?B+S00p3P{RREjr$
zmRxw!P9)th4y1HDLBe7#-GSu7jgtN#buXi|<DLwXFpYYNbo*SSL6k(vshjp-Dc5t8
z;GFBdV7=Rioi2NVmF~b#(yAD0xe=tnaUgju47rp&0k-*lE(dX1?=dbzoR~iplyzvb
z0fG~NM?8v9KN8PmCbOWoGB93&6`2FyHk)H5=!<Ngm7#ao0$YTBjx7PuWmVorEL$3#
z2=OBEDL}*1>d@pmh#@&6L*v%?U}}wmW(`g8VrYpMsc{CE24Am0GeNV&PoP<C0<zEs
zLf|B$Rk77#*x_OKfM2D}^L~1*=EXfyZ>71vzq{`@-|ij!;csj=cN%T)@ucmr-P~{0
z-ZrPLd$o4^Xm`KiecnE-*PHG3Xf1R*JIzL=pe)Jb6XhUt$cA!q8oZ@Q9*(TqAvElb
zIMRl{i6{a3e>bZ*Pgc(cGL4e%Wsp=Gy>M{OlT=oZ_;Ib@mwHNVkanst^@5A46k&Dp
zcGvpX>QNR)dh?Bl$4oBa6|aCGM#(5q$FL16YxL&%)ba;Qr|3fJG+hi7B#9Y77|jS{
zbVxx5%9z=uVr^(;eNG*-z}gsD8zUOCxgJ<?)EiR@6l+QgE#>5#C@1IPU<0mvSre_j
z-{Hw=+7UK*<+(XU`7%FW<?l3Gn+IFovyAZZcxLvuTff(Kwj25I%&L62QV>NrMmQ*-
zMi6i1p5V-n-7ea4j&qwPITQ1+OnsSM^@RU*3|#pX21i_#jWS&Zo<@z{eESKm9&8X|
zQsIOBIKj~0A=Iia)*jkYS<qFeMx(40@@2+DfeBiHCiRBK&Fa+Y(`hyi6AY2@p;$w*
zLxr0X2oI<u-9qpANH@C%WHOXYpniR1E5P{ck#6I-4ufJ#EWloO$nf1u5MmKE1a(&f
z0Ts=Rc~UVo9B(edf^%@)=c=I9S!kFLub@fXff$bQ1lrBBhXA!Dqi}q$2oYNynp^{M
z_5ILjkaz9}$bd6)3t0hxY|xEdX8`2AeMEHSH(MJA6{?Dn4B~z#K!ru8Q9ANohn6=V
z4upWzuXh45<Gp&S?|!2vwv&q>j#yq_aIX9Ty~<#fGFX*|u>NQ56vQ!$SU6I0hN*5K
z#9<ahP;IF)8*gfA5sDuV)7*_o9BMfm<6|dh!92;qG_N8oe5d&~zaS6`1QxBE?>-4)
zcFi~pF?PoseFYz50A@<h%%M4|RqzAB--abH?bPGU*{wi!ILi}Q*~g){?x)^o+EYKT
z?0yHPJtzn2iyZLuF5aX2l2Gpfwc%{OsYNL0(aCjw?r-3c#DE9<W_dRKrsuXQCFS@&
z{(5|0m3;ra#|AO#W#4~42;yu+lwmiqi~=u6U>b;36knrwi30yc69Q|MKo&6nBxapM
zodtMJ$A-6{$0|it^nKO~eP4Wo3ov#B-oL(AU6}R6iH-F+x)M6SX5PNWV<ft0!7mDn
IpKaLmKk)8kbpQYW

diff --git a/server/src/__pycache__/User.cpython-36.pyc b/server/src/__pycache__/User.cpython-36.pyc
index 8c747630491d56b99dc5a09552b7544f9b816186..f6ff4eb677d1ad1636928ebc173bc362a1b1b9dd 100644
GIT binary patch
delta 956
zcmZ{i&2G~`5Xbk^aonUyL#PV`q(WO^LCXO|goF^NAjE-!)b`Lq6_xA;rKCx;wpCI^
zN~Q1u(H?jP4xD%iPCS6cfeSAI7k1V(M6{K)KaY22$Fu*LFVo+O-tBzed;0s*&JG`W
zE&O_P@VqQaAJF!cI48>HofGHRQ7}9DTDfr*A=JlxR6~7Yhy^kvmei67WMc7J!1V<j
z+;rkls%Ij}hq4~4X4Kp0yp!#KCM=Y#hN32&Vg{d(%IYIr!;b!e@A|MGVC8~4JBFv1
z$+{2Wr};jTSNe!#iYE?bY0Y=eI5eOy{LC4?pY-8?7$2-vvqH}xz5MYdv9gItS}E9*
z<(khV7k9;OBsZ-LS0D?dL-=q8wpJ#+b?Y%sxIL^@q;IjyexK~IA?VEQZ^_yrkE6!2
ze!~{F5=Y2-M@Yp@d_Zj-iQC-`!-I|zcK82^=489Bdfn(zTWs3eUjB`qHz`6;7vWi=
zzq9KDZ0zyvOXed&5#A$1G=vc_4NqIm5*kJ-VR76P2?yRubvfBVlOyrp%C=NSlyL>A
zI!nfRtWE{C^kb*Qtxx}AA*Q;`?>RXWr3(5pU#gbDwB2KA13)zU=j}oSbN1wYx2bv?
z&3!p3g7%ziIM6Fj73X!sSsYBkF`G9J)-<31C<0~xbASq95%6y&tp$UjKq#1i5Xy3i
sn{nyH!(D140<J(vbrG-tn6Coi^l51m_x^rI#4Y&%ni0ZqyVySD4=bRuUH||9

delta 610
zcmZ{gOH0E*5XW~nn+K^$U(yIwTW!@wJP1CDc<~}4_&C&)B1K4r_-fgtR59S8M?okH
zeh1H<^z2bQdC+_p!OT`I1xw(^Wd1Y%otd}9qp2?#hW>P)J$#`Z{S0q)THCaO>{RDt
zbZHhL6yN|=Q9vSM2V&w&K0T4!s11LL$f*vBddN<QY>nrzos>MEg|yjpolpiY@(r9f
zXynJ_2oH!E+{aaH@^`#!LEgq}2xQ|ACZ8Y`3(Eh~ZpneA4A8zv)zSxOp0sPl256ts
z8o#468J`A3Y$yNjMVtOHf2GAarbfL?JS>TUL#=V-d96BgM7D4KoIGYsM)e*nh;Rn;
zO}WIAii;_~R#ub*c%}KXGF={lP|QWUcM!LNCHCWf{j_$me%Wx@)t-A^>wCgd3%JBr
z)iRE8Po27ngOBh{LX-le0mFbSpa|%lSwtq}NCeo-gMN)@swVw>s-_6lmRSZWH9!H7
Q2S8)jG1l`n`Mfs%4a7`n0ssI2

diff --git a/server/src/__pycache__/index.cpython-36.pyc b/server/src/__pycache__/index.cpython-36.pyc
index 23b001045697c86fed68fd83d8b534384d8e4163..e33a6aa6cfffe8446ab9ab5476d25e36a89c6ed9 100644
GIT binary patch
delta 137
zcmbO$vPy)@n3tEUeYsSuJm*F(env*Q%~Fi1Y~m~o3=GadT&x2mN*J;jQy8<EiZmui
zvdO40GNdpBGib8-6^Q^Pi$p<$7?99pEdpsP5(g5KFR+WT7D<3u&)7|P*nkWMCN4%c
b#v+-`Djb}QjAoPdI2SU?OuoSB!^jB$PvaL6

delta 164
zcmZ1_GFODln3tF9XOL9vU5<@h{EUo}o23|2+0vOA7#N&^xL6EGlrS_i)H2jCWHF{N
zrZ6=#F*2ku2Qz50RLN$hX%wXvmZlb$=;fxCWaOtP*xD+n2lxkvsB2oiWCZGc$pj?)
zG?|JxfOHgpMq*w{PHJdzYLQQVdS>3_kL)H~EI=6sW;Vtmxy^<goQ#a7ldU-yGRjT9
J%jv_&0RS;0CW8O~

diff --git a/server/src/controllers/LoginController.py b/server/src/controllers/LoginController.py
index a0d97ef..1c12de4 100644
--- a/server/src/controllers/LoginController.py
+++ b/server/src/controllers/LoginController.py
@@ -5,33 +5,38 @@
 from ResultCodes      import ResultCodes
 from User             import User
 
+inputHandler = InputHandler()
+resultCodes  = ResultCodes()
+DBA          = DatabaseAccessor()
 
 class LoginController():
 
     def handleUserLogin(self, username, password):
 
+        # check if inputs are null
+        fieldNullCheckResult = inputHandler.checkInputNull(username, password)
+        if(fieldNullCheckResult != resultCodes.SUCCESS_FIELDS_FILLED):
+            return fieldNullCheckResult
+
         user = self.getUser(str(username.lower()), str(password))
 
-        # check if fields are empty
-        fieldEmptyCheckResult = inputHandler.handleEmptyFields(user.getUsername(), user.getTextPassword())
+        # check if fields are empty strings
+        fieldEmptyCheckResult = inputHandler.handleEmptyFields(user)
         if(fieldEmptyCheckResult != resultCodes.SUCCESS_FIELDS_FILLED):
             return fieldEmptyCheckResult
 
         # check if user exists & check if input password matches user's password
-        doesUsernameExist = inputHandler.checkForExistingUsername(user.getUsername())
-        isPasswordCorrect = inputHandler.verifyPassword(user.getUsername(), user.getTextPassword())
+        doesUsernameExist = inputHandler.checkForExistingUsername(user)
+        isPasswordCorrect = inputHandler.verifyPassword(user)
         if(doesUsernameExist == False or isPasswordCorrect == False):
             return resultCodes.ERROR_INVALID_USERNAME_OR_PASSWORD
 
-        # at this point, generate security token and return it
-        #   - going to have user id problems
-
-
-
+        userId = DBA.selectUserId(user)
+        user.updateUserId(userId)
         user.generateAndUpdateSecurityToken()
-        print(user.securityToken)
-
+        securityToken = user.getSecurityToken()
 
+        return securityToken
 
     def getUser(self, username, password):
         user = User(username, password)
diff --git a/server/src/controllers/SignUpController.py b/server/src/controllers/SignUpController.py
index 1295d89..83b60e9 100644
--- a/server/src/controllers/SignUpController.py
+++ b/server/src/controllers/SignUpController.py
@@ -6,47 +6,47 @@
 from User             import User
 import uuid
 
-inputHandler     = InputHandler()
-DBA = DatabaseAccessor()
-resultCodes      = ResultCodes()
+inputHandler = InputHandler()
+resultCodes  = ResultCodes()
+DBA          = DatabaseAccessor()
 
 class SignUpController():
 
     def handleUserSignUp(self, username, password):
 
-        user = self.getUser(str(username.lower()), str(password))
+        # check if inputs are null
+        fieldNullCheckResult = inputHandler.checkInputNull(username, password)
+        if(fieldNullCheckResult != resultCodes.SUCCESS_FIELDS_FILLED):
+            return fieldNullCheckResult
 
-        # # check if fields are empty
-        # fieldEmptyCheckResult = inputHandler.handleEmptyFields(user.getUsername(), user.getTextPassword())
-        # if(fieldEmptyCheckResult != resultCodes.SUCCESS_FIELDS_FILLED):
-        #     return fieldEmptyCheckResult
+        user = self.getUser(str(username.lower()), str(password))
 
-        # pass user
+        # check if inputs are empty strings
         fieldEmptyCheckResult = inputHandler.handleEmptyFields(user)
         if(fieldEmptyCheckResult != resultCodes.SUCCESS_FIELDS_FILLED):
             return fieldEmptyCheckResult
 
-
         # check for proper string input lengths
-        inputLengthResult = inputHandler.handleInputLengthChecks(user.getUsername(), user.getTextPassword())
+        inputLengthResult = inputHandler.handleInputLengthChecks(user)
         if(inputLengthResult != resultCodes.SUCCESS_USERNAME_PASSWORD_LENGTH):
             return inputLengthResult
 
         # check for invalid characters in inputs
-        isUsernameCharsValid = inputHandler.checkForInvalidUsernameChars(user.getUsername())
+        isUsernameCharsValid = inputHandler.checkForInvalidUsernameChars(user)
         if(isUsernameCharsValid == False):
             return resultCodes.ERROR_INVALID_USERNAME_CHARS
 
         # check if username already exists
-        doesUsernameExist = inputHandler.checkForExistingUsername(user.getUsername())
+        doesUsernameExist = inputHandler.checkForExistingUsername(user)
         if(doesUsernameExist):
             return resultCodes.ERROR_DUPLICATE_USERNAME
 
         # insert user info into db
-        DBA.insertUserInfo(user.getUsername(), user.getHashedPassword(), user.getUserId())
+        DBA.insertUserInfo(user)
         return resultCodes.SUCCESS
 
     def getUser(self, username, password):
         user = User(username, password)
         user.encryptAndUpdatePassword(password)
+        user.generateAndUpdateUserId()
         return user
diff --git a/server/src/controllers/__pycache__/LoginController.cpython-36.pyc b/server/src/controllers/__pycache__/LoginController.cpython-36.pyc
index cca42ef479185bbd58eb877f9b402a6634a5ddef..7ec816d7528a2501a89d108b4239edb2833ec69c 100644
GIT binary patch
delta 770
zcmZ8fO>YuG7@pZL=u)60(9&o%se0g|2Te@8k!6V(q|L6?#6$_Q16|ne;>=*FS;Ap^
z@Z@C^|AWV#{2gBB?*H(eC7|gh@5ju%@AE#h&-^lOO!H~6XfA%-`S41=F*S_ure$1P
zdD=C4uX(zQ8ipu$qp=@aQOIc&1cVM%wEl7sG%yQ{eFGPx3F0`$6D2_jhD=FtqAXRe
zPPAB^=m`REz?rhtVvXk}`Kd}@#F~qsVrN~E;HAETrFpBth;<K76&A#XjFduq!Igl!
z3BrgMAuA;qBM$*<rPpqhMQ%*^86#Avj8mZp(Iw=&emI-+mxIuQyNJqpme?0Fe%1C#
z;4x7cuhwnh;DU%UV7ws<emY?6GNPU+P{QT`w<3=)QFG5M%XZy<yJL4-GIYCkOVo$w
zWH@a{)L!_E`{7u!$lyv}2=zx-TeM@_aZa3mr}wtm?X>!5uI==irPp>JHcy+b`|iYP
zrQh-MPdTA65{yKCzJbcmHk35ECu$?fKf8$~$2%EMQSl<eHuEz+qT;g+0V|@E4Eaw)
zkJ3N*^L`a%L`q$)ViRj>30LtRHgf4l<-uyJyVP91flT)jBpk(3Yfw5?;pgLC15+LL
z8yek*Ko6v=OLr*U(bnCQnS4eM!I;EFF!$@htrz!L>S(|ndksCkRvtaM4~1FZe^?o6
c257+P4p;`5SMrDHZ{^wEzp3lWw5A^a1tssx`v3p{

delta 239
zcmdnUwVjR2n3tDpdZ1M7VaAPIER2jIlld7%S%MifStc7WO8KxbFfcF!u`>`CD*%ZS
zh7`sWre>yE<{IWK#%2aah7u+qi@BMRks*ZvsE^q%inX*jwaD-mM?qq7ae01GiY7}D
zD^Tm?^-SgpEVo#SQ*+X8ae&n1CFZ6Uu>+-Uv4FTM8H)HOdoUMrumOb_n7EiGpJ!HP
r_5(VloJCbb04P?(hf45+xFFS>KwQiOBsiERpJp);Kvy@JpH&F}Rk$vy

diff --git a/server/src/controllers/__pycache__/SignUpController.cpython-36.pyc b/server/src/controllers/__pycache__/SignUpController.cpython-36.pyc
index fb60988f8d0a4334e8e6db25cb89cbb23d7bed28..1d12d5c1b947c647f942cb69976153280e48a0a1 100644
GIT binary patch
delta 656
zcmZWnO=}cE5bclo+?|as7+p8<BM=GWML{IsNf~xAIV|G12%?8|r%iTtGP`v55+fZF
zn6rY+#gljt#G`k?{0m`zf<M8NRfCBK5B0kGy?RA;(LaKdz`xUKHGchEd2#&Be@>5l
zLWl(sL8y-anxxcF!wPoD4c9E?Q!cxP$Hb7-(zc<gQ;>o}#tI5m7C2mE74*<H_TTz#
zW5?LZt9i#b!28hWrEzM$QS+{GpCok3<QtHiwGh;TXFT~1xE63r={e*mf&2NGgly0c
z+f^{h=L`LClqZ>x)zWxZjHg>j4Hj8e9<v)8?vBty1tM2kR(3YqhrGR8J9>L_ebAqX
zEK%iWcG9feco;>!I1c^tE$?1@cHtF@*ek-$kA+%fy8OcXt5rLh35AXG(VpnNo+$m5
z$Sbh8-%sCv+AQx|n;YwJBRrrDYOxM);CY4~bs)D8%MaGQqw7$r$-jle@?ou%7@o3%
z;0bT0gOE!bDyxpj$MRsVALPk!o{Y43G*W7RCX?#Yj>v@s=1jsNx02A39dOFa2wj8~
z1e_RP74RyiO@P}F$^#%Ua)Wy1wjJHN2G?3WwbZ^-n*(YKLg63sn73Abx9_gI=vhX<
O?<KM5KX<w8-24Nrvzns-

delta 589
zcmZXS%WB&|6o%)fixtVP8>hY{fkL}bOX;EnjJGDirH~X9Z-lcjNF<hByUeJy7h}8-
z*#~Cb2k0(&fRH?g3FK9JMs-bS7U$!f`Tu_oBXsZHxrI-j=Y06pJS*Q6`gmz0gcwu@
zN?ZdZN>GX=PDq9_3?0dEMiw-s36nH2G6Xb1BMT;3Y9;oF^0s6F0!QILhanAcIN<0@
zBX?~5b!2#9N;AU45#e*NxVh+UL`z!y3eJmgUP@kUt}W;5U&4Bd5$M|i^2za$Us+k_
zaoQ6xUr~|rl`)>qpm&Fp??2M+U=oehl<e$>TWi;3@GTBYFr3Eo^y@%~*_21BMc%4Q
za_5I-P`U$g5l8>Du&_>kj#gIC>vRr-z_-;2ZKx$Zs)prg8VkK&-+VY9iu5<)P4z&<
z>wWmDh}38WJD9Cm#5Oi*5i?*z{bX%iQ#Y*c!E^AjPq+b*P(8AG%V)d_1Fvb+H5wYt
z4R&>B0p3Fi6M$fmqrMoOk9#oW+7o}C%tPAiK?(f>*u>sdx5mL6M`tP;u7)-}ORHDr
FyFZVNgK7W(

diff --git a/server/src/todo.txt b/server/src/todo.txt
index 6287f4a..24cf1a5 100644
--- a/server/src/todo.txt
+++ b/server/src/todo.txt
@@ -3,7 +3,6 @@
 #Server Refactoring
 
   - double password confirmation?
-  - start working on login controller (eventually use json tokens)
 
   - change button color?
   - Need Google Captcha
diff --git a/server/test/__pycache__/test_DatabaseAccessor.cpython-36-PYTEST.pyc b/server/test/__pycache__/test_DatabaseAccessor.cpython-36-PYTEST.pyc
index a8e2b6bb54c7a19eba040459846cd839909988e4..96856ede166860d0a54a322ddfe5c6328796f8bb 100644
GIT binary patch
literal 9333
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

literal 10103
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
K=D0az9{D$54=1Vs

diff --git a/server/test/__pycache__/test_InputHandler.cpython-36-PYTEST.pyc b/server/test/__pycache__/test_InputHandler.cpython-36-PYTEST.pyc
index de0bfe431a1dfdb51f9bb2ab9619e0f425cc1bc4..79d81d7093a9893b00b647b275c3a954802fdf3d 100644
GIT binary patch
literal 20272
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

literal 16327
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
Q7kqA?Ao-*oI6{)|-|rB$S^xk5

diff --git a/server/test/__pycache__/test_SignUpController.cpython-36-PYTEST.pyc b/server/test/__pycache__/test_SignUpController.cpython-36-PYTEST.pyc
index 2787e00eaff37c5d5341d5efe5fd6fb383eb4cd3..aa27d522218e2c6105f7b78294d44d9a54441319 100644
GIT binary patch
literal 12384
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
YQ~Z>H2A9mX_8~qbczLfNd*ze=1))_&ivR!s

literal 11269
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
Wru`7$5=ddw_%I(9WL_4Ok$(g1TUxgO

diff --git a/server/test/__pycache__/test_User.cpython-36-PYTEST.pyc b/server/test/__pycache__/test_User.cpython-36-PYTEST.pyc
index 65faf6256522598feb631acdedb47fa072923567..148bbbfc280d9e9176c9b12bb07b95ad6d466c18 100644
GIT binary patch
literal 11240
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
D?aEa`

delta 2464
zcmcIl-A^1<6rVf0J3FwuuwQ(`e!*4-3;`*%m=<XhYa67te3VG6bju8|6c)U*h*S*3
z>O*5ptS7#r(Zoa(pY|W9kG>cme44~GjSq?szBZ{ocz-j?!txQCpgY;$oH=vuoqK=h
z{LcMj;_r*Cy@5dG<8K;oeyB*&Z_=KhEbKw?H#Z-&ZhF|Lq=g?myi8w(Y6>m#*Nj!r
z53aWr%e`V6oL+QyM|~n#W85!pJOaCl%k-YRJ?Ie+mb#kZxomFM<O&tsAF%-Sd(J9&
zB^;}snEP9apQ0@`6b|MMGe0$J<j2L#xy+*BrR(XmOXlr`N1hl{F-Ckxq3+5L=%Gsq
zaTT*v04f1K+VYMy2N34wRq#{;f`AYpOq*@dji@liJjG>q;>GiDiDiqMRV`L9X1trf
zmNCuMC9d;YMA!?igC+Qqcs-y2&<JP(Gy_@yF+f~^R>83xo&Y2PDT%%es{PLX;b;S-
z0jEmvoUp9u4jp?J6DU&BMUOlU&3}rxyreT-z9+vgtxNN;7=tC#-Bc61MFVwdT9zy8
ze#v|1RXw!so?&`;U0!$1$oJg3pZdaa`mr`e-z$E4QrkkGM7;E?u%ngHGQu0cg67&s
z`BOQ0o<eP-$CBPqB)tc-F#dwL@m|=~bcrQKLW1+l8FS9i|0~w%(_sDJGq7B{!*coO
zQO9P2ey&N0`a4s2$=@xP(NTwFAE1Nx&|mdek0m1rGPaTUZM$52wBE4LV!0NKoTk`?
zYq^%!dH}tEJ|3b}uyvzI-dQn__v8DeB0dM#MYyV+BCaUP=*o%8m!Eg0bZVGB4@PWF
zI}&gTmwpe9#rIWi)eff+@)f<2CPNnljYEaWrb$;hjTm_tjpK36XDj$+>@5757G;C9
z71#WhioS#Hu-!pF#oK)Y2td?!C$YqEu=LCa@g@Yx&w}u~UW`m+^=(`2j2Gz~M%e2D
z1fAo~?Z!dZ8*oh?5fyewkI}~+F?y1SY@DEFSg!fiyrt;I^pb8^$~&2b6~h$0$<D!5
ztl||w0#K@N%Qv{ZHZ`-v7c=?OmXGcy{jW`k2*)oPnZfhj{1V2b07o{Rnw`{*8q+I0
zn_nASx?|*$^f<Z5^#8Nx47VoAE5pvt{(d6_R@HXnSb@!zcbge(c~(GC9sD#LeSi}r
z3cVd&CSJ<I;j~g$I;C`pkCpn#TwyK!g`B>I1zZ;(3U37VD1bQ*Oe*~LVRr%YKBy8D
z>(g+$U9<|#Ok{Hjn7x|Gk$Fw#yGkhP=b!k<q4Ka##9et{+^!bp#S_0%=30a+SLWJ{
za<stTM9fXVTYxFRQDkp8C#l^F_Z_D(jKfLFZwb%>dt`uJ@@arAh}|q?;JXcYhJtSu
z1yA=o60DED>zD{Hi(y*CQg5$h7xLMh$r~xs*~{wb)y}p#dnfIf80q9^07C#BFbBZ+
qJqJ138@Eq$_1xl;zOrBpAipMdsY-rHWh(QFOO;hcTwZYnRPVpje9ia(

diff --git a/server/test/test_DatabaseAccessor.py b/server/test/test_DatabaseAccessor.py
index 21122dd..f166972 100644
--- a/server/test/test_DatabaseAccessor.py
+++ b/server/test/test_DatabaseAccessor.py
@@ -2,129 +2,152 @@
 import sys
 sys.path.append('/Users/justinkwan/Documents/WebApps/UserAuth/server/src')
 from DatabaseAccessor import DatabaseAccessor
-from InputHandler import InputHandler
+from InputHandler     import InputHandler
+from User             import User
 
 DBA = DatabaseAccessor()
 inputHandler  = InputHandler()
 
+def getUser(username, password, userId):
+    user = User(username, password)
+    user.encryptAndUpdatePassword(password)
+    user.updateUserId(userId)
+    return user
+
 # test username, password and user id inserting function
 def test_insertUserInfo():
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('testUsername1', 'testPassword1', 'testId1')
-    selectedUsername = DBA.selectUsername('testUsername1')
-    selectedHashedPassword = DBA.selectHashedPassword('testUsername1')
-    selectedUserId = DBA.selectUserId('testId1')
+    user = getUser('testUsername1', 'testPassword1', 'testId1')
+    DBA.insertUserInfo(user)
+    selectedUsername = DBA.selectUsername(user)
+    selectedHashedPassword = DBA.selectHashedPassword(user)
+    selectedUserId = DBA.selectUserId(user)
     assert selectedUsername == 'testUsername1'
-    assert selectedHashedPassword == 'testPassword1'
+    assert selectedHashedPassword != None
     assert selectedUserId == 'testId1'
 
+    del user
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('09812', '*7%-', 'testId2')
-    selectedUsername = DBA.selectUsername('09812')
-    selectedHashedPassword = DBA.selectHashedPassword('09812')
-    selectedUserId = DBA.selectUserId('testId2')
+    user = getUser('09812', '*7%-', 'testId2')
+    DBA.insertUserInfo(user)
+    selectedUsername = DBA.selectUsername(user)
+    selectedHashedPassword = DBA.selectHashedPassword(user)
+    selectedUserId = DBA.selectUserId(user)
     assert selectedUsername == '09812'
-    assert selectedHashedPassword == '*7%-'
+    assert selectedHashedPassword != None
     assert selectedUserId == 'testId2'
 
+    del user
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('-l-&$', '=testpassw0rd', 'testId3')
-    selectedUsername = DBA.selectUsername('-l-&$')
-    selectedHashedPassword = DBA.selectHashedPassword('-l-&$')
-    selectedUserId = DBA.selectUserId('testId3')
+    user = getUser('-l-&$', '=testpassw0rd', 'testId3')
+    DBA.insertUserInfo(user)
+    selectedUsername = DBA.selectUsername(user)
+    selectedHashedPassword = DBA.selectHashedPassword(user)
+    selectedUserId = DBA.selectUserId(user)
     assert selectedUsername == '-l-&$'
-    assert selectedHashedPassword == '=testpassw0rd'
+    assert selectedHashedPassword != None
     assert selectedUserId == 'testId3'
 
-    DBA.clearDatabase()
-
-    DBA.insertUserInfo('-l-&$', '=testpassw0rd', 'testId3')
-    selectedUsername = DBA.selectUsername('-l--&$')
-    selectedHashedPassword = DBA.selectHashedPassword('-l--&$')
-    selectedUserId = DBA.selectUserId('testId30')
-    assert selectedUsername == None
-    assert selectedHashedPassword == None
-    assert selectedUserId == None
-
+    del user
     DBA.clearDatabase()
 
 # test username selecting function
 def test_selectUsername():
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('testUsername1', 'testPassword1', 'testId')
-    DBA.insertUserInfo('testUsername2', 'testPassword2', 'testId')
-    DBA.insertUserInfo('testUsername3', 'testPassword3', 'testId')
-    selectedUsername = DBA.selectUsername('testUsername2')
+    user1 = getUser('testUsername1', 'testPassword1', 'testId')
+    user2 = getUser('testUsername2', 'testPassword2', 'testId')
+    user3 = getUser('testUsername3', 'testPassword3', 'testId')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedUsername = DBA.selectUsername(user2)
     assert selectedUsername == 'testUsername2'
 
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('fakename', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('testdwdadUsername2', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('w90', 'test', 'testId')
-    selectedUsername = DBA.selectUsername('w90')
+    user1 = getUser('fakename', 'teddddstPassword1', 'testId')
+    user2 = getUser('testdwdadUsername2', 'testPawddassword2', 'testId')
+    user3 = getUser('w90', 'test', 'testId')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedUsername = DBA.selectUsername(user3)
     assert selectedUsername == 'w90'
 
-    DBA.clearDatabase()
-
-    DBA.insertUserInfo('fakename3', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('testdwdadUsername3', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('3', 'test', 'testId')
-    selectedUsername = DBA.selectUsername('35')
-    assert selectedUsername == None
-
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
 # test password selecting function
 def test_selectHashedPassword():
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('rando', 'testPassword1', 'testId')
-    DBA.insertUserInfo('rando2', 'testPassword2', 'testId')
-    DBA.insertUserInfo('rando3', 'testPassword3', 'testId')
-    selectedHashedPassword = DBA.selectHashedPassword('rando2')
-    assert selectedHashedPassword == 'testPassword2'
+    user1 = getUser('rando', 'testPassword1', 'testId')
+    user2 = getUser('rando2', 'testPassword2', 'testId')
+    user3 = getUser('rando3', 'testPassword3', 'testId')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedHashedPassword = DBA.selectHashedPassword(user2)
+    assert selectedHashedPassword != None
 
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('name1', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('name2', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('name3', 'test', 'testId')
-    selectedHashedPassword = DBA.selectHashedPassword('name4')
-    assert selectedHashedPassword == None
+    user1 = getUser('name1', 'teddddstPassword1', 'testId')
+    user2 = getUser('name2', 'testPawddassword2', 'testId')
+    user3 = getUser('name3', 'test', 'testId')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedHashedPassword = DBA.selectHashedPassword(user3)
+    assert selectedHashedPassword != None
 
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
 # test user id selecting function
 def test_selectUserId():
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('name1', 'teddddstPassword1', 'testId1')
-    DBA.insertUserInfo('name2', 'teddddstPassword2', 'testId2')
-    DBA.insertUserInfo('name3', 'teddddstPassword3', 'testId3')
-    selectedUserId = DBA.selectUserId('testId3')
+    user1 = getUser('name1', 'teddddstPassword1', 'testId1')
+    user2 = getUser('name2', 'teddddstPassword2', 'testId2')
+    user3 = getUser('name3', 'teddddstPassword3', 'testId3')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedUserId = DBA.selectUserId(user3)
     assert selectedUserId == 'testId3'
 
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('name1', 'teddddstPassword1', 'testId0')
-    DBA.insertUserInfo('name2', 'teddddstPassword2', 'testId4')
-    DBA.insertUserInfo('name3', 'teddddstPassword3', 'testId9')
-    selectedUserId = DBA.selectUserId('testId4')
+    user1 = getUser('name1', 'teddddstPassword1', 'testId0')
+    user2 = getUser('name2', 'teddddstPassword2', 'testId4')
+    user3 = getUser('name3', 'teddddstPassword3', 'testId9')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    selectedUserId = DBA.selectUserId(user2)
     assert selectedUserId == 'testId4'
 
-    DBA.clearDatabase()
-
-    DBA.insertUserInfo('name1', 'teddddstPassword1', 'testId0')
-    DBA.insertUserInfo('name2', 'teddddstPassword2', 'testId4')
-    DBA.insertUserInfo('name3', 'teddddstPassword3', 'testId9')
-    selectedUserId = DBA.selectUserId('testId5')
-    assert selectedUserId == None
-
+    del user1
+    del user2
+    del user3
     DBA.clearDatabase()
 
 def test_handleQueryReturn():
diff --git a/server/test/test_InputHandler.py b/server/test/test_InputHandler.py
index 59c6fdb..7af1099 100644
--- a/server/test/test_InputHandler.py
+++ b/server/test/test_InputHandler.py
@@ -3,15 +3,23 @@
 sys.path.append('/Users/justinkwan/Documents/WebApps/UserAuth/server/src')
 from InputHandler     import InputHandler
 from DatabaseAccessor import DatabaseAccessor
+from User             import User
 
-inputHandler     = InputHandler()
+inputHandler = InputHandler()
 DBA = DatabaseAccessor()
 
-def getUser(self, username, password):
+def getUser(username, password):
     user = User(username, password)
     user.encryptAndUpdatePassword(password)
+    user.generateAndUpdateUserId()
     return user
 
+def test_checkInputNull():
+    assert inputHandler.checkInputNull(None, None) == 'EMPTY_FIELDS'
+    assert inputHandler.checkInputNull(None, 'password123') == 'EMPTY_USERNAME'
+    assert inputHandler.checkInputNull('username123', None) == 'EMPTY_PASSWORD'
+    assert inputHandler.checkInputNull('username123', 'password123') == 'ALL_FIELDS_FILLED'
+
 def test_checkTextEmpty():
     assert inputHandler.checkTextEmpty('Not Empty') == False
     assert inputHandler.checkTextEmpty('') == True
@@ -38,58 +46,176 @@ def test_checkInputLength():
     assert inputHandler.checkInputLength('PASSWORD', 'testusernametestusernametestusernametestusernametestusernametestusername') == False
 
 def test_handleEmptyFields():
-    assert inputHandler.handleEmptyFields('', '') == 'EMPTY_FIELDS'
-    assert inputHandler.handleEmptyFields('', 'password') == 'EMPTY_USERNAME'
-    assert inputHandler.handleEmptyFields('username', '') == 'EMPTY_PASSWORD'
-    assert inputHandler.handleEmptyFields('username', 'password') == 'ALL_FIELDS_FILLED'
+    user = getUser('', '')
+    assert inputHandler.handleEmptyFields(user) == 'EMPTY_FIELDS'
+    del user
+
+    user = getUser('', 'password')
+    assert inputHandler.handleEmptyFields(user) == 'EMPTY_USERNAME'
+    del user
+
+    user = getUser('username', '')
+    assert inputHandler.handleEmptyFields(user) == 'EMPTY_PASSWORD'
+    del user
+
+    user = getUser('username', 'password')
+    assert inputHandler.handleEmptyFields(user) == 'ALL_FIELDS_FILLED'
+    del user
 
 def test_handleInputLengthChecks():
-    assert inputHandler.handleInputLengthChecks('NewUser123', 'testusername') == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
-    assert inputHandler.handleInputLengthChecks('usrnmm', 'testusernametestusernametestusernam') == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
-    assert inputHandler.handleInputLengthChecks('testusernametestusernametestusername', 'testusernametestusernametestusernametestusernametestusernametestu;') == 'INVALID_USERNAME_LENGTH'
-    assert inputHandler.handleInputLengthChecks('', 'usrnmdd') == 'INVALID_USERNAME_LENGTH'
-    assert inputHandler.handleInputLengthChecks('User', '') == 'INVALID_USERNAME_LENGTH'
-    assert inputHandler.handleInputLengthChecks(',', 'testusernametestusernametestusernametestusernametestusernametestusername') == 'INVALID_USERNAME_LENGTH'
-    assert inputHandler.handleInputLengthChecks('usrnmm', 'testusernametestusernametestusernametestusernametestusernametestu') == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
-    assert inputHandler.handleInputLengthChecks('usrnmm', 'testusernametestusernametestusernametestusernametestusernametestus') == 'INVALID_PASSWORD_LENGTH'
-    assert inputHandler.handleInputLengthChecks('usrnmm', 'passwor') == 'INVALID_PASSWORD_LENGTH'
+    user = getUser('NewUser123', 'testusername')
+    assert inputHandler.handleInputLengthChecks(user) == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
+    del user
+
+    user = getUser('usrnmm', 'testusernametestusernametestusernam')
+    assert inputHandler.handleInputLengthChecks(user) == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
+    del user
+
+    user = getUser('testusernametestusernametestusername', 'testusernametestusernametestusernametestusernametestusernametestu;')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_USERNAME_LENGTH'
+    del user
+
+    user = getUser('', 'usrnmdd')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_USERNAME_LENGTH'
+    del user
+
+    user = getUser('User', '')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_USERNAME_LENGTH'
+    del user
+
+    user = getUser(',', 'testusernametestusernametestusernametestusernametestusernametestusername')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_USERNAME_LENGTH'
+    del user
+
+    user = getUser('usrnmm', 'testusernametestusernametestusernametestusernametestusernametestu')
+    assert inputHandler.handleInputLengthChecks(user) == 'GOOD_USERNAME_&_PASSWORD_LENGTH'
+    del user
+
+    user = getUser('usrnmm', 'testusernametestusernametestusernametestusernametestusernametestus')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_PASSWORD_LENGTH'
+    del user
+
+    user = getUser('usrnmm', 'passwor')
+    assert inputHandler.handleInputLengthChecks(user) == 'INVALID_PASSWORD_LENGTH'
+    del user
 
 def test_checkForInvalidUsernameChars():
-    assert inputHandler.checkForInvalidUsernameChars("string2") == True
-    assert inputHandler.checkForInvalidUsernameChars("fake$username)") == False
-    assert inputHandler.checkForInvalidUsernameChars(")(*&^)") == False
-    assert inputHandler.checkForInvalidUsernameChars(")(*&^)textTest*&^%moretestis*fun';:") == False
+    user = getUser('string2', 'password123')
+    assert inputHandler.checkForInvalidUsernameChars(user) == True
+    del user
+
+    user = getUser('fake$username)', 'password123')
+    assert inputHandler.checkForInvalidUsernameChars(user) == False
+    del user
+
+    user = getUser(')(*&^)', 'password123')
+    assert inputHandler.checkForInvalidUsernameChars(user) == False
+    del user
+
+    user = getUser(')(*&^)textTest*&^%moretestis*fun;:', 'password123')
+    assert inputHandler.checkForInvalidUsernameChars(user) == False
+    del user
 
 def test_checkForExistingUsername():
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('randomename1', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('anotherrand0mName', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('09876543', 'test', 'testId')
-    DBA.insertUserInfo('johnnotrealperson', 'password123', 'testId')
-    doesUsernameExist = inputHandler.checkForExistingUsername('09876543')
+    user1 = getUser('randomename1', 'teddddstPassword1')
+    user2 = getUser('anotherrand0mName', 'testPawddassword2')
+    user3 = getUser('09876543', 'test')
+    user4 = getUser('09876543', 'test')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    doesUsernameExist = inputHandler.checkForExistingUsername(user4)
     assert doesUsernameExist == True
 
+    del user1
+    del user2
+    del user3
+    del user4
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('robertH', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('william', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('Johnathan', 'test', 'testId')
-    DBA.insertUserInfo('randomguy', 'password123', 'testId')
-    doesUsernameExist = inputHandler.checkForExistingUsername('johnathan')
-    assert doesUsernameExist == False
+    user1 = getUser('robertH', 'teddddstPassword1')
+    user2 = getUser('william', 'testPawddassword2')
+    user3 = getUser('Johnathan', 'test')
+    user4 = getUser('robertH', 'test')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    doesUsernameExist = inputHandler.checkForExistingUsername(user4)
+    assert doesUsernameExist == True
 
+    del user1
+    del user2
+    del user3
+    del user4
     DBA.clearDatabase()
 
-    DBA.insertUserInfo('001', 'teddddstPassword1', 'testId')
-    DBA.insertUserInfo('02000000009', 'testPawddassword2', 'testId')
-    DBA.insertUserInfo('joe', 'test', 'testId')
-    DBA.insertUserInfo('testname', 'password123', 'testId')
-    doesUsernameExist = inputHandler.checkForExistingUsername('02000000009')
-    assert doesUsernameExist == True
+    user1 = getUser('001', 'teddddstPassword1')
+    user2 = getUser('02000000009', 'testPawddassword2')
+    user3 = getUser('joe', 'test')
+    user4 = getUser('uniqueName', 'password123')
+    DBA.insertUserInfo(user1)
+    DBA.insertUserInfo(user2)
+    DBA.insertUserInfo(user3)
+    doesUsernameExist = inputHandler.checkForExistingUsername(user4)
+    assert doesUsernameExist == False
 
+    del user1
+    del user2
+    del user3
+    del user4
     DBA.clearDatabase()
 
 # def test_verifyPassword():
-#     user = getUser('username1', 'password1')
+#     user1 = getUser('username1', 'password1')
+#     DBA.insertUserInfo(user1)
+#     user2 = getUser('username1', 'password1')
+#     isPasswordCorrect = inputHandler.verifyPassword(user2)
+#     assert isPasswordCorrect == True
+#
+#     del user1
+#     del user2
+#     DBA.clearDatabase()
 #
+#     user1 = getUser('username2', 'password2')
+#     DBA.insertUserInfo(user1)
+#     user2 = getUser('username2', 'password2')
+#     isPasswordCorrect = inputHandler.verifyPassword(user2)
+#     assert isPasswordCorrect == True
+#
+#     del user1
+#     del user2
+#     DBA.clearDatabase()
+
+
+def test_verifyPassword2():
+    user1 = getUser('username1', 'password1')
+    DBA.insertUserInfo(user1)
+    user2 = getUser('username1', 'password1')
+    isPasswordCorrect = inputHandler.verifyPassword(user2)
+    assert isPasswordCorrect == True
+
+    del user1
+    del user2
+    DBA.clearDatabase()
+
+    user1 = getUser('username2', 'password2')
+    DBA.insertUserInfo(user1)
+    user2 = getUser('username2', 'password1')
+    isPasswordCorrect = inputHandler.verifyPassword(user2)
+    assert isPasswordCorrect == False
+
+    del user1
+    del user2
+    DBA.clearDatabase()
+
+    user1 = getUser('username3', '^&*()()')
+    DBA.insertUserInfo(user1)
+    user2 = getUser('username3', '^&*()()')
+    isPasswordCorrect = inputHandler.verifyPassword(user2)
+    assert isPasswordCorrect == True
+
+    del user1
+    del user2
+    DBA.clearDatabase()
diff --git a/server/test/test_SignUpController.py b/server/test/test_SignUpController.py
index 0c19fd8..b792e1c 100644
--- a/server/test/test_SignUpController.py
+++ b/server/test/test_SignUpController.py
@@ -7,11 +7,22 @@
 signUpController = SignUpController()
 DBA = DatabaseAccessor()
 
+def getUser(username, password):
+    user = User(username, password)
+    user.encryptAndUpdatePassword(password)
+    user.generateAndUpdateUserId()
+    return user
+
 def test_handleUserSignUp():
+    DBA.clearDatabase()
+
     # empty field(s) tests
     assert signUpController.handleUserSignUp('', '') == 'EMPTY_FIELDS'
+    assert signUpController.handleUserSignUp(None, None) == 'EMPTY_FIELDS'
     assert signUpController.handleUserSignUp('', 'password') == 'EMPTY_USERNAME'
+    assert signUpController.handleUserSignUp(None, 'password') == 'EMPTY_USERNAME'
     assert signUpController.handleUserSignUp('username', '') == 'EMPTY_PASSWORD'
+    assert signUpController.handleUserSignUp('username', None) == 'EMPTY_PASSWORD'
 
     # success tests
     assert signUpController.handleUserSignUp('username1', 'password') == 'SUCCESS'
@@ -27,7 +38,7 @@ def test_handleUserSignUp():
     assert signUpController.handleUserSignUp('{}{}{}{}{}', 'password') == 'INVALID_USERNAME_CHARS'
 
     # duplicate username tests
-    DBA.insertUserInfo('username', 'password1', 'testId')
+    signUpController.handleUserSignUp('username', 'password1')
     assert signUpController.handleUserSignUp('username', 'password1') == 'DUPLICATE_USERNAME'
     DBA.clearDatabase()
     signUpController.handleUserSignUp('Username', 'password')
@@ -64,3 +75,4 @@ def test_getUser():
     assert len(user.getUserId()) == 36
 
     del user
+    DBA.clearDatabase()
diff --git a/server/test/test_User.py b/server/test/test_User.py
index 7484985..7acdb5f 100644
--- a/server/test/test_User.py
+++ b/server/test/test_User.py
@@ -4,34 +4,52 @@
 from User import User
 import jwt
 
+def getUser(username, password):
+    user = User(username, password)
+    user.encryptAndUpdatePassword(password)
+    user.generateAndUpdateUserId()
+    return user
+
 def test_getUsername():
-    user = User('username1', 'password1')
+    user = getUser('username1', 'password1')
     assert user.getUsername() == 'username1'
-
     del user
 
 def test_getTextPassword():
-    user = User('username2', 'password2')
+    user = getUser('username2', 'password2')
     assert user.getTextPassword() == 'password2'
-
     del user
 
 def test_getHashedPassword():
-    user = User('username3', 'password3')
-    user.encryptAndUpdatePassword('password3')
+    user = getUser('username3', 'password3')
     assert user.getHashedPassword() != None
-
     del user
 
 def test_getUserId():
-    user = User('username4', 'password4')
+    user = getUser('username4', 'password4')
     assert user.getUserId() != None
     assert len(user.getUserId()) == 36
+    del user
 
+def test_updateUserId():
+    user = getUser('username8', 'password8')
+    user.updateUserId('#123')
+    assert user.getUserId() == '#123'
     del user
 
+    user = getUser('username9', 'password9')
+    user.updateUserId(123)
+    assert user.getUserId() == 123
+    del user
+
+def test_generateAndUpdateUserId():
+    user = getUser('username10', 'password10')
+    user.generateAndUpdateUserId()
+    assert user.getUserId() != None
+    assert len(user.getUserId()) == 36
+
 def test_getSecurityToken():
-    user = User('username5', 'password5')
+    user = getUser('username5', 'password5')
     user.generateAndUpdateSecurityToken()
     securityToken = user.getSecurityToken()
 
@@ -44,14 +62,12 @@ def test_getSecurityToken():
     assert 'user id' in userData
 
 def test_encryptAndUpdatePassword():
-    user = User('username6', 'password6')
-    user.encryptAndUpdatePassword('password6')
+    user = getUser('username6', 'password6')
     assert user.getHashedPassword() != None
-
     del user
 
 def test_generateAndUpdateSecurityToken():
-    user = User('username7', 'password7')
+    user = getUser('username7', 'password7')
     user.generateAndUpdateSecurityToken()
     securityToken = user.getSecurityToken()