From 2fc089b1f2abab9c6bd53443a167a598c1abccad Mon Sep 17 00:00:00 2001 From: "byrne.reese" Date: Thu, 5 May 2022 15:41:20 -0700 Subject: [PATCH 1/4] Added support for analytics endpoint urls --- ringcentral/platform/platform.py | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ringcentral/platform/platform.py b/ringcentral/platform/platform.py index 90161fc..5668300 100644 --- a/ringcentral/platform/platform.py +++ b/ringcentral/platform/platform.py @@ -21,6 +21,7 @@ KNOWN_PREFIXES = [ URL_PREFIX, '/rcvideo', + '/analytics', '/scim' ] diff --git a/setup.py b/setup.py index 2fe5d92..a8c3ca7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -VERSION = '0.7.12' +VERSION = '0.7.13' setup( name='ringcentral', From f3b84551e9f105239dcb10647863467370576de3 Mon Sep 17 00:00:00 2001 From: "byrne.reese" Date: Thu, 5 May 2022 15:58:18 -0700 Subject: [PATCH 2/4] Trying to resolve urlparse import issue for py2 an py3 --- ringcentral/platform/platform.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ringcentral/platform/platform.py b/ringcentral/platform/platform.py index 5668300..350c40a 100644 --- a/ringcentral/platform/platform.py +++ b/ringcentral/platform/platform.py @@ -2,7 +2,10 @@ # encoding: utf-8 import sys -import urllib.parse +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse from observable import Observable from functools import reduce from .auth import Auth From ae58802796e6e498ec366cb191f3fc2c4cf00be8 Mon Sep 17 00:00:00 2001 From: "byrne.reese" Date: Thu, 5 May 2022 16:15:17 -0700 Subject: [PATCH 3/4] trying to increase test coverage --- ringcentral/platform/platform_test.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ringcentral/platform/platform_test.py b/ringcentral/platform/platform_test.py index 451c56f..99d232c 100644 --- a/ringcentral/platform/platform_test.py +++ b/ringcentral/platform/platform_test.py @@ -30,6 +30,16 @@ def test_login_code(self, mock): else: self.assertEqual(text, 'code=foo&grant_type=authorization_code&redirect_uri=mock%3A%2F%2Fwhatever-redirect') + def test_login_fail(self, mock): + sdk = self.get_sdk(mock) + self.logout_mock(mock) + sdk.platform().logout() + self.authentication_mock(mock) + try: + sdk.platform().login() + except Exception as e: + self.assertTrue( e ) + def test_login_code_redirect(self, mock): sdk = self.get_sdk(mock) self.logout_mock(mock) @@ -129,6 +139,10 @@ def test_api_url_custom_prefixes(self, mock): act = sdk.platform().create_url(url, add_server=True) self.assertEqual(exp, act) + url = '/analytics/phone/foo' + act = sdk.platform().create_url(url, add_server=True) + self.assertEqual(exp, act) + if __name__ == '__main__': unittest.main() From 5c645ed86dc736edbc12accaa1e9f93c4c47ecbf Mon Sep 17 00:00:00 2001 From: "byrne.reese" Date: Thu, 5 May 2022 16:19:08 -0700 Subject: [PATCH 4/4] Fixed unit test for url building --- ringcentral/platform/platform_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ringcentral/platform/platform_test.py b/ringcentral/platform/platform_test.py index 99d232c..d1165a9 100644 --- a/ringcentral/platform/platform_test.py +++ b/ringcentral/platform/platform_test.py @@ -139,6 +139,7 @@ def test_api_url_custom_prefixes(self, mock): act = sdk.platform().create_url(url, add_server=True) self.assertEqual(exp, act) + exp = 'mock://whatever/analytics/phone/foo' url = '/analytics/phone/foo' act = sdk.platform().create_url(url, add_server=True) self.assertEqual(exp, act)