From 4d14789e7bafc2e95105e0f2856def9825262a49 Mon Sep 17 00:00:00 2001 From: soraefir Date: Wed, 12 Jul 2023 01:05:36 +0200 Subject: [PATCH] Added login flow functions and fix cookies --- src/invidious/routes/login.cr | 45 +++++++++++++++++++++++++++++++++++ src/invidious/user/cookies.cr | 2 ++ 2 files changed, 47 insertions(+) diff --git a/src/invidious/routes/login.cr b/src/invidious/routes/login.cr index 109d363b..55edbe81 100644 --- a/src/invidious/routes/login.cr +++ b/src/invidious/routes/login.cr @@ -235,4 +235,49 @@ module Invidious::Routes::Login env.redirect referer end + + def self.user_flow_existing(env, email) + sid = Base64.urlsafe_encode(Random::Secure.random_bytes(32)) + Invidious::Database::SessionIDs.insert(sid, email) + env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid) + + # Since this user has already registered, we don't want to overwrite their preferences + if env.request.cookies["PREFS"]? + cookie = env.request.cookies["PREFS"] + cookie.expires = Time.utc(1990, 1, 1) + env.response.cookies << cookie + end + end + + def self.user_flow_new(env, email, password) + sid = Base64.urlsafe_encode(Random::Secure.random_bytes(32)) + if password + user, sid = create_user(sid, email, password) + else + user, sid = create_user(sid, email) + end + + if language_header = env.request.headers["Accept-Language"]? + if language = ANG.language_negotiator.best(language_header, LOCALES.keys) + user.preferences.locale = language.header + end + end + + Invidious::Database::Users.insert(user) + Invidious::Database::SessionIDs.insert(sid, email) + + view_name = "subscriptions_#{sha256(user.email)}" + PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS #{MATERIALIZED_VIEW_SQL.call(user.email)}") + + env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid) + + if env.request.cookies["PREFS"]? + user.preferences = env.get("preferences").as(Preferences) + Invidious::Database::Users.update_preferences(user) + + cookie = env.request.cookies["PREFS"] + cookie.expires = Time.utc(1990, 1, 1) + env.response.cookies << cookie + end + end end diff --git a/src/invidious/user/cookies.cr b/src/invidious/user/cookies.cr index 654efc15..4a81e6d3 100644 --- a/src/invidious/user/cookies.cr +++ b/src/invidious/user/cookies.cr @@ -14,6 +14,7 @@ struct Invidious::User return HTTP::Cookie.new( name: "SID", domain: domain, + path: "/", value: sid, expires: Time.utc + 2.years, secure: SECURE, @@ -28,6 +29,7 @@ struct Invidious::User return HTTP::Cookie.new( name: "PREFS", domain: domain, + path: "/", value: URI.encode_www_form(preferences.to_json), expires: Time.utc + 2.years, secure: SECURE,