Merge pull request #84 from ringcentral/RCLABS-771

Fix 400 in delete API, add body in request

ringcentral/demos/demo_platform.py

@@ -0,0 +1,55 @@
+from ringcentral import SDK
+from dotenv import dotenv_values, find_dotenv
+
+env = dotenv_values(find_dotenv())
+
+def create_delete_bridge(platform):
+    body = {
+        "name": "Weekly Meeting with Sushil",
+        "type": "Instant",
+        "security": {
+            "passwordProtected": True,
+            "password": "Wq123ygs15",
+            "noGuests": False,
+            "sameAccount": False,
+            "e2ee": False
+        },
+        "preferences": {
+            "join": {
+                "audioMuted": False,
+                "videoMuted": False,
+                "waitingRoomRequired": "Nobody",
+                "pstn": {
+                    "promptAnnouncement": True,
+                    "promptParticipants": True
+                }
+            },
+            "playTones": "Off",
+            "musicOnHold": True,
+            "joinBeforeHost": True,
+            "screenSharing": True,
+            "recordingsMode": "User",
+            "transcriptionsMode": "User",
+            "recordings": {
+                "everyoneCanControl": {
+                    "enabled": True
+                },
+                "autoShared": {
+                    "enabled": True
+                }
+            },
+            "allowEveryoneTranscribeMeetings": True
+        }
+    }
+    create_respone = platform.post(url='/rcvideo/v2/account/~/extension/~/bridges', body=body)
+    print("Id = "+create_respone.json().id)
+    print("Meeting Name = "+create_respone.json().name)
+    platform.delete(url="/rcvideo/v2/bridges/" + str(create_respone.json().id))
+
+def main():
+    sdk = SDK(env['RINGCENTRAL_CLIENT_ID'], env['RINGCENTRAL_CLIENT_SECRET'], env['RINGCENTRAL_SERVER_URL'])
+    platform = sdk.platform()
+    platform.login(jwt = env['RINGCENTRAL_JWT_TOKEN'])
+    create_delete_bridge(platform)
+if __name__ == '__main__':
+    main()

ringcentral/platform/platform.py

@@ -309,8 +309,8 @@ def patch(self, url, body=None, query_params=None, headers=None, skip_auth_check
         request = self._client.create_request('PATCH', url, query_params=query_params, headers=headers, body=body)
         return self.send_request(request, skip_auth_check=skip_auth_check)
 
-    def delete(self, url, query_params=None, headers=None, skip_auth_check=False):
-        request = self._client.create_request('DELETE', url, query_params=query_params, headers=headers)
+    def delete(self, url, body=None, query_params=None, headers=None, skip_auth_check=False):
+        request = self._client.create_request('DELETE', url, query_params=query_params, headers=headers, body=body)
         return self.send_request(request, skip_auth_check=skip_auth_check)
 
     def _request_token(self, path='', body=None):

ringcentral/platform/platform_test.py

@@ -36,7 +36,7 @@ def test_login_fail(self, mock):
             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)
@@ -140,7 +140,18 @@ def test_api_url_custom_prefixes(self, mock):
         url = '/analytics/phone/foo'
         act = sdk.platform().create_url(url, add_server=True)
         self.assertEqual(exp, act)
-
+
+    def test_delete_with_body(self,mock):
+        sdk = self.get_sdk(mock)
+        self.delete_mock_with_body(mock)
+        res = sdk.platform().delete(url='/restapi/v2/accounts/~/extensions',body={"keepAssetsInInventory": True,"records": [{"id": "123"}]})
+        self.assertTrue(mock.called)
+
+    def test_delete_without_body(self, mock):
+        sdk = self.get_sdk(mock)
+        self.delete_mock_without_body(mock)
+        sdk.platform().delete(url='/restapi/v2/accounts/~/extensions')
+        self.assertTrue(mock.called)
 
 if __name__ == '__main__':
     unittest.main()

ringcentral/test/testcase.py

@@ -105,3 +105,9 @@ def subscription_mock(self, mock, expires_in=54000, filters=None, id=None):
             'status': 'Active',
             'uri': 'https://platform.ringcentral.com/restapi/v1.0/subscription/foo-bar-baz'
         })
+
+    def delete_mock_with_body(self,mock):
+        return self.add(mock, 'DELETE', '/restapi/v2/accounts/~/extensions', {"keepAssetsInInventory": True,"records": [{"id": "123"}]})
+
+    def delete_mock_without_body(self,mock):
+        return self.add(mock, 'DELETE', '/restapi/v2/accounts/~/extensions', body=None)