Fixes
This commit is contained in:
23
main.rb
23
main.rb
@@ -11,7 +11,7 @@ load "logman.rb"
|
||||
|
||||
ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
|
||||
|
||||
env_data = File.read(".env")
|
||||
env_data = File.exist?(".env") ? File.read(".env") : ""
|
||||
ENV_HASH = {}
|
||||
|
||||
env_data.each_line do |line|
|
||||
@@ -36,7 +36,7 @@ set :public_folder, "public"
|
||||
|
||||
get "/" do
|
||||
session = Sessions.new request, response
|
||||
Logman.log session["message"].inspect
|
||||
Logman.log session.message
|
||||
send_file "index.html"
|
||||
end
|
||||
|
||||
@@ -47,6 +47,8 @@ end
|
||||
|
||||
post "/signup" do
|
||||
session = Sessions.new request, response
|
||||
uid = session["user"]
|
||||
session.logout(uid) if uid.nil? || $active_users[uid].nil?
|
||||
data = JSON.parse(request.body.read)
|
||||
if data["email"].nil? || data["pass"].nil? || data["username"].nil?
|
||||
status 400
|
||||
@@ -64,7 +66,7 @@ end
|
||||
|
||||
get "/verify/:code" do
|
||||
session = Sessions.new request, response
|
||||
session["message"] = Players.verify(params[:code]) ? "Verified successfully!" : "Verification failed!"
|
||||
session.message = Players.verify(params[:code]) ? "Verified successfully!" : "Verification failed!"
|
||||
redirect "/"
|
||||
end
|
||||
|
||||
@@ -76,6 +78,10 @@ post "/login" do
|
||||
status 500
|
||||
return { "message" => "Internal server error when signing the existing session out!" }.to_json
|
||||
end
|
||||
if data["username"].nil? || data["pass"].nil?
|
||||
status 400
|
||||
return { "message" => "Bad request made!" }.to_json
|
||||
end
|
||||
login_status = session.login(data["username"], data["pass"])
|
||||
status login_status[0]
|
||||
return { "message" => login_status[1] }.to_json
|
||||
@@ -96,6 +102,13 @@ post "/logout" do
|
||||
return { "message" => "Signed out successfully!" }.to_json
|
||||
end
|
||||
|
||||
get "/logout" do
|
||||
session = Sessions.new request, response
|
||||
uid = session["user"]
|
||||
session.logout(uid) unless $active_users[uid].nil?
|
||||
redirect "/"
|
||||
end
|
||||
|
||||
post "/forgot_password" do
|
||||
data = JSON.parse(request.body.read)
|
||||
if data["email"].nil?
|
||||
@@ -141,3 +154,7 @@ delete "/rm_player" do
|
||||
return { "message" => "Couldn't delete!" }.to_json
|
||||
end
|
||||
end
|
||||
|
||||
get "*" do
|
||||
redirect "/"
|
||||
end
|
||||
|
Reference in New Issue
Block a user