@eway-crm/connector 1.0.114 → 1.0.116

package/lib/OAuthSessionHandler.d.ts

@@ -1,20 +1,12 @@
-import { ISessionHandler } from './ISessionHandler';
-import { ApiConnection } from './ApiConnection';
 import { ITokenData } from './interfaces/ITokenData';
 import { TUnionError } from './exceptions/HttpRequestError';
 import { IApiLoginResponse } from './data/IApiLoginResponse';
-export declare class OAuthSessionHandler implements ISessionHandler {
-    private readonly username;
+import { OAuthSessionHandlerBase } from './OAuthSessionHandlerBase';
+export declare class OAuthSessionHandler extends OAuthSessionHandlerBase {
     private readonly refreshToken;
-    private readonly appVersion;
     private readonly clientId;
     private readonly clientSecret;
-    private readonly errorCallback;
     private readonly refreshTokenCallback?;
     lastSuccessfulLoginResponse?: IApiLoginResponse;
-    private accessToken;
     constructor(username: string, clientId: string, clientSecret: string, refreshToken: string, accessToken: string, appVersion: string, errorCallback?: (error: TUnionError) => void, refreshTokenCallback?: (tokenData: ITokenData) => void);
-    readonly invalidateSessionId: (_: string, callback: () => void) => void;
-    readonly getSessionId: (connection: ApiConnection, callback: (sessionId: string) => void) => void;
-    readonly getNewAccessToken: (connection: ApiConnection, callback: (tokenData: ITokenData) => void) => void;
 }

package/lib/OAuthSessionHandler.js

@@ -1,64 +1,31 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthSessionHandler = void 0;
 var _1 = require(".");
-var WebServiceError_1 = require("./exceptions/WebServiceError");
-var OAuthSessionHandler = /** @class */ (function () {
+var OAuthSessionHandlerBase_1 = require("./OAuthSessionHandlerBase");
+var OAuthSessionHandler = /** @class */ (function (_super) {
+    __extends(OAuthSessionHandler, _super);
     function OAuthSessionHandler(username, clientId, clientSecret, refreshToken, accessToken, appVersion, errorCallback, refreshTokenCallback) {
         var _this = this;
-        this.invalidateSessionId = function (_, callback) {
-            // Nothing to invalidate.
-            if (callback) {
-                callback();
-            }
-        };
-        this.getSessionId = function (connection, callback) {
-            connection.callWithoutSession(_1.ApiMethods.logIn, {
-                userName: _this.username,
-                appVersion: _this.appVersion,
-                createSessionCookie: connection.supportsGetItemPreviewMethod
-            }, function (result) {
-                _this.lastSuccessfulLoginResponse = result;
-                var newSessionId = result.SessionId;
-                if (!newSessionId) {
-                    var error = new Error('Successful login but no session came.');
-                    if (_this.errorCallback) {
-                        _this.errorCallback(error);
-                    }
-                    else {
-                        throw error;
-                    }
-                    return;
-                }
-                if (callback) {
-                    callback(newSessionId);
-                }
-            }, function (result) {
-                var error = new WebServiceError_1.WebServiceError(result.ReturnCode, 'Unable to login. Error response follows.\n' + JSON.stringify(result));
-                if (_this.errorCallback) {
-                    _this.errorCallback(error);
-                }
-                else {
-                    throw error;
-                }
-            }, {
-                'Authorization': 'Bearer ' + _this.accessToken
-            }, undefined, function (error) {
-                if ((error === null || error === void 0 ? void 0 : error.statusCode) === 401) {
-                    _this.getNewAccessToken(connection, function (tokenData) {
-                        _this.accessToken = tokenData.access_token;
-                        if (!tokenData.error) {
-                            _this.getSessionId(connection, callback);
-                        }
-                    });
-                    return;
-                }
-                if (!_this.errorCallback)
-                    throw error;
-                _this.errorCallback(error);
-            });
-        };
-        this.getNewAccessToken = function (connection, callback) {
+        if (!username || !refreshToken || !clientId || !clientSecret) {
+            throw new Error("Non of the arguments 'username', 'clientId', 'clientSecret', 'refreshToken' can be empty.");
+        }
+        var getNewAccessToken = function (connection, callback) {
             _1.OAuthHelper.refreshToken(connection.wsUrl, _this.clientId, _this.clientSecret, _this.refreshToken, function (tokenData) {
                 try {
                     if (_this.refreshTokenCallback) {
@@ -70,21 +37,16 @@ var OAuthSessionHandler = /** @class */ (function () {
                         _this.errorCallback(new Error('Refresh token callback failed.\n' + JSON.stringify(error)));
                     }
                 }
-                callback(tokenData);
+                callback(tokenData.access_token, tokenData.error);
             });
         };
-        if (!username || !refreshToken || !clientId || !clientSecret) {
-            throw new Error("Non of the arguments 'username', 'clientId', 'clientSecret', 'refreshToken' can be empty.");
-        }
-        this.username = username;
-        this.refreshToken = refreshToken;
-        this.accessToken = accessToken;
-        this.appVersion = appVersion;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.errorCallback = errorCallback;
-        this.refreshTokenCallback = refreshTokenCallback;
+        _this = _super.call(this, username, accessToken, appVersion, getNewAccessToken, errorCallback) || this;
+        _this.refreshToken = refreshToken;
+        _this.clientId = clientId;
+        _this.clientSecret = clientSecret;
+        _this.refreshTokenCallback = refreshTokenCallback;
+        return _this;
     }
     return OAuthSessionHandler;
-}());
+}(OAuthSessionHandlerBase_1.OAuthSessionHandlerBase));
 exports.OAuthSessionHandler = OAuthSessionHandler;

package/lib/OAuthSessionHandlerBase.d.ts

@@ -0,0 +1,16 @@
+import { ISessionHandler } from './ISessionHandler';
+import { ApiConnection } from './ApiConnection';
+import { TUnionError } from './exceptions/HttpRequestError';
+import { IApiLoginResponse } from './data/IApiLoginResponse';
+export declare abstract class OAuthSessionHandlerBase implements ISessionHandler {
+    lastSuccessfulLoginResponse?: IApiLoginResponse;
+    private accessToken;
+    private readonly username;
+    private readonly appVersion;
+    protected readonly errorCallback: ((error: TUnionError) => void) | undefined;
+    private readonly getNewAccessTokenCallback;
+    constructor(username: string, accessToken: string, appVersion: string, getNewAccessTokenCallback: ((connection: ApiConnection, callback: (accessToken: string, error?: string) => void) => void), errorCallback?: (error: TUnionError) => void);
+    readonly invalidateSessionId: (_: string, callback: () => void) => void;
+    readonly getSessionId: (connection: ApiConnection, callback: (sessionId: string) => void) => void;
+}
+export default OAuthSessionHandlerBase;

package/lib/OAuthSessionHandlerBase.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthSessionHandlerBase = void 0;
+var _1 = require(".");
+var WebServiceError_1 = require("./exceptions/WebServiceError");
+var OAuthSessionHandlerBase = /** @class */ (function () {
+    function OAuthSessionHandlerBase(username, accessToken, appVersion, getNewAccessTokenCallback, errorCallback) {
+        var _this = this;
+        this.invalidateSessionId = function (_, callback) {
+            // Nothing to invalidate.
+            if (callback) {
+                callback();
+            }
+        };
+        this.getSessionId = function (connection, callback) {
+            var successCallbackHandler = function (result) {
+                _this.lastSuccessfulLoginResponse = result;
+                var newSessionId = result.SessionId;
+                if (!newSessionId) {
+                    var error = new Error('Successful login but no session came.');
+                    if (_this.errorCallback) {
+                        _this.errorCallback(error);
+                    }
+                    else {
+                        throw error;
+                    }
+                    return;
+                }
+                if (callback) {
+                    callback(newSessionId);
+                }
+            };
+            var unsuccessCallbackHandler = function (result) {
+                var error = new WebServiceError_1.WebServiceError(result.ReturnCode, 'Unable to login. Error response follows.\n' + JSON.stringify(result));
+                if (_this.errorCallback) {
+                    _this.errorCallback(error);
+                }
+                else {
+                    throw error;
+                }
+            };
+            var errorCallbackHandler = function (error) {
+                if ((error === null || error === void 0 ? void 0 : error.statusCode) === 401) {
+                    _this.getNewAccessTokenCallback(connection, function (accessToken, error) {
+                        _this.accessToken = accessToken;
+                        if (!error) {
+                            _this.getSessionId(connection, callback);
+                        }
+                    });
+                    return;
+                }
+                if (!_this.errorCallback)
+                    throw error;
+                _this.errorCallback(error);
+            };
+            var loginInputData = {
+                userName: _this.username,
+                appVersion: _this.appVersion,
+                createSessionCookie: connection.supportsGetItemPreviewMethod
+            };
+            var loginHeaders = {
+                'Authorization': 'Bearer ' + _this.accessToken
+            };
+            connection.callWithoutSession(_1.ApiMethods.logIn, loginInputData, successCallbackHandler, unsuccessCallbackHandler, loginHeaders, undefined, errorCallbackHandler);
+        };
+        if (!username) {
+            throw new Error("Non of the arguments 'username', 'clientId', 'clientSecret', 'refreshToken' can be empty.");
+        }
+        this.username = username;
+        this.accessToken = accessToken;
+        this.appVersion = appVersion;
+        this.getNewAccessTokenCallback = getNewAccessTokenCallback;
+        this.errorCallback = errorCallback;
+    }
+    return OAuthSessionHandlerBase;
+}());
+exports.OAuthSessionHandlerBase = OAuthSessionHandlerBase;
+exports.default = OAuthSessionHandlerBase;

package/lib/ReturnCodes.d.ts

@@ -1,6 +1,7 @@
 export declare class ReturnCodes {
     static readonly rcSuccess = "rcSuccess";
     static readonly rcBadSession = "rcBadSession";
+    static readonly rcDuplicateContact = "rcDuplicateContact";
     static readonly rcWebServiceMoved = "rcWebServiceMoved";
     static readonly rcAccessDenied = "rcAccessDenied";
     static readonly rcLoginUserNameChanged = "rcLoginUserNameChanged";

package/lib/ReturnCodes.js

@@ -6,6 +6,7 @@ var ReturnCodes = /** @class */ (function () {
     }
     ReturnCodes.rcSuccess = 'rcSuccess';
     ReturnCodes.rcBadSession = 'rcBadSession';
+    ReturnCodes.rcDuplicateContact = 'rcDuplicateContact';
     ReturnCodes.rcWebServiceMoved = 'rcWebServiceMoved';
     ReturnCodes.rcAccessDenied = 'rcAccessDenied';
     ReturnCodes.rcLoginUserNameChanged = 'rcLoginUserNameChanged';

package/lib/data/IApiWebServiceTaskStatus.d.ts

@@ -0,0 +1,10 @@
+export interface IApiWebServiceTaskStatus {
+    TaskGuid: string;
+    IsRunning: boolean;
+    FinishedSuccessfully: boolean;
+    CurrentIndex: number;
+    LastIndex: number;
+    ProgressDetail: string;
+    Parameters: string;
+    AdditionalData: string;
+}

package/lib/data/IApiWebServiceTaskStatus.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/index.d.ts

@@ -24,6 +24,7 @@ import ExpirationReason from './constants/ExpirationReason';
 import LicenseKeyInvoiceSeverity from './constants/LicenseKeyInvoiceSeverity';
 import ErrorHelper from './helpers/ErrorHelper';
 import VersionHelperBase from './helpers/VersionHelperBase';
+import { OAuthSessionHandlerBase } from './OAuthSessionHandlerBase';
 export default ApiConnection;
 export * from './data/EWItem';
 export * from './data/IApiAdditionalField';
@@ -74,10 +75,11 @@ export * from './data/IApiSaveResponse';
 export * from './data/IApiTask';
 export * from './data/IApiUser';
 export * from './data/IApiUserSetting';
+export * from './data/IApiWebServiceTaskStatus';
 export * from './data/IApiWorkflowActionDerivedItem';
 export * from './data/IApiWorkflowModel';
 export * from './data/IApiWorkReport';
 export * from './data/query/IApiQuery';
 export * from './data/query/IApiQueryFilters';
 export * from './interfaces/ITranslatableString';
-export { HttpMethod, ISessionHandler, ReturnCodes, ITokenizedApiResult, TokenizedServiceConnection, CommonDataConnection, ApiMethods, GlobalSettingsNames, FolderNames, TFolderName, OAuthHelper, HttpRequestError, TUnionError, TInputData, FieldNames, EnumTypes, RelationTypes, ColumnPermissionPermissionRules, ColumnPermissionMandatoryRules, Edition, Feature, Functionality, CustomizationStatsItemKeys, LicenseRestrictionKeys, ExpirationReason, LicenseKeyInvoiceSeverity, ErrorHelper, VersionHelperBase };
+export { HttpMethod, ISessionHandler, ReturnCodes, ITokenizedApiResult, TokenizedServiceConnection, CommonDataConnection, ApiMethods, GlobalSettingsNames, FolderNames, TFolderName, OAuthHelper, HttpRequestError, TUnionError, TInputData, FieldNames, EnumTypes, RelationTypes, ColumnPermissionPermissionRules, ColumnPermissionMandatoryRules, Edition, Feature, Functionality, CustomizationStatsItemKeys, LicenseRestrictionKeys, ExpirationReason, LicenseKeyInvoiceSeverity, ErrorHelper, VersionHelperBase, OAuthSessionHandlerBase };

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionHelperBase = exports.ErrorHelper = exports.LicenseKeyInvoiceSeverity = exports.ExpirationReason = exports.LicenseRestrictionKeys = exports.CustomizationStatsItemKeys = exports.Functionality = exports.Feature = exports.Edition = exports.ColumnPermissionMandatoryRules = exports.ColumnPermissionPermissionRules = exports.RelationTypes = exports.EnumTypes = exports.FieldNames = exports.HttpRequestError = exports.OAuthHelper = exports.FolderNames = exports.GlobalSettingsNames = exports.ApiMethods = exports.CommonDataConnection = exports.TokenizedServiceConnection = exports.ReturnCodes = exports.HttpMethod = void 0;
+exports.OAuthSessionHandlerBase = exports.VersionHelperBase = exports.ErrorHelper = exports.LicenseKeyInvoiceSeverity = exports.ExpirationReason = exports.LicenseRestrictionKeys = exports.CustomizationStatsItemKeys = exports.Functionality = exports.Feature = exports.Edition = exports.ColumnPermissionMandatoryRules = exports.ColumnPermissionPermissionRules = exports.RelationTypes = exports.EnumTypes = exports.FieldNames = exports.HttpRequestError = exports.OAuthHelper = exports.FolderNames = exports.GlobalSettingsNames = exports.ApiMethods = exports.CommonDataConnection = exports.TokenizedServiceConnection = exports.ReturnCodes = exports.HttpMethod = void 0;
 var Promise = require("es6-promise");
 var ApiConnection_1 = require("./ApiConnection");
 var HttpMethod_1 = require("./HttpMethod");
@@ -62,6 +62,8 @@ var ErrorHelper_1 = require("./helpers/ErrorHelper");
 exports.ErrorHelper = ErrorHelper_1.default;
 var VersionHelperBase_1 = require("./helpers/VersionHelperBase");
 exports.VersionHelperBase = VersionHelperBase_1.default;
+var OAuthSessionHandlerBase_1 = require("./OAuthSessionHandlerBase");
+Object.defineProperty(exports, "OAuthSessionHandlerBase", { enumerable: true, get: function () { return OAuthSessionHandlerBase_1.OAuthSessionHandlerBase; } });
 Promise.polyfill();
 exports.default = ApiConnection_1.ApiConnection;
 __exportStar(require("./data/EWItem"), exports);
@@ -113,6 +115,7 @@ __exportStar(require("./data/IApiSaveResponse"), exports);
 __exportStar(require("./data/IApiTask"), exports);
 __exportStar(require("./data/IApiUser"), exports);
 __exportStar(require("./data/IApiUserSetting"), exports);
+__exportStar(require("./data/IApiWebServiceTaskStatus"), exports);
 __exportStar(require("./data/IApiWorkflowActionDerivedItem"), exports);
 __exportStar(require("./data/IApiWorkflowModel"), exports);
 __exportStar(require("./data/IApiWorkReport"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eway-crm/connector",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "eWay-CRM API JavaScript connector library.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",