Redstoner/ModuleLoader
Archived
0
Fork 0
Code Pull Requests Activity

Fixed a bug where webtoken could not generate new tokens

Browse Source
This commit is contained in:
Pepich 2017-02-18 17:20:13 +01:00
parent 7883bc2831
commit 4978c47d51
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/redstoner/modules/webtoken/WebToken.java
View File

@ -22,7 +22,7 @@ import com.redstoner.misc.mysql.elements.MysqlDatabase;
import com.redstoner.misc.mysql.elements.MysqlTable; import com.redstoner.misc.mysql.elements.MysqlTable;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
@Version(major = 1, minor = 0, revision = 0, compatible = 1) @Version(major = 1, minor = 1, revision = 0, compatible = 1)
public class WebToken implements Module public class WebToken implements Module
{ {
private boolean enabled = false; private boolean enabled = false;
@ -67,6 +67,28 @@ public class WebToken implements Module
enabled = true; enabled = true;
} }
private String getNextId() throws Exception
{
Object[] results = table.get("select id from register_tokens order by id desc limit 1;");
if (results instanceof String[])
{
String[] tokenResults = (String[]) results;
if (tokenResults.length == 1)
{
int id = Integer.valueOf(tokenResults[0]);
return "" + ++id;
}
else
{
return null;
}
}
else
{
throw new Exception("Token query returned invalid result!");
}
}
private String query(String emailOrToken, UUID uuid) throws Exception private String query(String emailOrToken, UUID uuid) throws Exception
{ {
if (!(emailOrToken.equals("token") && emailOrToken.equals("email"))) if (!(emailOrToken.equals("token") && emailOrToken.equals("email")))
@ -164,8 +186,9 @@ public class WebToken implements Module
String token = generateToken(); String token = generateToken();
try try
{ {
String id = getNextId();
table.delete(new MysqlConstraint("uuid", ConstraintOperator.EQUAL, uuid)); table.delete(new MysqlConstraint("uuid", ConstraintOperator.EQUAL, uuid));
table.insert(uuid, token, email); table.insert(id, uuid, token, email);
player.sendMessage(ChatColor.GREEN + "Token generated!"); player.sendMessage(ChatColor.GREEN + "Token generated!");
printToken(player, email, token); printToken(player, email, token);
} }
@ -215,7 +238,7 @@ public class WebToken implements Module
" help Generates a token used for website authentication;\n" + " help Generates a token used for website authentication;\n" +
" type player;\n" + " type player;\n" +
" perm utils.webtoken;\n" + " perm utils.webtoken;\n" +
" run gettoken;\n" + " run gettoken email;\n" +
" }\n" + " }\n" +
"}"; "}";
} }