iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SMS for Google login

This commit is contained in:
Omar Roth 2019-06-15 08:22:23 -05:00
parent fa6bf21cd1
commit a3164177f8
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/invidious.cr
View File

@ -964,6 +964,11 @@ post "/login" do |env|
headers["Cookie"] = URI.unescape(headers["Cookie"]) headers["Cookie"] = URI.unescape(headers["Cookie"])
if challenge_results[0][3]?.try &.== 7
error_message = translate(locale, "Account has temporarily been disabled")
next templated "error"
end
if challenge_results[0][-1]?.try &.[5] == "INCORRECT_ANSWER_ENTERED" if challenge_results[0][-1]?.try &.[5] == "INCORRECT_ANSWER_ENTERED"
error_message = translate(locale, "Incorrect password") error_message = translate(locale, "Incorrect password")
next templated "error" next templated "error"
@ -1049,21 +1054,21 @@ post "/login" do |env|
traceback << "Logging in..." traceback << "Logging in..."
location = challenge_results[0][-1][2].to_s location = challenge_results[0][-1][2].to_s
cookies = HTTP::Cookies.new cookies = HTTP::Cookies.from_headers(headers)
loop do loop do
if !location if !location || location.includes? "/ManageAccount"
break break
end end
# TODO: Occasionally there will be a second page after login confirming
# the user's phone number, which we will likely choke on.
# if location.includes? "SmsAuthInterstitial"
login = client.get(location, headers) login = client.get(location, headers)
headers = login.cookies.add_request_headers(headers) headers = login.cookies.add_request_headers(headers)
cookies = HTTP::Cookies.from_headers(headers) cookies = HTTP::Cookies.from_headers(headers)
if cookies["SID"]?
break
end
location = login.headers["Location"]? location = login.headers["Location"]?
end end