Client credentials fields renamed

Author: Marat-Gumerov

.github/workflows/npmpublish.yml

@@ -19,8 +19,8 @@ jobs:
         npm run compile
     - run: npm run test-pipeline
       env:
-        appSid: ${{secrets.appSidProd}}
-        appKey: ${{secrets.appKeyProd}}
+        clientId: ${{secrets.appSidProd}}
+        clientSecret: ${{secrets.appKeyProd}}
         apiBaseUrl: "https://api.aspose.cloud"
     - run: npm publish
       env:

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
           npm run compile
       - name: Test
         env:
-          appSid: ${{secrets.appSid}}
-          appKey: ${{secrets.appKey}}
+          clientId: ${{secrets.appSid}}
+          clientSecret: ${{secrets.appKey}}
           apiBaseUrl: "https://api-qa.aspose.cloud"
         run: npm run test-pipeline

.gitignore

@@ -3,4 +3,5 @@ package-lock.json
 dist
 .vscode
 .idea
-.nyc_output
+.nyc_output
+.run/

src/api/email-cloud.ts

@@ -140,13 +140,13 @@ export class EmailCloud {
 
 
     /**
-     * @param appSID App SID.
-     * @param appKey App key.
+     * @param clientId Client id.
+     * @param clientSecret Client secret.
      * @param baseUrl Base api Url.
      * @param debugMode A value indicating whether debug mode. In debug mode all requests and responses are logged to console.
      */
-    constructor(appSID: string, appKey: string, baseUrl?: string, debugMode?: boolean) {
-        this.configuration = new Configuration(appKey, appSID, baseUrl, debugMode);
+    constructor(clientId: string, clientSecret: string, baseUrl?: string, debugMode?: boolean) {
+        this.configuration = new Configuration(clientSecret, clientId, baseUrl, debugMode);
 
         this._calendar = new CalendarApi(this.configuration);
 

src/internal/auth.ts

@@ -72,8 +72,8 @@ export class JwtAuth implements IAuthentication {
 
     private async requestToken(configuration: Configuration): Promise<void> {
         let postData = "grant_type=client_credentials";
-        postData += "&client_id=" + configuration.appSID;
-        postData += "&client_secret=" + configuration.appKey;
+        postData += "&client_id=" + configuration.clientId;
+        postData += "&client_secret=" + configuration.clientSecret;
 
         const requestOptions: request.Options = {
             method: "POST",

src/internal/configuration.ts

@@ -37,12 +37,12 @@ export class Configuration {
     /**
      * App SID.
      */
-    public appSID: string;
+    public clientId: string;
 
     /**
      * App key.
      */
-    public appKey: string;
+    public clientSecret: string;
 
     /**
      * Base Url.
@@ -70,8 +70,8 @@ export class Configuration {
      */
     public onPremise: boolean = false;
 
-    constructor(appKey: string, appSID: string, baseUrl?: string, debugMode?: boolean, apiVersion?: string) {
-        if (appKey && appSID) {
+    constructor(clientSecret: string, clientId: string, baseUrl?: string, debugMode?: boolean, apiVersion?: string) {
+        if (clientSecret && clientId) {
             this.onPremise = false;
         } else if (baseUrl) {
             this.onPremise = true;
@@ -86,8 +86,8 @@ export class Configuration {
         }
         this.authUrl = this.baseUrl;
 
-        this.appSID = appSID;
-        this.appKey = appKey;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
         this.debugMode = debugMode;
 
         if (apiVersion) {

test/suite-base.ts

@@ -30,7 +30,7 @@ export function suiteBase(suite: Suite): SuiteBase {
     const storage = 'First Storage';
     suite.timeout(100000);
     suite.beforeAll(async () => {
-        api = new EmailCloud(process.env.appSid, process.env.appKey, process.env.apiBaseUrl);
+        api = new EmailCloud(process.env.clientId, process.env.clientSecret, process.env.apiBaseUrl);
         const authUrl = process.env.authUrl;
         if (authUrl != null) api.configuration.authUrl = authUrl;
         folder = uuidv4();