diff --git a/src/invidious/config.cr b/src/invidious/config.cr index 93444fa5..a3112fb5 100644 --- a/src/invidious/config.cr +++ b/src/invidious/config.cr @@ -123,10 +123,6 @@ class Config property domain : String? # Materialious redirects property materialious_domain : String? - # Alternative domains. You can add other domains, like TOR and I2P addresses - property alternative_domains : Array(String) = [] of String - # Backend domains. Domains for numbered backends - property backend_domains : Array(String) = [] of String # Subscribe to channels using PubSubHubbub (requires domain, hmac_key) property use_pubsub_feeds : Bool | Int32 = false diff --git a/src/invidious/routes/login.cr b/src/invidious/routes/login.cr index df55d9a8..e83c94a2 100644 --- a/src/invidious/routes/login.cr +++ b/src/invidious/routes/login.cr @@ -60,15 +60,7 @@ module Invidious::Routes::Login sid = Base64.urlsafe_encode(Random::Secure.random_bytes(32)) Invidious::Database::SessionIDs.insert(sid, email) - # Checks if there is any alternative domain, like a second domain name, - # TOR or I2P address - if alt = CONFIG.alternative_domains.index(env.request.headers["Host"]) - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.alternative_domains[alt], sid) - elsif alt = CONFIG.backend_domains.index(env.request.headers["Host"]) - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.backend_domains[alt], sid) - else - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid) - end + env.response.cookies["SID"] = Invidious::User::Cookies.sid(env.request.headers["Host"], sid) else return error_template(401, "Wrong username or password") end @@ -168,15 +160,7 @@ module Invidious::Routes::Login Invidious::Database::Users.insert(user) Invidious::Database::SessionIDs.insert(sid, email) - # Checks if there is any alternative domain, like a second domain name, - # TOR or I2P address - if alt = CONFIG.alternative_domains.index(env.request.headers["Host"]) - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.alternative_domains[alt], sid) - elsif alt = CONFIG.backend_domains.index(env.request.headers["Host"]) - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.backend_domains[alt], sid) - else - env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid) - end + env.response.cookies["SID"] = Invidious::User::Cookies.sid(env.request.headers["Host"], sid) if env.request.cookies["PREFS"]? user.preferences = env.get("preferences").as(Preferences) diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr index 3e415986..8058ab1a 100644 --- a/src/invidious/routes/preferences.cr +++ b/src/invidious/routes/preferences.cr @@ -224,15 +224,7 @@ module Invidious::Routes::PreferencesRoute File.write("config/config.yml", CONFIG.to_yaml) end else - # Checks if there is any alternative domain, like a second domain name, - # TOR or I2P address - if alt = CONFIG.alternative_domains.index(env.request.headers["Host"]) - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.alternative_domains[alt], preferences) - elsif alt = CONFIG.backend_domains.index(env.request.headers["Host"]) - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.backend_domains[alt], preferences) - else - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences) - end + env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(env.request.headers["Host"], preferences) end env.redirect referer @@ -267,15 +259,7 @@ module Invidious::Routes::PreferencesRoute preferences.dark_mode = "dark" end - # Checks if there is any alternative domain, like a second domain name, - # TOR or I2P address - if alt = CONFIG.alternative_domains.index(env.request.headers["Host"]) - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.alternative_domains[alt], preferences) - elsif alt = CONFIG.backend_domains.index(env.request.headers["Host"]) - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.backend_domains[alt], preferences) - else - env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences) - end + env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(env.request.headers["Host"], preferences) end if redirect