Credentials renamed

Author: Marat-Gumerov

.github/workflows/pythonapp.yml

@@ -20,8 +20,8 @@ jobs:
         python -m pip install -r tests/requirements.txt
     - name: Test with pytest
       env:
-        appSid: ${{secrets.appSid}}
-        appKey: ${{secrets.appKey}}
+        clientId: ${{secrets.appSid}}
+        clientSecret: ${{secrets.appKey}}
         apiBaseUrl: "https://api-qa.aspose.cloud"
       run: |
         python -m pytest --verbose --color=yes -m pipeline tests

.github/workflows/pythonpublish.yml

@@ -21,8 +21,8 @@ jobs:
         pip install -r tests/requirements.txt
     - name : Run Tests
       env:
-        appSid: ${{secrets.appSidProd}}
-        appKey: ${{secrets.appKeyProd}}
+        clientId: ${{secrets.appSidProd}}
+        clientSecret: ${{secrets.appKeyProd}}
         apiBaseUrl: "https://api.aspose.cloud"
       run: |
         python -m pytest -m pipeline tests

sdk/AsposeEmailCloudSdk/api/api_base.py

@@ -84,8 +84,8 @@ def call_api():
     def _request_token(self):
         config = self.api_client.configuration
         request_url = "/connect/token"
-        form_params = [('grant_type', 'client_credentials'), ('client_id', config.api_key['app_sid']),
-                       ('client_secret', config.api_key['api_key'])]
+        form_params = [('grant_type', 'client_credentials'), ('client_id', config.api_key['client_id']),
+                       ('client_secret', config.api_key['client_secret'])]
 
         header_params = {'Accept': 'application/json', 'Content-Type': 'application/x-www-form-urlencoded'}
 

sdk/AsposeEmailCloudSdk/api/email_cloud.py

@@ -35,24 +35,24 @@ class EmailCloud(object):
     Aspose.Email Cloud API.
     """
 
-    def __init__(self, app_key=None, app_sid=None, base_url=None,
+    def __init__(self, client_secret=None, client_id=None, base_url=None,
                  api_version=None, debug=False):
         """
         Initializes a new instance of the EmailCloud class.
 
-        :param app_key: The app key.
-        :type app_key: str
-        :param app_sid: The app sid.
-        :type app_sid: str
+        :param client_secret: The client secret.
+        :type client_secret: str
+        :param client_id: The client id.
+        :type client_id: str
         :param base_url: The base URL.
         :type base_url: str
         :param api_version: API version.
         :type api_version: str
         :param debug: If debug mode is enabled. False by default.
         :type debug: bool
         """
-        configuration = Configuration(app_key=app_key,
-                                      app_sid=app_sid,
+        configuration = Configuration(client_secret=client_secret,
+                                      client_id=client_id,
                                       base_url=base_url,
                                       api_version=api_version,
                                       debug=debug)

sdk/AsposeEmailCloudSdk/configuration.py

@@ -43,7 +43,7 @@ class Configuration(object):
 
     default_api_version = 'v4.0'
 
-    def __init__(self, app_key=None, app_sid=None, base_url=None,
+    def __init__(self, client_secret=None, client_id=None, base_url=None,
                  api_version=None, debug=False):
         """Constructor"""
         # Base url
@@ -72,8 +72,8 @@ def __init__(self, app_key=None, app_sid=None, base_url=None,
 
         # Authentication Settings
         # dict to store API key(s)
-        self.api_key = {'api_key': app_key if app_key else "",
-                        'app_sid': app_sid if app_sid else ""}
+        self.api_key = {'client_secret': client_secret if client_secret else "",
+                        'client_id': client_id if client_id else ""}
         # dict to store API prefix (e.g. Bearer)
         self.api_key_prefix = {}
 
@@ -101,7 +101,7 @@ def __init__(self, app_key=None, app_sid=None, base_url=None,
         self.__debug = debug
 
         # On-premise switch
-        self.on_premise = not (app_key or app_sid) and base_url
+        self.on_premise = not (client_secret or client_id) and base_url
 
         # SSL/TLS verification
         # Set this to false to skip verifying SSL certificate when calling API

tests/conftest.py

@@ -31,8 +31,8 @@ def pytest_configure(config):
 @pytest.fixture(scope="class")
 def td(request):
     config = _get_config(request)
-    app_sid = config["appsid"]
-    app_key = config["appkey"]
+    app_sid = config["clientid"]
+    app_key = config["clientsecret"]
     api_base_url = config.get("apibaseurl", "https://api-qa.aspose.cloud")
     email_cloud = api.EmailCloud(app_key, app_sid, api_base_url)
     auth_url = config.get("authurl")