School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version 1.1.0

Browse Source 
method name convention
This commit is contained in:
lukas-heiligenbrunner
2020-04-15 17:03:45 +02:00
parent d680046768
commit 3fba0f9933
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -6,7 +6,7 @@ plugins {
} }
group 'com.wasteinformationserver' group 'com.wasteinformationserver'
version '1.0.1' version '1.1.0'
sourceCompatibility = 1.8 sourceCompatibility = 1.8

3
src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.kt
View File

@@ -7,7 +7,6 @@ import com.wasteinformationserver.basicutils.Storage
import com.wasteinformationserver.db.JDBC import com.wasteinformationserver.db.JDBC
import com.wasteinformationserver.website.HttpTools.Companion.stringToMD5 import com.wasteinformationserver.website.HttpTools.Companion.stringToMD5
import com.wasteinformationserver.website.basicrequest.PostRequest import com.wasteinformationserver.website.basicrequest.PostRequest
import java.io.IOException
import java.sql.SQLException import java.sql.SQLException
import java.util.* import java.util.*
@@ -43,7 +42,7 @@ class LoginRequest : PostRequest() {
s.last() s.last()
if (s.row == 1) { if (s.row == 1) {
//success //success
if (StringToMD5(password!!) == s.getString("password")) { if (stringToMD5(password!!) == s.getString("password")) {
debug("login success") debug("login success")
LoginState.getObject().logIn() LoginState.getObject().logIn()
LoginState.getObject().setAccountData(username, s.getString("firstName"), s.getString("secondName"), s.getString("email"), s.getInt("permission")) LoginState.getObject().setAccountData(username, s.getString("firstName"), s.getString("secondName"), s.getString("email"), s.getInt("permission"))