|
|
@ -163,10 +163,10 @@ before_all do |env|
|
|
|
|
|
|
|
|
|
|
|
|
# Invidious users only have SID
|
|
|
|
# Invidious users only have SID
|
|
|
|
if !env.request.cookies.has_key? "SSID"
|
|
|
|
if !env.request.cookies.has_key? "SSID"
|
|
|
|
email = PG_DB.query_one?("SELECT email FROM session_ids WHERE id = $1", sid, as: String)
|
|
|
|
email = PG_DB.query_one?("SELECT email FROM session_ids WHERE id = $1", sid, as: String)
|
|
|
|
|
|
|
|
|
|
|
|
if email
|
|
|
|
if email
|
|
|
|
user = PG_DB.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
|
|
|
|
user = PG_DB.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
|
|
|
|
challenge, token = create_response(user.email, "sign_out", HMAC_KEY, PG_DB, 1.week)
|
|
|
|
challenge, token = create_response(user.email, "sign_out", HMAC_KEY, PG_DB, 1.week)
|
|
|
|
|
|
|
|
|
|
|
|
env.set "challenge", challenge
|
|
|
|
env.set "challenge", challenge
|
|
|
@ -1028,7 +1028,7 @@ post "/login" do |env|
|
|
|
|
user, sid = create_user(sid, email, password)
|
|
|
|
user, sid = create_user(sid, email, password)
|
|
|
|
user_array = user.to_a
|
|
|
|
user_array = user.to_a
|
|
|
|
|
|
|
|
|
|
|
|
user_array[5] = user_array[5].to_json
|
|
|
|
user_array[4] = user_array[4].to_json
|
|
|
|
args = arg_array(user_array)
|
|
|
|
args = arg_array(user_array)
|
|
|
|
|
|
|
|
|
|
|
|
PG_DB.exec("INSERT INTO users VALUES (#{args})", user_array)
|
|
|
|
PG_DB.exec("INSERT INTO users VALUES (#{args})", user_array)
|
|
|
|