Fix roaming warning

Author: mediaminister

resources/lib/kodiutils.py

@@ -1112,7 +1112,7 @@ def open_url(url, data=None, headers=None, method=None, cookiejar=None, follow_r
             ok_dialog(heading='HTTP Error {code}'.format(code=exc.code), message='{}\n{}'.format(url, exc.reason))
             log_error('HTTP Error {code}: {reason}', code=exc.code, reason=exc.reason)
             return None
-        if exc.code in (400, 403) and exc.headers.get('Content-Type') == 'application/json':
+        if exc.code in (400, 403) and exc.headers.get('Content-Type') and 'application/json' in exc.headers.get('Content-Type'):
             return exc
         reason = exc.reason
         code = exc.code

resources/lib/tokenresolver.py

@@ -137,11 +137,11 @@ def _get_new_token(self, name, variant=None, url=None, roaming=False, login_json
             return self._get_playertoken(variant, url, roaming)
 
         if name in ('vrtlogin-at', 'vrtlogin-expiry', 'vrtlogin-rt', 'SESSION', 'OIDCXSRF', 'state'):
-            return self._get_usertoken(name)
+            return self._get_usertoken(name, roaming=roaming)
 
         return None
 
-    def _get_usertoken(self, name=None, login_json=None):
+    def _get_usertoken(self, name=None, login_json=None, roaming=False):
         """Get a user X-VRT-Token, vrtlogin-at, vrtlogin-expiry, vrtlogin-rt, SESSION, OIDCXSRF or state token"""
         if not login_json:
             login_json = self._get_login_json()
@@ -161,7 +161,8 @@ def _get_usertoken(self, name=None, login_json=None):
         destination = open_url(self._VRT_LOGIN_URL, data=data, cookiejar=cookiejar).geturl()
         usertoken = TokenResolver._create_token_dictionary(cookiejar, name)
         if not usertoken and not destination.startswith('https://www.vrt.be/vrtnu'):
-            ok_dialog(heading=localize(30970), message=localize(30972))
+            if roaming is False:
+                ok_dialog(heading=localize(30970), message=localize(30972))
             return None
 
         # Cache additional tokens for later use
@@ -203,7 +204,7 @@ def _get_xvrttoken(self, login_json=None):
 
     def _get_roaming_xvrttoken(self):
         """Get a X-VRT-Token for roaming"""
-        vrtlogin_at = self.get_token('vrtlogin-at')
+        vrtlogin_at = self.get_token('vrtlogin-at', roaming=True)
         if vrtlogin_at is None:
             return None
         cookie_value = 'vrtlogin-at=' + vrtlogin_at