From 4bc724a6dd05ece7f0f763f715eb5338ce01fd27 Mon Sep 17 00:00:00 2001
From: CaptainT <CaptainTK@users.noreply.github.com>
Date: Mon, 24 Apr 2017 18:17:19 +0200
Subject: [plugin.video.iplayerwww] 3.0.4

---
 plugin.video.iplayerwww/addon.xml                     |  5 ++++-
 plugin.video.iplayerwww/resources/lib/ipwww_common.py | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugin.video.iplayerwww/addon.xml b/plugin.video.iplayerwww/addon.xml
index fc15be1..7f3b764 100644
--- a/plugin.video.iplayerwww/addon.xml
+++ b/plugin.video.iplayerwww/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.iplayerwww" name="iPlayer WWW" version="3.0.3" provider-name="CaptainT, Cas, ihurst, primaeval">
+<addon id="plugin.video.iplayerwww" name="iPlayer WWW" version="3.0.4" provider-name="CaptainT, Cas, ihurst, primaeval">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
     <import addon="script.module.requests" version="2.7.0"/>
@@ -23,6 +23,9 @@
         <fanart>resources/fanart.jpg</fanart>
     </assets>
     <news>
+v3.0.4
+Fixed broken BBC iD functionality.
+
 v3.0.3
 Fixed broken Categories (again).
 
diff --git a/plugin.video.iplayerwww/resources/lib/ipwww_common.py b/plugin.video.iplayerwww/resources/lib/ipwww_common.py
index ed46858..59121c1 100644
--- a/plugin.video.iplayerwww/resources/lib/ipwww_common.py
+++ b/plugin.video.iplayerwww/resources/lib/ipwww_common.py
@@ -159,7 +159,7 @@ cookie_jar = InitialiseCookieJar()
 
 
 def SignInBBCiD():
-    sign_in_url="https://ssl.bbc.co.uk/id/signin"
+    sign_in_url="https://account.bbc.com/signin"
 
     username=ADDON.getSetting('bbc_id_username')
     password=ADDON.getSetting('bbc_id_password')
@@ -176,12 +176,12 @@ def SignInBBCiD():
         resp = s.get('https://www.bbc.com/', headers=headers)
 
         # Call the login page to get a 'nonce' for actual login
-        signInUrl = 'https://www.bbc.com/session'
+        signInUrl = 'https://session.bbc.com/session'
         resp = s.get(signInUrl, headers=headers)
         m = p.search(resp.text)
         url = m.group(1)
 
-        url = "https://www.bbc.com%s" % url
+        url = "https://account.bbc.com%s" % url
         resp = s.post(url, data=post_data, headers=headers)
     
         for cookie in s.cookies:
@@ -197,7 +197,7 @@ def SignInBBCiD():
         m = p.search(resp.text)
         url = m.group(1)
 
-        url = "https://www.bbc.com%s" % url
+        url = "https://account.bbc.com%s" % url
         resp = s.post(url, data=post_data, headers=headers)
     
         for cookie in s.cookies:
@@ -211,7 +211,7 @@ def SignInBBCiD():
 
 
 def SignOutBBCiD():
-    sign_out_url="https://ssl.bbc.co.uk/id/signout"
+    sign_out_url="https://account.bbc.com/signout"
     OpenURL(sign_out_url)
     cookie_jar.clear()
     cookie_jar.save()
@@ -222,7 +222,8 @@ def SignOutBBCiD():
 
 
 def StatusBBCiD():
-    r = requests.head("https://www.bbc.com/account", cookies=cookie_jar, allow_redirects=False)
+    r = requests.head("https://account.bbc.com/account", cookies=cookie_jar,
+                      headers=headers, allow_redirects=False)
     if r.status_code == 200:
         return True
     else: 
-- 
cgit v1.2.3