diff --git a/src/Account.cc b/src/Account.cc index ef8f3b32..8abf2593 100644 --- a/src/Account.cc +++ b/src/Account.cc @@ -420,26 +420,6 @@ void Account::delete_file() const { remove(filename.c_str()); } -uint64_t Login::proxy_session_id() const { - uint64_t low_part = 0; - if (this->dc_nte_license) { - low_part = this->dc_nte_license->proxy_session_id_part(); - } else if (this->dc_license) { - low_part = this->dc_license->proxy_session_id_part(); - } else if (this->pc_license) { - low_part = this->pc_license->proxy_session_id_part(); - } else if (this->gc_license) { - low_part = this->gc_license->proxy_session_id_part(); - } else if (this->xb_license) { - low_part = this->xb_license->proxy_session_id_part(); - } else if (this->bb_license) { - low_part = this->bb_license->proxy_session_id_part(); - } else { - throw logic_error("none of the licenses in a Login were present"); - } - return (static_cast(this->account->account_id) << 32) | low_part; -} - string Login::str() const { string ret = std::format("Account:{:08X}", this->account->account_id); if (this->account_was_created) { diff --git a/src/Account.hh b/src/Account.hh index a2864440..f99ca03d 100644 --- a/src/Account.hh +++ b/src/Account.hh @@ -17,10 +17,6 @@ struct DCNTELicense { std::string serial_number; std::string access_key; - inline uint64_t proxy_session_id_part() const { - return phosg::fnv1a32(this->serial_number); - } - static std::shared_ptr from_json(const phosg::JSON& json); phosg::JSON json() const; }; @@ -29,10 +25,6 @@ struct V1V2License { uint32_t serial_number = 0; std::string access_key; - inline uint64_t proxy_session_id_part() const { - return this->serial_number; - } - static std::shared_ptr from_json(const phosg::JSON& json); phosg::JSON json() const; }; @@ -42,10 +34,6 @@ struct GCLicense { std::string access_key; std::string password; - inline uint64_t proxy_session_id_part() const { - return this->serial_number; - } - static std::shared_ptr from_json(const phosg::JSON& json); phosg::JSON json() const; }; @@ -55,10 +43,6 @@ struct XBLicense { uint64_t user_id = 0; uint64_t account_id = 0; - inline uint64_t proxy_session_id_part() const { - return phosg::fnv1a32(this->gamertag); - } - static std::shared_ptr from_json(const phosg::JSON& json); phosg::JSON json() const; }; @@ -67,10 +51,6 @@ struct BBLicense { std::string username; std::string password; - inline uint64_t proxy_session_id_part() const { - return phosg::fnv1a32(this->username); - } - static std::shared_ptr from_json(const phosg::JSON& json); phosg::JSON json() const; }; @@ -178,8 +158,6 @@ struct Login { std::shared_ptr xb_license; std::shared_ptr bb_license; - uint64_t proxy_session_id() const; - std::string str() const; };