From 3ab6c14fb47704911768708a2127a3b293c628dd Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <rossen@rgp.io>
Date: Sun, 26 Jun 2016 21:26:57 +0100
Subject: [PATCH] SC: get_web methods will get new nonce when called

---
 steam/client/builtins/web.py | 15 +++++++++------
 steam/core/cm.py             |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/steam/client/builtins/web.py b/steam/client/builtins/web.py
index 97e6692..e8833d7 100644
--- a/steam/client/builtins/web.py
+++ b/steam/client/builtins/web.py
@@ -1,9 +1,10 @@
 """
 Web related features
 """
-from binascii import hexlify
 from steam import webapi
-from steam.core.crypto import generate_session_key, symmetric_encrypt, sha1_hash, random_bytes
+from steam.core.msg import MsgProto
+from steam.enums.emsg import EMsg
+from steam.core.crypto import generate_session_key, symmetric_encrypt
 from steam.util.web import make_requests_session
 
 
@@ -20,15 +21,18 @@ class Web(object):
         :return: dict with authentication cookies
         :rtype: :class:`dict`, :class:`None`
         """
-        if not self.logged_on:
-            return None
+        if not self.logged_on: return None
+
+        resp = self.send_job_and_wait(MsgProto(EMsg.ClientRequestWebAPIAuthenticateUserNonce), timeout=5)
+
+        if resp is None: return None
 
         skey, ekey = generate_session_key()
 
         data = {
             'steamid': self.steam_id,
             'sessionkey': ekey,
-            'encrypted_loginkey': symmetric_encrypt(self.webapi_authenticate_user_nonce, skey),
+            'encrypted_loginkey': symmetric_encrypt(resp.webapi_authenticate_user_nonce.encode('ascii'), skey),
         }
 
         try:
@@ -38,7 +42,6 @@ class Web(object):
             return None
 
         return {
-            'sessionid': hexlify(sha1_hash(random_bytes(32))),
             'steamLogin': resp['authenticateuser']['token'],
             'steamLoginSecure': resp['authenticateuser']['tokensecure'],
         }
diff --git a/steam/core/cm.py b/steam/core/cm.py
index d975360..67d5bb9 100644
--- a/steam/core/cm.py
+++ b/steam/core/cm.py
@@ -71,7 +71,6 @@ class CMClient(EventEmitter):
 
     steam_id = SteamID()                    #: :class:`.SteamID` of the current user
     session_id = None                       #: session id when logged in
-    webapi_authenticate_user_nonce = None   #: nonce for the getting a web session
 
     _recv_loop = None
     _heartbeat_loop = None
@@ -185,7 +184,6 @@ class CMClient(EventEmitter):
                      'channel_hmac',
                      'steam_id',
                      'session_id',
-                     'webapi_authenticate_user_nonce',
                      '_seen_logon',
                      '_recv_loop',
                      '_heartbeat_loop',
@@ -372,8 +370,6 @@ class CMClient(EventEmitter):
             self.steam_id = SteamID(msg.header.steamid)
             self.session_id = msg.header.client_sessionid
 
-            self.webapi_authenticate_user_nonce = msg.body.webapi_authenticate_user_nonce.encode('ascii')
-
             if self._heartbeat_loop:
                 self._heartbeat_loop.kill()