@it-enterprise/digital-signature 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@it-enterprise/digital-signature",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "digital signature",
   "private": false,
   "main": "src/index.js",

package/src/DigitalSignature.js

@@ -638,7 +638,7 @@ export default class DigitalSignature {
     } else if (signType.type === EndUserConstants.EndUserSignContainerType.CAdES) {
       const signLevel = signType.signLevel || EndUserConstants.EndUserSignType.CAdES_X_Long;
 
-      await euSign.SetRuntimeParameter(EndUserConstants.EU_SIGN_TYPE_PARAMETER, signLevel);
+      await this._euSign.SetRuntimeParameter(EndUserConstants.EU_SIGN_TYPE_PARAMETER, signLevel);
 
       if (signType.subType === EndUserConstants.EndUserCAdESType.Detached) {
         const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, !asByteArray);

package/src/Models.js

@@ -74,6 +74,45 @@ export class DefaultSettingProvider {
   }
 }
 
+export class WebserviceSettingProvider {
+  /**
+   * @param {string} language - Язык ошибок
+   * @param {string | function} userId - id пользователя (для сохранения ключей и предпочитаемого типа ключа)
+   * @param {string} apiPath - путь к api ЕЦП
+   * @param {string} workerPath - ссылка на WebWorker
+   */
+  constructor(language, userId, apiPath, workerPath) {
+    this.language = language;
+    this.userId = userId;
+    this.apiPath = apiPath;
+    this.workerPath = workerPath;
+  }
+
+  async getGlSign() {
+    return new GlSign(await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, undefined, undefined, {calcId: 'GETGLSIGNBEFORELOGIN', args: '', ticket: ''}));
+  }
+
+  async getSettings() {
+    if (this._settings) {
+      return this._settings;
+    }
+
+    const json = await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, "json", undefined, {calcId: 'GETCASANDCERTIFICATEFILES', args: '', ticket: ''});
+    this._settings = new DigitalSignatureSettings(
+      this.language,
+      this.userId,
+      `${this.apiPath}/ProxyHandler`,
+      new DefaultCertificatesProvider(
+        `${this.apiPath}/GetFile.ashx?file=${json.FILECAS}`,
+        `${this.apiPath}/GetFile.ashx?file=${json.FILECERT}`
+      ),
+      this.workerPath || "/euscp.worker.js"
+    );
+    
+    return this._settings;
+  }
+}
+
 export class LegacySettingsProvider {
   /**
    * @param {string} language - Язык ошибок

package/src/Utils.js

@@ -6,7 +6,7 @@ import { EndUserCertificate, EndUserConstants, EndUserError } from "../euscp/eus
  * @param {string?} dataType - тип данных, которые необходимо загрузить. Возможные значения: binary, json и пусто для строковых данных
  * @returns {Promise<string | Uint8Array | object>} загруженные данные
  */
-export function downloadData(url, dataType, token) {
+export function downloadData(url, dataType, token, postData) {
   return new Promise((resolve, reject) => {
     url = makeUrl(url);
 
@@ -60,11 +60,19 @@ export function downloadData(url, dataType, token) {
     } else if (dataType == "xml") {
       xmlHttp.responseType = "document";
     }
-    xmlHttp.open("GET", url, true);
+    xmlHttp.open(postData ? "POST" : "GET", url, true);
     if (typeof token === "string") {
       xmlHttp.setRequestHeader("Authorization", "Bearer " + token);
     }
-    xmlHttp.send();
+
+    if (postData) {
+      var jsonData = JSON.stringify(postData);
+      xmlHttp.setRequestHeader('Content-Type', 'application/json');
+      xmlHttp.send(jsonData);
+    }
+    else {
+      xmlHttp.send();
+    }    
   });
 }