myrtex-mf-signer 1.1.62 → 1.1.64
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/models/sign-request.model.mjs +1 -1
- package/esm2020/lib/models/sign-validate-response.model.mjs +1 -1
- package/esm2020/lib/models/signed-result.model.mjs +1 -1
- package/esm2020/lib/providers/cryptojinn.provider.mjs +8 -4
- package/esm2020/lib/providers/cryptots.provider.mjs +8 -5
- package/esm2020/lib/services/certificate.adjuster.mjs +5 -1
- package/esm2020/lib/services/crypto.api.service.mjs +2 -2
- package/esm2020/lib/services/cryptopro/crypto.pro.base.service.mjs +20 -12
- package/fesm2015/myrtex-mf-signer.mjs +38 -21
- package/fesm2015/myrtex-mf-signer.mjs.map +1 -1
- package/fesm2020/myrtex-mf-signer.mjs +36 -19
- package/fesm2020/myrtex-mf-signer.mjs.map +1 -1
- package/lib/models/sign-request.model.d.ts +2 -0
- package/lib/models/sign-validate-response.model.d.ts +0 -1
- package/lib/models/signed-result.model.d.ts +0 -4
- package/lib/services/certificate.adjuster.d.ts +1 -0
- package/package.json +2 -2
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi1yZXF1ZXN0Lm1vZGVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbXlydGV4LW1mLXNpZ25lci9zcmMvbGliL21vZGVscy9zaWduLXJlcXVlc3QubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNpZ25lclR5cGVFbnVtIH0gZnJvbSAnLi4vZW51bXMvc2lnbmVyLXR5cGUuZW51bSc7XHJcblxyXG5leHBvcnQgdHlwZSBTaWduUHJvdmlkZXJUeXBlID0gJ2VtcHR5JyB8ICdjcnlwdG90cycgfCAnY3J5cHRvJyB8ICdjcnlwdG9qaW5uJztcclxuZXhwb3J0IHR5cGUgU2lnblR5cGUgPSAneG1sJyB8ICd4bWx0cycgfCAncGRmJztcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgQ2VydGlmaWNhdGVDaGVjayB7XHJcbiAgc2lnbmVyVHlwZT86IFNpZ25lclR5cGVFbnVtO1xyXG4gIGZpbzogc3RyaW5nO1xyXG4gIG9ncm46IHN0cmluZztcclxuICBzaG9ydE5hbWU6IHN0cmluZztcclxuICBmdWxsTmFtZTogc3RyaW5nO1xyXG4gIHNuaWxzOiBzdHJpbmc7XHJcbiAgaXNDaGllZjogYm9vbGVhbjtcclxufVxyXG5cclxuZXhwb3J0IGludGVyZmFjZSBTaWduUmVxdWVzdE1vZGVsIHtcclxuICB0aXRsZT86IHN0cmluZztcclxuICBva0xhYmVsPzogc3RyaW5nO1xyXG4gIGNhbmNlbExhYmVsPzogc3RyaW5nO1xyXG4gIHhtbFVybD86IHN0cmluZztcclxuICBwZGZVcmw/OiBzdHJpbmc7XHJcbiAgcHJvdmlkZXI6IFNpZ25Qcm92aWRlclR5cGU7XHJcbiAgc2lnblR5cGU/OiBTaWduVHlwZTtcclxuICB3aXRoTG9nPzogYm9vbGVhbjtcclxuICBza2lwU2VydmVyQ2hlY2s/OiBib29sZWFuO1xyXG4gIGFkZGl0aW9uYWxQZGZVcmxUaXRsZT86IHN0cmluZztcclxuICBhZGRpdGlvbmFsUGRmVXJsPzogc3RyaW5nO1xyXG5cclxuICBjZXJ0aWZpY2F0ZUNoZWNrPzogQ2VydGlmaWNhdGVDaGVjaztcclxuXHJcbiAgLyoqIEBkZXByZWNhdGVkICovXHJcbiAgY2hlY2tGaW8/OiBzdHJpbmc7XHJcbiAgLyoqIEBkZXByZWNhdGVkICovXHJcbiAgY2hlY2tPZ3JuPzogc3RyaW5nO1xyXG4gIC8qKiBAZGVwcmVjYXRlZCAqL1xyXG4gIGNoZWNrT3JnYW5pemF0aW9uRnVsbE5hbWU/OiBzdHJpbmc7XHJcbiAgLyoqIEBkZXByZWNhdGVkICovXHJcbiAgY2hlY2tPcmdhbml6YXRpb25TaG9ydE5hbWU/OiBzdHJpbmc7XHJcbiAgLyoqIEBkZXByZWNhdGVkICovXHJcbiAgY2hlY2tJbm4/OiBzdHJpbmc7XHJcbn1cclxuIl19
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi12YWxpZGF0ZS1yZXNwb25zZS5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL215cnRleC1tZi1zaWduZXIvc3JjL2xpYi9tb2RlbHMvc2lnbi12YWxpZGF0ZS1yZXNwb25zZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGludGVyZmFjZSBTaWduVmFsaWRhdGVSZXNwb25zZSB7XG4gIHN1Y2Nlc3M6IGJvb2xlYW47XG59XG4iXX0=
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVkLXJlc3VsdC5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL215cnRleC1tZi1zaWduZXIvc3JjL2xpYi9tb2RlbHMvc2lnbmVkLXJlc3VsdC5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2VydGlmaWNhdGVNb2RlbCB9IGZyb20gJy4vY2VydGlmaWNhdGUubW9kZWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFNpZ25lZFJlc3VsdE1vZGVsIHtcblxuICAvKipcbiAgICog0J/QvtC00L/QuNGB0YvQstCw0LXQvNGL0LUg0LTQsNC90L3Ri9C1XG4gICAqL1xuICBkYXRhPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xuXG4gIC8qKlxuICAgKiDQn9C+0LTQv9C40YHRjFxuICAgKi9cbiAgc2lnbmVkPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xuXG4gIC8qKlxuICAgKiDQntC/0LXRgNCw0YbQuNGPINGD0YHQv9C10YjQvdC+INC/
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVkLXJlc3VsdC5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL215cnRleC1tZi1zaWduZXIvc3JjL2xpYi9tb2RlbHMvc2lnbmVkLXJlc3VsdC5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2VydGlmaWNhdGVNb2RlbCB9IGZyb20gJy4vY2VydGlmaWNhdGUubW9kZWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFNpZ25lZFJlc3VsdE1vZGVsIHtcblxuICAvKipcbiAgICog0J/QvtC00L/QuNGB0YvQstCw0LXQvNGL0LUg0LTQsNC90L3Ri9C1XG4gICAqL1xuICBkYXRhPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xuXG4gIC8qKlxuICAgKiDQn9C+0LTQv9C40YHRjFxuICAgKi9cbiAgc2lnbmVkPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xuXG4gIC8qKlxuICAgKiDQntC/0LXRgNCw0YbQuNGPINGD0YHQv9C10YjQvdC+INC/0YDQvtCy0LXRgNC10L3QsFxuICAgKi9cbiAgc3VjY2Vzcz86IGJvb2xlYW47XG5cbiAgLyoqXG4gICAqINCU0LDQvdC90YvQtSDQviDRgdC10YDRgtC40YTQuNC60LDRgtC1XG4gICAqL1xuICBjZXJ0aWZpY2F0ZT86IENlcnRpZmljYXRlTW9kZWwgfCB1bmRlZmluZWQ7XG59XG4iXX0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { CryptoProAsyncService } from '../services/cryptopro/crypto.pro.async.service';
|
|
3
3
|
import { CertificateSelectComponent } from '../components/certificate-select/certificate-select.component';
|
|
4
|
+
import { Base64 } from 'js-base64';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "ngx-simple-modal";
|
|
6
7
|
import * as i2 from "../services/crypto.service";
|
|
@@ -37,12 +38,15 @@ export class CryptoJinnProvider {
|
|
|
37
38
|
console.log('Подписанные данные', signedData);
|
|
38
39
|
}
|
|
39
40
|
if (!options?.skipServerCheck) {
|
|
40
|
-
const verifyResult = await this.cryptoApiService.
|
|
41
|
+
const verifyResult = await this.cryptoApiService.verify({
|
|
42
|
+
data: data,
|
|
43
|
+
signature: Base64.encode(signedData),
|
|
44
|
+
detached: false
|
|
45
|
+
}).toPromise();
|
|
41
46
|
return {
|
|
42
47
|
data: signedData,
|
|
43
48
|
success: verifyResult.success,
|
|
44
|
-
certificate: modalResult.selected
|
|
45
|
-
validateResult: verifyResult.validateResult
|
|
49
|
+
certificate: modalResult.selected
|
|
46
50
|
};
|
|
47
51
|
}
|
|
48
52
|
else {
|
|
@@ -62,4 +66,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
62
66
|
providedIn: 'root'
|
|
63
67
|
}]
|
|
64
68
|
}], ctorParameters: function () { return [{ type: i1.SimpleModalService }, { type: i2.CryptoService }, { type: i3.CryptoApiService }]; } });
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3J5cHRvamlubi5wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL215cnRleC1tZi1zaWduZXIvc3JjL2xpYi9wcm92aWRlcnMvY3J5cHRvamlubi5wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBSTNDLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLCtEQUErRCxDQUFDO0FBRzNHLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7Ozs7O0FBS25DLE1BQU0sT0FBTyxrQkFBa0I7SUFFN0IsWUFBb0Isa0JBQXNDLEVBQ2hELGFBQTRCLEVBQzVCLGdCQUFrQztRQUZ4Qix1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ2hELGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBa0I7SUFDNUMsQ0FBQztJQUVNLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBWSxFQUFFLE9BQXFCO1FBQ25ELE1BQU0sT0FBTyxHQUFHLE9BQU8sRUFBRSxPQUFPLENBQUM7UUFFakMsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUUxQyxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUF3QixxQkFBcUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUV0RyxNQUFNLElBQUksR0FBRyxNQUFNLE9BQU8sQ0FBQyxlQUFlLENBQUM7WUFDekMsZ0JBQWdCLEVBQUUsT0FBTyxFQUFFLGdCQUFnQjtTQUM1QyxDQUFDLENBQUM7UUFFSCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQ3JCLE9BQU8sT0FBTyxDQUFDLE1BQU0sQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO1NBQzVEO1FBRUQsTUFBTSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCO2FBQzlDLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBRTVFLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFO1lBQ3pCLElBQUksT0FBTyxFQUFFO2dCQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLENBQUMsQ0FBQzthQUM3QztZQUNELE9BQU8sT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1NBQ3pCO1FBRUQsSUFBSSxPQUFPLEVBQUU7WUFDWCxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixFQUFFLElBQUksQ0FBQyxDQUFDO1NBQzNDO1FBRUQsTUFBTSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRWpGLElBQUksT0FBTyxFQUFFO1lBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsRUFBRSxVQUFVLENBQUMsQ0FBQztTQUMvQztRQUVELElBQUksQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFO1lBQzdCLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQztnQkFDdEQsSUFBSSxFQUFFLElBQUk7Z0JBQ1YsU0FBUyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDO2dCQUNwQyxRQUFRLEVBQUUsS0FBSzthQUNoQixDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7WUFFZixPQUFPO2dCQUNMLElBQUksRUFBRSxVQUFVO2dCQUNoQixPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLFdBQVcsRUFBRSxXQUFXLENBQUMsUUFBUTthQUNsQyxDQUFDO1NBQ0g7YUFBTTtZQUNMLE9BQU87Z0JBQ0wsSUFBSSxFQUFFLFVBQVU7Z0JBQ2hCLE9BQU8sRUFBRSxJQUFJO2dCQUNiLFdBQVcsRUFBRSxXQUFXLENBQUMsUUFBUTthQUNsQyxDQUFDO1NBQ0g7SUFDSCxDQUFDOztnSEE3RFUsa0JBQWtCO29IQUFsQixrQkFBa0IsY0FGakIsTUFBTTs0RkFFUCxrQkFBa0I7a0JBSDlCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBTaW1wbGVNb2RhbFNlcnZpY2UgfSBmcm9tICduZ3gtc2ltcGxlLW1vZGFsJztcclxuaW1wb3J0IHsgSVNpZ25Qcm92aWRlciwgU2lnbk9wdGlvbnMgfSBmcm9tICcuL2ludGVyZmFjZXMvaXNpZ24ucHJvdmlkZXInO1xyXG5pbXBvcnQgeyBDcnlwdG9TZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvY3J5cHRvLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBDcnlwdG9Qcm9Bc3luY1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9jcnlwdG9wcm8vY3J5cHRvLnByby5hc3luYy5zZXJ2aWNlJztcclxuaW1wb3J0IHsgQ2VydGlmaWNhdGVTZWxlY3RDb21wb25lbnQgfSBmcm9tICcuLi9jb21wb25lbnRzL2NlcnRpZmljYXRlLXNlbGVjdC9jZXJ0aWZpY2F0ZS1zZWxlY3QuY29tcG9uZW50JztcclxuaW1wb3J0IHsgQ3J5cHRvQXBpU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NyeXB0by5hcGkuc2VydmljZSc7XHJcbmltcG9ydCB7IFNpZ25lZFJlc3VsdE1vZGVsIH0gZnJvbSAnLi4vbW9kZWxzJztcclxuaW1wb3J0IHsgQmFzZTY0IH0gZnJvbSAnanMtYmFzZTY0JztcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCdcclxufSlcclxuZXhwb3J0IGNsYXNzIENyeXB0b0ppbm5Qcm92aWRlciBpbXBsZW1lbnRzIElTaWduUHJvdmlkZXIge1xyXG5cclxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHNpbXBsZU1vZGFsU2VydmljZTogU2ltcGxlTW9kYWxTZXJ2aWNlLFxyXG4gICAgcHJpdmF0ZSBjcnlwdG9TZXJ2aWNlOiBDcnlwdG9TZXJ2aWNlLFxyXG4gICAgcHJpdmF0ZSBjcnlwdG9BcGlTZXJ2aWNlOiBDcnlwdG9BcGlTZXJ2aWNlKSB7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgYXN5bmMgc2lnbihkYXRhOiBzdHJpbmcsIG9wdGlvbnM/OiBTaWduT3B0aW9ucyk6IFByb21pc2U8U2lnbmVkUmVzdWx0TW9kZWw+IHtcclxuICAgIGNvbnN0IHdpdGhMb2cgPSBvcHRpb25zPy53aXRoTG9nO1xyXG5cclxuICAgIGF3YWl0IHRoaXMuY3J5cHRvU2VydmljZS5zdGFydFVwKHdpdGhMb2cpO1xyXG5cclxuICAgIGNvbnN0IHNlcnZpY2UgPSBhd2FpdCB0aGlzLmNyeXB0b1NlcnZpY2UuZ2V0U2VydmljZTxDcnlwdG9Qcm9Bc3luY1NlcnZpY2U+KENyeXB0b1Byb0FzeW5jU2VydmljZS5rZXkpO1xyXG5cclxuICAgIGNvbnN0IGxpc3QgPSBhd2FpdCBzZXJ2aWNlLmdldENlcnRpZmljYXRlcyh7XHJcbiAgICAgIGNlcnRpZmljYXRlQ2hlY2s6IG9wdGlvbnM/LmNlcnRpZmljYXRlQ2hlY2tcclxuICAgIH0pO1xyXG5cclxuICAgIGlmIChsaXN0Lmxlbmd0aCA9PT0gMCkge1xyXG4gICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3QoJ9Ce0YLRgdGD0YLRgdGC0LLRg9C10YIg0L/QvtC00YXQvtC00Y/RidC40Lkg0YHQtdGA0YLQuNGE0LjQutCw0YInKTtcclxuICAgIH1cclxuXHJcbiAgICBjb25zdCBtb2RhbFJlc3VsdCA9IGF3YWl0IHRoaXMuc2ltcGxlTW9kYWxTZXJ2aWNlXHJcbiAgICAgIC5hZGRNb2RhbChDZXJ0aWZpY2F0ZVNlbGVjdENvbXBvbmVudCwgeyBjZXJ0aWZpY2F0ZXM6IGxpc3QgfSkudG9Qcm9taXNlKCk7XHJcblxyXG4gICAgaWYgKCFtb2RhbFJlc3VsdC5zZWxlY3RlZCkge1xyXG4gICAgICBpZiAod2l0aExvZykge1xyXG4gICAgICAgIGNvbnNvbGUubG9nKCfQodC10YDRgtC40YTQuNC60LDRgiDQvdC1INCy0YvQsdGA0LDQvSwg0L7RgtC80LXQvdCwJyk7XHJcbiAgICAgIH1cclxuICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCk7XHJcbiAgICB9XHJcblxyXG4gICAgaWYgKHdpdGhMb2cpIHtcclxuICAgICAgY29uc29sZS5sb2coJ9Cf0L7QtNC/0LjRgdGL0LLQsNC10LzRi9C1INC00LDQvdC90YvQtScsIGRhdGEpO1xyXG4gICAgfVxyXG5cclxuICAgIGNvbnN0IHNpZ25lZERhdGEgPSBhd2FpdCBzZXJ2aWNlLnNpZ25YbWwobW9kYWxSZXN1bHQuc2VsZWN0ZWQuY2VydGlmaWNhdGUsIGRhdGEpO1xyXG5cclxuICAgIGlmICh3aXRoTG9nKSB7XHJcbiAgICAgIGNvbnNvbGUubG9nKCfQn9C+0LTQv9C40YHQsNC90L3Ri9C1INC00LDQvdC90YvQtScsIHNpZ25lZERhdGEpO1xyXG4gICAgfVxyXG5cclxuICAgIGlmICghb3B0aW9ucz8uc2tpcFNlcnZlckNoZWNrKSB7XHJcbiAgICAgIGNvbnN0IHZlcmlmeVJlc3VsdCA9IGF3YWl0IHRoaXMuY3J5cHRvQXBpU2VydmljZS52ZXJpZnkoe1xyXG4gICAgICAgIGRhdGE6IGRhdGEsXHJcbiAgICAgICAgc2lnbmF0dXJlOiBCYXNlNjQuZW5jb2RlKHNpZ25lZERhdGEpLFxyXG4gICAgICAgIGRldGFjaGVkOiBmYWxzZVxyXG4gICAgICB9KS50b1Byb21pc2UoKTtcclxuXHJcbiAgICAgIHJldHVybiB7XHJcbiAgICAgICAgZGF0YTogc2lnbmVkRGF0YSxcclxuICAgICAgICBzdWNjZXNzOiB2ZXJpZnlSZXN1bHQuc3VjY2VzcyxcclxuICAgICAgICBjZXJ0aWZpY2F0ZTogbW9kYWxSZXN1bHQuc2VsZWN0ZWRcclxuICAgICAgfTtcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHJldHVybiB7XHJcbiAgICAgICAgZGF0YTogc2lnbmVkRGF0YSxcclxuICAgICAgICBzdWNjZXNzOiB0cnVlLFxyXG4gICAgICAgIGNlcnRpZmljYXRlOiBtb2RhbFJlc3VsdC5zZWxlY3RlZFxyXG4gICAgICB9O1xyXG4gICAgfVxyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { CertificateSelectComponent } from '../components/certificate-select/certificate-select.component';
|
|
3
3
|
import { CryptoProTsService } from '../services/cryptopro/crypto.pro.ts.service';
|
|
4
|
+
import { Base64 } from 'js-base64';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "ngx-simple-modal";
|
|
6
7
|
import * as i2 from "../services/crypto.service";
|
|
@@ -26,12 +27,15 @@ export class CryptoTsProvider {
|
|
|
26
27
|
}
|
|
27
28
|
const signedData = await service.sign(modalResult.selected.certificate, data);
|
|
28
29
|
if (!options?.skipServerCheck) {
|
|
29
|
-
const
|
|
30
|
+
const verifyResult = await this.cryptoApiService.verify({
|
|
31
|
+
data: data,
|
|
32
|
+
signature: Base64.encode(signedData),
|
|
33
|
+
detached: false
|
|
34
|
+
}).toPromise();
|
|
30
35
|
return {
|
|
31
36
|
data,
|
|
32
37
|
signed: signedData,
|
|
33
|
-
success:
|
|
34
|
-
validateResult: validateResult.validateResult,
|
|
38
|
+
success: verifyResult.success,
|
|
35
39
|
certificate: modalResult.selected,
|
|
36
40
|
};
|
|
37
41
|
}
|
|
@@ -40,7 +44,6 @@ export class CryptoTsProvider {
|
|
|
40
44
|
data,
|
|
41
45
|
signed: signedData,
|
|
42
46
|
success: true,
|
|
43
|
-
validateResult: '',
|
|
44
47
|
certificate: modalResult.selected,
|
|
45
48
|
};
|
|
46
49
|
}
|
|
@@ -54,4 +57,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
54
57
|
providedIn: 'root'
|
|
55
58
|
}]
|
|
56
59
|
}], ctorParameters: function () { return [{ type: i1.SimpleModalService }, { type: i2.CryptoService }, { type: i3.CryptoApiService }]; } });
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3J5cHRvdHMucHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9teXJ0ZXgtbWYtc2lnbmVyL3NyYy9saWIvcHJvdmlkZXJzL2NyeXB0b3RzLnByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLM0MsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sK0RBQStELENBQUM7QUFDM0csT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFFakYsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQzs7Ozs7QUFLbkMsTUFBTSxPQUFPLGdCQUFnQjtJQUUzQixZQUFvQixrQkFBc0MsRUFDdEMsYUFBNEIsRUFDNUIsZ0JBQWtDO1FBRmxDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtJQUN0RCxDQUFDO0lBRU0sS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFZLEVBQUUsT0FBcUI7UUFDbkQsTUFBTSxPQUFPLEdBQUcsT0FBTyxFQUFFLE9BQU8sQ0FBQztRQUNqQyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzFDLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQXFCLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2hHLE1BQU0sSUFBSSxHQUFHLE1BQU0sT0FBTyxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQzdDLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLGtCQUFrQjthQUM5QyxRQUFRLENBQUMsMEJBQTBCLEVBQUUsRUFBQyxZQUFZLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUUxRSxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRTtZQUN6QixJQUFJLE9BQU8sRUFBRTtnQkFDWCxPQUFPLENBQUMsR0FBRyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7YUFDbkQ7WUFDRCxPQUFPLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQztTQUN6QjtRQUVELE1BQU0sVUFBVSxHQUFHLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUU5RSxJQUFJLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRTtZQUM3QixNQUFNLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUM7Z0JBQ3RELElBQUksRUFBRSxJQUFJO2dCQUNWLFNBQVMsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztnQkFDcEMsUUFBUSxFQUFFLEtBQUs7YUFDaEIsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBRWYsT0FBTztnQkFDTCxJQUFJO2dCQUNKLE1BQU0sRUFBRSxVQUFVO2dCQUNsQixPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLFdBQVcsRUFBRSxXQUFXLENBQUMsUUFBUTthQUNsQyxDQUFDO1NBQ0g7YUFBTTtZQUNMLE9BQU87Z0JBQ0wsSUFBSTtnQkFDSixNQUFNLEVBQUUsVUFBVTtnQkFDbEIsT0FBTyxFQUFFLElBQUk7Z0JBQ2IsV0FBVyxFQUFFLFdBQVcsQ0FBQyxRQUFRO2FBQ2xDLENBQUM7U0FDSDtJQUNILENBQUM7OzhHQTdDVSxnQkFBZ0I7a0hBQWhCLGdCQUFnQixjQUZmLE1BQU07NEZBRVAsZ0JBQWdCO2tCQUg1QixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgSVNpZ25Qcm92aWRlciwgU2lnbk9wdGlvbnMgfSBmcm9tICcuL2ludGVyZmFjZXMvaXNpZ24ucHJvdmlkZXInO1xyXG5pbXBvcnQgeyBTaW1wbGVNb2RhbFNlcnZpY2UgfSBmcm9tICduZ3gtc2ltcGxlLW1vZGFsJztcclxuaW1wb3J0IHsgQ3J5cHRvU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NyeXB0by5zZXJ2aWNlJztcclxuaW1wb3J0IHsgQ3J5cHRvQXBpU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NyeXB0by5hcGkuc2VydmljZSc7XHJcbmltcG9ydCB7IENlcnRpZmljYXRlU2VsZWN0Q29tcG9uZW50IH0gZnJvbSAnLi4vY29tcG9uZW50cy9jZXJ0aWZpY2F0ZS1zZWxlY3QvY2VydGlmaWNhdGUtc2VsZWN0LmNvbXBvbmVudCc7XHJcbmltcG9ydCB7IENyeXB0b1Byb1RzU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NyeXB0b3Byby9jcnlwdG8ucHJvLnRzLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBTaWduZWRSZXN1bHRNb2RlbCB9IGZyb20gJy4uL21vZGVscyc7XHJcbmltcG9ydCB7IEJhc2U2NCB9IGZyb20gJ2pzLWJhc2U2NCc7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBDcnlwdG9Uc1Byb3ZpZGVyIGltcGxlbWVudHMgSVNpZ25Qcm92aWRlciB7XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgc2ltcGxlTW9kYWxTZXJ2aWNlOiBTaW1wbGVNb2RhbFNlcnZpY2UsXHJcbiAgICAgICAgICAgICAgcHJpdmF0ZSBjcnlwdG9TZXJ2aWNlOiBDcnlwdG9TZXJ2aWNlLFxyXG4gICAgICAgICAgICAgIHByaXZhdGUgY3J5cHRvQXBpU2VydmljZTogQ3J5cHRvQXBpU2VydmljZSkge1xyXG4gIH1cclxuXHJcbiAgcHVibGljIGFzeW5jIHNpZ24oZGF0YTogc3RyaW5nLCBvcHRpb25zPzogU2lnbk9wdGlvbnMpOiBQcm9taXNlPFNpZ25lZFJlc3VsdE1vZGVsPiB7XHJcbiAgICBjb25zdCB3aXRoTG9nID0gb3B0aW9ucz8ud2l0aExvZztcclxuICAgIGF3YWl0IHRoaXMuY3J5cHRvU2VydmljZS5zdGFydFVwKHdpdGhMb2cpO1xyXG4gICAgY29uc3Qgc2VydmljZSA9IGF3YWl0IHRoaXMuY3J5cHRvU2VydmljZS5nZXRTZXJ2aWNlPENyeXB0b1Byb1RzU2VydmljZT4oQ3J5cHRvUHJvVHNTZXJ2aWNlLmtleSk7XHJcbiAgICBjb25zdCBsaXN0ID0gYXdhaXQgc2VydmljZS5nZXRDZXJ0aWZpY2F0ZXMoKTtcclxuICAgIGNvbnN0IG1vZGFsUmVzdWx0ID0gYXdhaXQgdGhpcy5zaW1wbGVNb2RhbFNlcnZpY2VcclxuICAgICAgLmFkZE1vZGFsKENlcnRpZmljYXRlU2VsZWN0Q29tcG9uZW50LCB7Y2VydGlmaWNhdGVzOiBsaXN0fSkudG9Qcm9taXNlKCk7XHJcblxyXG4gICAgaWYgKCFtb2RhbFJlc3VsdC5zZWxlY3RlZCkge1xyXG4gICAgICBpZiAod2l0aExvZykge1xyXG4gICAgICAgIGNvbnNvbGUubG9nKCdObyBjZXJ0aWZpY2F0ZSBzZWxlY3RlZCwgcmVqZWN0aW5nJyk7XHJcbiAgICAgIH1cclxuICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCk7XHJcbiAgICB9XHJcblxyXG4gICAgY29uc3Qgc2lnbmVkRGF0YSA9IGF3YWl0IHNlcnZpY2Uuc2lnbihtb2RhbFJlc3VsdC5zZWxlY3RlZC5jZXJ0aWZpY2F0ZSwgZGF0YSk7XHJcblxyXG4gICAgaWYgKCFvcHRpb25zPy5za2lwU2VydmVyQ2hlY2spIHtcclxuICAgICAgY29uc3QgdmVyaWZ5UmVzdWx0ID0gYXdhaXQgdGhpcy5jcnlwdG9BcGlTZXJ2aWNlLnZlcmlmeSh7XHJcbiAgICAgICAgZGF0YTogZGF0YSxcclxuICAgICAgICBzaWduYXR1cmU6IEJhc2U2NC5lbmNvZGUoc2lnbmVkRGF0YSksXHJcbiAgICAgICAgZGV0YWNoZWQ6IGZhbHNlXHJcbiAgICAgIH0pLnRvUHJvbWlzZSgpO1xyXG5cclxuICAgICAgcmV0dXJuIHtcclxuICAgICAgICBkYXRhLFxyXG4gICAgICAgIHNpZ25lZDogc2lnbmVkRGF0YSxcclxuICAgICAgICBzdWNjZXNzOiB2ZXJpZnlSZXN1bHQuc3VjY2VzcyxcclxuICAgICAgICBjZXJ0aWZpY2F0ZTogbW9kYWxSZXN1bHQuc2VsZWN0ZWQsXHJcbiAgICAgIH07XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICByZXR1cm4ge1xyXG4gICAgICAgIGRhdGEsXHJcbiAgICAgICAgc2lnbmVkOiBzaWduZWREYXRhLFxyXG4gICAgICAgIHN1Y2Nlc3M6IHRydWUsXHJcbiAgICAgICAgY2VydGlmaWNhdGU6IG1vZGFsUmVzdWx0LnNlbGVjdGVkLFxyXG4gICAgICB9O1xyXG4gICAgfVxyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -52,6 +52,10 @@ class CertificateAdjuster {
|
|
|
52
52
|
return this.extract(certSubjectName, ['INN', 'ИНН', '1.2.643.3.131.1.1']);
|
|
53
53
|
}
|
|
54
54
|
;
|
|
55
|
+
getCertSnils(certSubjectName) {
|
|
56
|
+
return this.extract(certSubjectName, ['SNILS', 'СНИЛС', '1.2.643.100.3']);
|
|
57
|
+
}
|
|
58
|
+
;
|
|
55
59
|
getCertName(certSubjectName) {
|
|
56
60
|
return this.extract(certSubjectName, 'CN');
|
|
57
61
|
}
|
|
@@ -67,4 +71,4 @@ class CertificateAdjuster {
|
|
|
67
71
|
}
|
|
68
72
|
const instance = new CertificateAdjuster();
|
|
69
73
|
export { instance as CertificateAdjuster };
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydGlmaWNhdGUuYWRqdXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9teXJ0ZXgtbWYtc2lnbmVyL3NyYy9saWIvc2VydmljZXMvY2VydGlmaWNhdGUuYWRqdXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxtQkFBbUI7SUFDdkIsT0FBTyxDQUFDLENBQVMsRUFBRSxJQUF1QjtRQUN4QyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxRQUFRLEVBQUU7WUFDOUIsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDZjtRQUVELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ3BDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxDQUFDLEdBQUcsd0NBQXdDLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDekUsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNyQixJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxDQUFDLE1BQU0sS0FBSyxTQUFTLElBQUksQ0FBQyxDQUFDLE1BQU0sS0FBSyxJQUFJLEVBQUU7Z0JBQzdELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO2dCQUN2QixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzFCLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDekIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFD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Q0FBQztJQUFBLENBQUM7Q0FDSDtBQUVELE1BQU0sUUFBUSxHQUFHLElBQUksbUJBQW1CLEVBQUUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsUUFBUSxJQUFJLG1CQUFtQixFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBDZXJ0aWZpY2F0ZUFkanVzdGVyIHtcclxuICBleHRyYWN0KHM6IHN0cmluZywgbmFtZTogc3RyaW5nIHwgc3RyaW5nW10pOiBzdHJpbmcge1xyXG4gICAgaWYgKHR5cGVvZiAobmFtZSkgPT09ICdzdHJpbmcnKSB7XHJcbiAgICAgIG5hbWUgPSBbbmFtZV07XHJcbiAgICB9XHJcblxyXG4gICAgZm9yICh2YXIgaSA9IDA7IGkgPCBuYW1lLmxlbmd0aDsgaSsrKSB7XHJcbiAgICAgIGNvbnN0IG4gPSBuYW1lW2ldO1xyXG4gICAgICBjb25zdCByZSA9IG5ldyBSZWdFeHAobiArICdcXFxccyo9XFxcXHMqKD88dmFsdWU+W149XSspKD86WyxcXFxcXFxcXC9dfCQpJywgJ2cnKTtcclxuICAgICAgY29uc3QgbSA9IHJlLmV4ZWMocyk7XHJcbiAgICAgIGlmIChtICE9PSBudWxsICYmIG0uZ3JvdXBzICE9PSB1bmRlZmluZWQgJiYgbS5ncm91cHMgIT09IG51bGwpIHtcclxuICAgICAgICBsZXQgciA9IG0uZ3JvdXBzLnZhbHVlO1xyXG4gICAgICAgIHIgPSByLnJlcGxhY2UoL15cXFwiPy8sICcnKTtcclxuICAgICAgICByID0gci5yZXBsYWNlKC9cXFwiJC8sICcnKTtcclxuICAgICAgICByID0gci5yZXBsYWNlKC9cXFwiXFxcIi9nLCAnXCInKTtcclxuICAgICAgICByZXR1cm4gcjtcclxuICAgICAgfVxyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiAnJztcclxuICB9O1xyXG5cclxuICBwcmludDJEaWdpdChkaWdpdDogbnVtYmVyKSB7XHJcbiAgICByZXR1cm4gKGRpZ2l0IDwgMTApID8gJzAnICsgZGlnaXQgOiBkaWdpdDtcclxuICB9O1xyXG5cclxuICBnZXRDZXJ0RGF0ZShwYXJhbURhdGU6IGFueSkge1xyXG4gICAgbGV0IGNlcnREYXRlID0gbmV3IERhdGUocGFyYW1EYXRlKTtcclxuICAgIHJldHVybiB0aGlzLnByaW50MkRpZ2l0KGNlcnREYXRlLmdldFVUQ0RhdGUoKSkgKyAnLicgKyB0aGlzLnByaW50MkRpZ2l0KGNlcnREYXRlLmdldE1vbnRoKCkgKyAxKSArXHJcbiAgICAgICcuJyArIGNlcnREYXRlLmdldEZ1bGxZZWFyKCkgKyAnICcgK1xyXG4gICAgICB0aGlzLnByaW50MkRpZ2l0KGNlcnREYXRlLmdldFVUQ0hvdXJzKCkpICsgJzonICsgdGhpcy5wcmludDJEaWdpdChjZXJ0RGF0ZS5nZXRVVENNaW51dGVzKCkpICtcclxuICAgICAgJzonICsgdGhpcy5wcmludDJEaWdpdChjZXJ0RGF0ZS5nZXRVVENTZWNvbmRzKCkpO1xyXG4gIH07XHJcblxyXG4gIGdldENlcnRGaW8oY2VydFN1YmplY3ROYW1lOiBzdHJpbmcpIHtcclxuICAgIGNvbnN0IGxhc3ROYW1lID0gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgJ1NOJyk7XHJcbiAgICBjb25zdCBuYW1lID0gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgJ0cnKTtcclxuXHJcbiAgICByZXR1cm4gbGFzdE5hbWUgKyAnICcgKyBuYW1lO1xyXG4gIH07XHJcblxyXG4gIGdldENlcnRQb3N0KGNlcnRTdWJqZWN0TmFtZTogc3RyaW5nKSB7XHJcbiAgICByZXR1cm4gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgJ1QnKTtcclxuICB9O1xyXG5cclxuICBnZXRDZXJ0T2dybihjZXJ0U3ViamVjdE5hbWU6IHN0cmluZykge1xyXG4gICAgcmV0dXJuIHRoaXMuZXh0cmFjdChjZXJ0U3ViamVjdE5hbWUsIFsnT0dSTicsICfQntCT0KDQnScsICfQntCT0KDQndCY0J8nLCdPR1JOSVAnLCAnMS4yLjY0My4xMDAuMSddKTtcclxuICB9O1xyXG5cclxuICBnZXRDZXJ0T3JnKGNlcnRTdWJqZWN0TmFtZTogc3RyaW5nKSB7XHJcbiAgICByZXR1cm4gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgJ08nKTtcclxuICB9O1xyXG5cclxuICBnZXRDZXJ0SW5uKGNlcnRTdWJqZWN0TmFtZTogc3RyaW5nKSB7XHJcbiAgICByZXR1cm4gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgWydJTk4nLCAn0JjQndCdJywgJzEuMi42NDMuMy4xMzEuMS4xJ10pO1xyXG4gIH07XHJcblxyXG4gIGdldENlcnRTbmlscyhjZXJ0U3ViamVjdE5hbWU6IHN0cmluZykge1xyXG4gICAgcmV0dXJuIHRoaXMuZXh0cmFjdChjZXJ0U3ViamVjdE5hbWUsIFsnU05JTFMnLCAn0KHQndCY0JvQoScsICcxLjIuNjQzLjEwMC4zJ10pO1xyXG4gIH07XHJcblxyXG4gIGdldENlcnROYW1lKGNlcnRTdWJqZWN0TmFtZTogc3RyaW5nKSB7XHJcbiAgICByZXR1cm4gdGhpcy5leHRyYWN0KGNlcnRTdWJqZWN0TmFtZSwgJ0NOJyk7XHJcbiAgfTtcclxuXHJcbiAgZ2V0SXNzdWVyKGNlcnRJc3N1ZXJOYW1lOiBzdHJpbmcpIHtcclxuICAgIHJldHVybiB0aGlzLmV4dHJhY3QoY2VydElzc3Vlck5hbWUsICdDTicpO1xyXG4gIH07XHJcblxyXG4gIGdldENlcnRJbmZvU3RyaW5nKGNlcnRTdWJqZWN0TmFtZTogc3RyaW5nLCBjZXJ0RnJvbURhdGU6IGFueSkge1xyXG4gICAgcmV0dXJuIHRoaXMuZXh0cmFjdChjZXJ0U3ViamVjdE5hbWUsICdDTicpICsgJzsg0JLRi9C00LDQvTogJyArIHRoaXMuZ2V0Q2VydERhdGUoY2VydEZyb21EYXRlKTtcclxuICB9O1xyXG59XHJcblxyXG5jb25zdCBpbnN0YW5jZSA9IG5ldyBDZXJ0aWZpY2F0ZUFkanVzdGVyKCk7XHJcbmV4cG9ydCB7IGluc3RhbmNlIGFzIENlcnRpZmljYXRlQWRqdXN0ZXIgfTsiXX0=
|
|
@@ -14,7 +14,7 @@ export class CryptoApiService extends EndpointBaseService {
|
|
|
14
14
|
return this.http.post(`${this.urlCrypto}/verify`, data);
|
|
15
15
|
}
|
|
16
16
|
validate(data) {
|
|
17
|
-
return this.http.post(`${this.urlSigner}/
|
|
17
|
+
return this.http.post(`${this.urlSigner}/cryptopro/validate`, { data });
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
CryptoApiService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CryptoApiService, deps: [{ token: i1.HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -25,4 +25,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
25
25
|
providedIn: 'root'
|
|
26
26
|
}]
|
|
27
27
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i0.Injector }]; } });
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3J5cHRvLmFwaS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbXlydGV4LW1mLXNpZ25lci9zcmMvbGliL3NlcnZpY2VzL2NyeXB0by5hcGkuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBR3JELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDOzs7QUFRN0QsTUFBTSxPQUFPLGdCQUFpQixTQUFRLG1CQUFtQjtJQUt2RCxZQUFzQixJQUFnQixFQUFZLFFBQWtCO1FBQ2xFLEtBQUssQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFERixTQUFJLEdBQUosSUFBSSxDQUFZO1FBQVksYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUg1RCxjQUFTLEdBQUcsbUJBQW1CLENBQUM7UUFDaEMsY0FBUyxHQUFHLGdCQUFnQixDQUFDO0lBSXJDLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBcUI7UUFDakMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBMEIsR0FBRyxJQUFJLENBQUMsU0FBUyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkYsQ0FBQztJQUVNLFFBQVEsQ0FBQyxJQUFZO1FBQzFCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQXVCLEdBQUcsSUFBSSxDQUFDLFNBQVMscUJBQXFCLEVBQUUsRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDO0lBQzlGLENBQUM7OzhHQWZVLGdCQUFnQjtrSEFBaEIsZ0JBQWdCLGNBRmYsTUFBTTs0RkFFUCxnQkFBZ0I7a0JBSDVCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBFbmRwb2ludEJhc2VTZXJ2aWNlIH0gZnJvbSAnbXlydGV4LW1mLXVpLWNvbXBvc2l0ZSc7XG5pbXBvcnQgeyBTaWduVmFsaWRhdGVSZXNwb25zZSB9IGZyb20gJy4uL21vZGVscyc7XG5pbXBvcnQgeyBWZXJpZnlDZXJ0TW9kZWwgfSBmcm9tICcuLi9tb2RlbHMvaW50ZXJuYWwvdmVyaWZ5LmNlcnQubW9kZWwnO1xuaW1wb3J0IHsgVmVyaWZ5Q2VydFJlc3BvbnNlTW9kZWwgfSBmcm9tICcuLi9tb2RlbHMvaW50ZXJuYWwvdmVyaWZ5LmNlcnQucmVzcG9uc2UubW9kZWwnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBDcnlwdG9BcGlTZXJ2aWNlIGV4dGVuZHMgRW5kcG9pbnRCYXNlU2VydmljZSB7XG5cbiAgcHJpdmF0ZSB1cmxDcnlwdG8gPSAnL2NyeXB0b3Byby9hcGkvdjEnO1xuICBwcml2YXRlIHVybFNpZ25lciA9ICcvc2lnbmVyL2FwaS92MSc7XG5cbiAgY29uc3RydWN0b3IocHJvdGVjdGVkIGh0dHA6IEh0dHBDbGllbnQsIHByb3RlY3RlZCBpbmplY3RvcjogSW5qZWN0b3IpIHtcbiAgICBzdXBlcihodHRwLCBpbmplY3Rvcik7XG4gIH1cblxuICBwdWJsaWMgdmVyaWZ5KGRhdGE6IFZlcmlmeUNlcnRNb2RlbCk6IE9ic2VydmFibGU8VmVyaWZ5Q2VydFJlc3BvbnNlTW9kZWw+IHtcbiAgICByZXR1cm4gdGhpcy5odHRwLnBvc3Q8VmVyaWZ5Q2VydFJlc3BvbnNlTW9kZWw+KGAke3RoaXMudXJsQ3J5cHRvfS92ZXJpZnlgLCBkYXRhKTtcbiAgfVxuXG4gIHB1YmxpYyB2YWxpZGF0ZShkYXRhOiBzdHJpbmcpOiBPYnNlcnZhYmxlPFNpZ25WYWxpZGF0ZVJlc3BvbnNlPiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PFNpZ25WYWxpZGF0ZVJlc3BvbnNlPihgJHt0aGlzLnVybFNpZ25lcn0vY3J5cHRvcHJvL3ZhbGlkYXRlYCwge2RhdGF9KTtcbiAgfVxufVxuIl19
|
|
@@ -33,6 +33,7 @@ export class CryptoProBaseService extends CryptoBaseService {
|
|
|
33
33
|
fio: CertificateAdjuster.getCertFio(subjectName),
|
|
34
34
|
post: CertificateAdjuster.getCertPost(subjectName),
|
|
35
35
|
ogrn: CertificateAdjuster.getCertOgrn(subjectName),
|
|
36
|
+
snils: CertificateAdjuster.getCertSnils(subjectName),
|
|
36
37
|
organization: CertificateAdjuster.getCertOrg(subjectName),
|
|
37
38
|
inn: CertificateAdjuster.getCertInn(subjectName),
|
|
38
39
|
validFromDate: validFromDate.toLocaleDateString('ru-RU'),
|
|
@@ -52,26 +53,33 @@ export class CryptoProBaseService extends CryptoBaseService {
|
|
|
52
53
|
}
|
|
53
54
|
else if ([SignerTypeEnum.UL, SignerTypeEnum.IP]
|
|
54
55
|
.indexOf(filter?.certificateCheck?.signerType || SignerTypeEnum.Unknown) > -1) {
|
|
55
|
-
// filterOk = certificate.ogrn ? true : false;
|
|
56
56
|
if (filterOk) {
|
|
57
57
|
const organization = certificate.organization || certificate.cn;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|| (filter?.certificateCheck?.shortName &&
|
|
62
|
-
strippingCharacters(filter?.certificateCheck?.shortName).indexOf(strippingCharacters(organization)) > -1);
|
|
63
|
-
if (!orgIsValid) {
|
|
58
|
+
const orgIsValid = filter?.certificateCheck?.ogrn === certificate.ogrn;
|
|
59
|
+
if (!orgIsValid) {
|
|
60
|
+
if (filter?.certificateCheck?.isChief) {
|
|
64
61
|
filterOk = false;
|
|
65
62
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
63
|
+
else {
|
|
64
|
+
const orgNameIsValid = (filter?.certificateCheck?.fullName &&
|
|
65
|
+
strippingCharacters(filter?.certificateCheck?.fullName)
|
|
66
|
+
.indexOf(strippingCharacters(organization)) > -1)
|
|
67
|
+
|| (filter?.certificateCheck?.shortName &&
|
|
68
|
+
strippingCharacters(filter?.certificateCheck?.shortName)
|
|
69
|
+
.indexOf(strippingCharacters(organization)) > -1);
|
|
70
|
+
if (!orgNameIsValid) {
|
|
71
|
+
filterOk = false;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
69
74
|
}
|
|
70
75
|
}
|
|
71
76
|
}
|
|
72
77
|
if (filterOk && filter?.certificateCheck?.signerType) {
|
|
73
78
|
const fio = certificate.fio.toLowerCase();
|
|
74
|
-
|
|
79
|
+
const snils = certificate.snils.replace(/[\s-]+/g, '');
|
|
80
|
+
const snilsCert = filter?.certificateCheck?.snils?.replace(/[\s-]+/g, '');
|
|
81
|
+
if (filter?.certificateCheck?.fio?.toLocaleLowerCase() !== fio ||
|
|
82
|
+
snilsCert !== snils) {
|
|
75
83
|
filterOk = false;
|
|
76
84
|
}
|
|
77
85
|
}
|
|
@@ -84,4 +92,4 @@ export class CryptoProBaseService extends CryptoBaseService {
|
|
|
84
92
|
return certificates;
|
|
85
93
|
}
|
|
86
94
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crypto.pro.base.service.js","sourceRoot":"","sources":["../../../../../../projects/myrtex-mf-signer/src/lib/services/cryptopro/crypto.pro.base.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n  Async,\r\n  CADESCOM_STORE_LOCATION,\r\n  CAPICOM_STORE_NAMES,\r\n  CAPICOM_STORE_OPEN_MODE,\r\n  ProgIds\r\n} from 'cadesplugin-types';\r\nimport { CertificateCheck, CertificateModel } from '../../models';\r\n// @ts-ignore\r\nimport getCadesplugin from 'async-cadesplugin';\r\nimport { CryptoBaseService } from '../crypto.base.service';\r\nimport { CertificateAdjuster } from '../certificate.adjuster';\r\nimport { SignerTypeEnum } from '../../enums/signer-type.enum';\r\nimport { strippingCharacters } from '../../helpers/strippingCharacters';\r\n\r\ndeclare global {\r\n  interface Window {\r\n    cadesplugin: Async.IWebClassFactory;\r\n    CRYPTO_SKIP_CHECK?: boolean;\r\n  }\r\n}\r\n\r\ninterface CertificateFilter {\r\n  certificateCheck?: CertificateCheck;\r\n}\r\n\r\ninterface Certificate {\r\n  id: number;\r\n  certificate: any;\r\n  subjectName: string;\r\n  name: string;\r\n  cn: string;\r\n  fio: string;\r\n  post: string;\r\n  ogrn: string;\r\n  organization: string;\r\n  inn: string;\r\n  validFromDate: string;\r\n  validToDate: string;\r\n  thumbprint: string;\r\n  issuerName: string;\r\n  serialNumber: string;\r\n  isExpired: boolean;\r\n}\r\n\r\nexport class CryptoProBaseService extends CryptoBaseService {\r\n\r\n  constructor() {\r\n    super();\r\n  }\r\n\r\n  public async init(): Promise<CryptoBaseService> {\r\n    await getCadesplugin();\r\n    return Promise.resolve(this);\r\n  };\r\n\r\n  public async getCertificates(filter?: CertificateFilter): Promise<CertificateModel[]> {\r\n    const store = await window.cadesplugin.CreateObjectAsync(ProgIds.Store);\r\n    await store.Open(CADESCOM_STORE_LOCATION.CAPICOM_CURRENT_USER_STORE, CAPICOM_STORE_NAMES.CAPICOM_MY_STORE,\r\n      CAPICOM_STORE_OPEN_MODE.CAPICOM_STORE_OPEN_MAXIMUM_ALLOWED);\r\n\r\n    let storeCerts = await store.Certificates;\r\n    let count = await storeCerts.Count;\r\n    let certificates: Array<CertificateModel> = [];\r\n\r\n    for (let i = 1; i <= count; i++) {\r\n      let cert = await storeCerts.Item(i);\r\n      let validFromDate = new Date(await cert.ValidFromDate);\r\n      let validToDate = new Date(await cert.ValidToDate);\r\n      const subjectName = await cert.SubjectName;\r\n\r\n      const certificate: Certificate = {\r\n        id: i,\r\n        certificate: cert,\r\n        subjectName: subjectName,\r\n        name: CertificateAdjuster.getCertInfoString(subjectName, validFromDate),\r\n        cn: CertificateAdjuster.getCertName(subjectName),\r\n        fio: CertificateAdjuster.getCertFio(subjectName),\r\n        post: CertificateAdjuster.getCertPost(subjectName),\r\n        ogrn: CertificateAdjuster.getCertOgrn(subjectName),\r\n        organization: CertificateAdjuster.getCertOrg(subjectName),\r\n        inn: CertificateAdjuster.getCertInn(subjectName),\r\n        validFromDate: validFromDate.toLocaleDateString('ru-RU'),\r\n        validToDate: validToDate.toLocaleDateString('ru-RU'),\r\n        thumbprint: await cert.Thumbprint,\r\n        issuerName: await cert.IssuerName,\r\n        serialNumber: await cert.SerialNumber,\r\n        isExpired: validToDate < new Date()\r\n      };\r\n\r\n      if (certificate.isExpired) {\r\n        continue;\r\n      }\r\n\r\n      let filterOk = true;\r\n      if (window.CRYPTO_SKIP_CHECK !== true) {\r\n        if (filter?.certificateCheck?.signerType === SignerTypeEnum.FL) {\r\n          filterOk = !certificate.ogrn;\r\n        } else if ([SignerTypeEnum.UL, SignerTypeEnum.IP]\r\n          .indexOf(filter?.certificateCheck?.signerType || SignerTypeEnum.Unknown) > -1) {\r\n          // filterOk = certificate.ogrn ? true : false;\r\n          if (filterOk) {\r\n            const organization = certificate.organization || certificate.cn;\r\n\r\n            if (organization) {\r\n              const orgIsValid = (filter?.certificateCheck?.fullName &&\r\n                strippingCharacters(filter?.certificateCheck?.fullName).indexOf(strippingCharacters(organization)) > -1)\r\n                || (filter?.certificateCheck?.shortName &&\r\n                  strippingCharacters(filter?.certificateCheck?.shortName).indexOf(strippingCharacters(organization)) > -1);\r\n              if (!orgIsValid) {\r\n                filterOk = false;\r\n              }\r\n            } else {\r\n              filterOk = false;\r\n            }\r\n          }\r\n        }\r\n\r\n        if (filterOk && filter?.certificateCheck?.signerType) {\r\n          const fio = certificate.fio.toLowerCase();\r\n\r\n          if (filter?.certificateCheck?.fio?.toLocaleLowerCase() !== fio) {\r\n            filterOk = false;\r\n          }\r\n        }\r\n      }\r\n\r\n      if (filterOk) {\r\n        certificates.push(certificate);\r\n      }\r\n    }\r\n\r\n    await store.Close();\r\n    return certificates;\r\n  }\r\n}\r\n"]}
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crypto.pro.base.service.js","sourceRoot":"","sources":["../../../../../../projects/myrtex-mf-signer/src/lib/services/cryptopro/crypto.pro.base.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n  Async,\r\n  CADESCOM_STORE_LOCATION,\r\n  CAPICOM_STORE_NAMES,\r\n  CAPICOM_STORE_OPEN_MODE,\r\n  ProgIds\r\n} from 'cadesplugin-types';\r\nimport { CertificateCheck, CertificateModel } from '../../models';\r\n// @ts-ignore\r\nimport getCadesplugin from 'async-cadesplugin';\r\nimport { CryptoBaseService } from '../crypto.base.service';\r\nimport { CertificateAdjuster } from '../certificate.adjuster';\r\nimport { SignerTypeEnum } from '../../enums/signer-type.enum';\r\nimport { strippingCharacters } from '../../helpers/strippingCharacters';\r\n\r\ndeclare global {\r\n  interface Window {\r\n    cadesplugin: Async.IWebClassFactory;\r\n    CRYPTO_SKIP_CHECK?: boolean;\r\n  }\r\n}\r\n\r\ninterface CertificateFilter {\r\n  certificateCheck?: CertificateCheck;\r\n}\r\n\r\ninterface Certificate {\r\n  id: number;\r\n  certificate: any;\r\n  subjectName: string;\r\n  name: string;\r\n  cn: string;\r\n  fio: string;\r\n  post: string;\r\n  ogrn: string;\r\n  organization: string;\r\n  inn: string;\r\n  validFromDate: string;\r\n  validToDate: string;\r\n  thumbprint: string;\r\n  issuerName: string;\r\n  serialNumber: string;\r\n  isExpired: boolean;\r\n  snils: string;\r\n}\r\n\r\nexport class CryptoProBaseService extends CryptoBaseService {\r\n\r\n  constructor() {\r\n    super();\r\n  }\r\n\r\n  public async init(): Promise<CryptoBaseService> {\r\n    await getCadesplugin();\r\n    return Promise.resolve(this);\r\n  };\r\n\r\n  public async getCertificates(filter?: CertificateFilter): Promise<CertificateModel[]> {\r\n    const store = await window.cadesplugin.CreateObjectAsync(ProgIds.Store);\r\n    await store.Open(CADESCOM_STORE_LOCATION.CAPICOM_CURRENT_USER_STORE, CAPICOM_STORE_NAMES.CAPICOM_MY_STORE,\r\n      CAPICOM_STORE_OPEN_MODE.CAPICOM_STORE_OPEN_MAXIMUM_ALLOWED);\r\n\r\n    let storeCerts = await store.Certificates;\r\n    let count = await storeCerts.Count;\r\n    let certificates: Array<CertificateModel> = [];\r\n\r\n    for (let i = 1; i <= count; i++) {\r\n      let cert = await storeCerts.Item(i);\r\n      let validFromDate = new Date(await cert.ValidFromDate);\r\n      let validToDate = new Date(await cert.ValidToDate);\r\n      const subjectName = await cert.SubjectName;\r\n\r\n      const certificate: Certificate = {\r\n        id: i,\r\n        certificate: cert,\r\n        subjectName: subjectName,\r\n        name: CertificateAdjuster.getCertInfoString(subjectName, validFromDate),\r\n        cn: CertificateAdjuster.getCertName(subjectName),\r\n        fio: CertificateAdjuster.getCertFio(subjectName),\r\n        post: CertificateAdjuster.getCertPost(subjectName),\r\n        ogrn: CertificateAdjuster.getCertOgrn(subjectName),\r\n        snils: CertificateAdjuster.getCertSnils(subjectName),\r\n        organization: CertificateAdjuster.getCertOrg(subjectName),\r\n        inn: CertificateAdjuster.getCertInn(subjectName),\r\n        validFromDate: validFromDate.toLocaleDateString('ru-RU'),\r\n        validToDate: validToDate.toLocaleDateString('ru-RU'),\r\n        thumbprint: await cert.Thumbprint,\r\n        issuerName: await cert.IssuerName,\r\n        serialNumber: await cert.SerialNumber,\r\n        isExpired: validToDate < new Date()\r\n      };\r\n\r\n      if (certificate.isExpired) {\r\n        continue;\r\n      }\r\n\r\n      let filterOk = true;\r\n      if (window.CRYPTO_SKIP_CHECK !== true) {\r\n        if (filter?.certificateCheck?.signerType === SignerTypeEnum.FL) {\r\n          filterOk = !certificate.ogrn;\r\n        } else if ([SignerTypeEnum.UL, SignerTypeEnum.IP]\r\n          .indexOf(filter?.certificateCheck?.signerType || SignerTypeEnum.Unknown) > -1) {\r\n          if (filterOk) {\r\n            const organization = certificate.organization || certificate.cn;\r\n            const orgIsValid = filter?.certificateCheck?.ogrn === certificate.ogrn;\r\n            if (!orgIsValid) {\r\n              if (filter?.certificateCheck?.isChief) {\r\n                filterOk = false;\r\n              } else {\r\n                const orgNameIsValid = (filter?.certificateCheck?.fullName &&\r\n                  strippingCharacters(filter?.certificateCheck?.fullName)\r\n                    .indexOf(strippingCharacters(organization)) > -1)\r\n                  || (filter?.certificateCheck?.shortName &&\r\n                    strippingCharacters(filter?.certificateCheck?.shortName)\r\n                      .indexOf(strippingCharacters(organization)) > -1);\r\n                if (!orgNameIsValid) {\r\n                  filterOk = false;\r\n                }\r\n              }\r\n            }\r\n          }\r\n        }\r\n\r\n        if (filterOk && filter?.certificateCheck?.signerType) {\r\n          const fio = certificate.fio.toLowerCase();\r\n          const snils = certificate.snils.replace(/[\\s-]+/g, '');\r\n          const snilsCert = filter?.certificateCheck?.snils?.replace(/[\\s-]+/g, '');\r\n\r\n          if (filter?.certificateCheck?.fio?.toLocaleLowerCase() !== fio ||\r\n            snilsCert !== snils) {\r\n            filterOk = false;\r\n          }\r\n        }\r\n      }\r\n\r\n      if (filterOk) {\r\n        certificates.push(certificate);\r\n      }\r\n    }\r\n\r\n    await store.Close();\r\n    return certificates;\r\n  }\r\n}\r\n"]}
|
|
@@ -91,6 +91,10 @@ class CertificateAdjuster {
|
|
|
91
91
|
return this.extract(certSubjectName, ['INN', 'ИНН', '1.2.643.3.131.1.1']);
|
|
92
92
|
}
|
|
93
93
|
;
|
|
94
|
+
getCertSnils(certSubjectName) {
|
|
95
|
+
return this.extract(certSubjectName, ['SNILS', 'СНИЛС', '1.2.643.100.3']);
|
|
96
|
+
}
|
|
97
|
+
;
|
|
94
98
|
getCertName(certSubjectName) {
|
|
95
99
|
return this.extract(certSubjectName, 'CN');
|
|
96
100
|
}
|
|
@@ -125,7 +129,7 @@ class CryptoProBaseService extends CryptoBaseService {
|
|
|
125
129
|
}
|
|
126
130
|
;
|
|
127
131
|
getCertificates(filter) {
|
|
128
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
132
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
129
133
|
return __awaiter(this, void 0, void 0, function* () {
|
|
130
134
|
const store = yield window.cadesplugin.CreateObjectAsync("CAdESCOM.Store" /* Store */);
|
|
131
135
|
yield store.Open(2 /* CAPICOM_CURRENT_USER_STORE */, "My" /* CAPICOM_MY_STORE */, 2 /* CAPICOM_STORE_OPEN_MAXIMUM_ALLOWED */);
|
|
@@ -146,6 +150,7 @@ class CryptoProBaseService extends CryptoBaseService {
|
|
|
146
150
|
fio: instance.getCertFio(subjectName),
|
|
147
151
|
post: instance.getCertPost(subjectName),
|
|
148
152
|
ogrn: instance.getCertOgrn(subjectName),
|
|
153
|
+
snils: instance.getCertSnils(subjectName),
|
|
149
154
|
organization: instance.getCertOrg(subjectName),
|
|
150
155
|
inn: instance.getCertInn(subjectName),
|
|
151
156
|
validFromDate: validFromDate.toLocaleDateString('ru-RU'),
|
|
@@ -165,26 +170,33 @@ class CryptoProBaseService extends CryptoBaseService {
|
|
|
165
170
|
}
|
|
166
171
|
else if ([SignerTypeEnum.UL, SignerTypeEnum.IP]
|
|
167
172
|
.indexOf(((_b = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _b === void 0 ? void 0 : _b.signerType) || SignerTypeEnum.Unknown) > -1) {
|
|
168
|
-
// filterOk = certificate.ogrn ? true : false;
|
|
169
173
|
if (filterOk) {
|
|
170
174
|
const organization = certificate.organization || certificate.cn;
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|| (((_e = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _e === void 0 ? void 0 : _e.shortName) &&
|
|
175
|
-
strippingCharacters((_f = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _f === void 0 ? void 0 : _f.shortName).indexOf(strippingCharacters(organization)) > -1);
|
|
176
|
-
if (!orgIsValid) {
|
|
175
|
+
const orgIsValid = ((_c = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _c === void 0 ? void 0 : _c.ogrn) === certificate.ogrn;
|
|
176
|
+
if (!orgIsValid) {
|
|
177
|
+
if ((_d = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _d === void 0 ? void 0 : _d.isChief) {
|
|
177
178
|
filterOk = false;
|
|
178
179
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
180
|
+
else {
|
|
181
|
+
const orgNameIsValid = (((_e = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _e === void 0 ? void 0 : _e.fullName) &&
|
|
182
|
+
strippingCharacters((_f = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _f === void 0 ? void 0 : _f.fullName)
|
|
183
|
+
.indexOf(strippingCharacters(organization)) > -1)
|
|
184
|
+
|| (((_g = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _g === void 0 ? void 0 : _g.shortName) &&
|
|
185
|
+
strippingCharacters((_h = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _h === void 0 ? void 0 : _h.shortName)
|
|
186
|
+
.indexOf(strippingCharacters(organization)) > -1);
|
|
187
|
+
if (!orgNameIsValid) {
|
|
188
|
+
filterOk = false;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
182
191
|
}
|
|
183
192
|
}
|
|
184
193
|
}
|
|
185
|
-
if (filterOk && ((
|
|
194
|
+
if (filterOk && ((_j = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _j === void 0 ? void 0 : _j.signerType)) {
|
|
186
195
|
const fio = certificate.fio.toLowerCase();
|
|
187
|
-
|
|
196
|
+
const snils = certificate.snils.replace(/[\s-]+/g, '');
|
|
197
|
+
const snilsCert = (_l = (_k = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _k === void 0 ? void 0 : _k.snils) === null || _l === void 0 ? void 0 : _l.replace(/[\s-]+/g, '');
|
|
198
|
+
if (((_o = (_m = filter === null || filter === void 0 ? void 0 : filter.certificateCheck) === null || _m === void 0 ? void 0 : _m.fio) === null || _o === void 0 ? void 0 : _o.toLocaleLowerCase()) !== fio ||
|
|
199
|
+
snilsCert !== snils) {
|
|
188
200
|
filterOk = false;
|
|
189
201
|
}
|
|
190
202
|
}
|
|
@@ -429,7 +441,7 @@ class CryptoApiService extends EndpointBaseService {
|
|
|
429
441
|
return this.http.post(`${this.urlCrypto}/verify`, data);
|
|
430
442
|
}
|
|
431
443
|
validate(data) {
|
|
432
|
-
return this.http.post(`${this.urlSigner}/
|
|
444
|
+
return this.http.post(`${this.urlSigner}/cryptopro/validate`, { data });
|
|
433
445
|
}
|
|
434
446
|
}
|
|
435
447
|
CryptoApiService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CryptoApiService, deps: [{ token: i1$1.HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -573,12 +585,15 @@ class CryptoJinnProvider {
|
|
|
573
585
|
console.log('Подписанные данные', signedData);
|
|
574
586
|
}
|
|
575
587
|
if (!(options === null || options === void 0 ? void 0 : options.skipServerCheck)) {
|
|
576
|
-
const verifyResult = yield this.cryptoApiService.
|
|
588
|
+
const verifyResult = yield this.cryptoApiService.verify({
|
|
589
|
+
data: data,
|
|
590
|
+
signature: Base64.encode(signedData),
|
|
591
|
+
detached: false
|
|
592
|
+
}).toPromise();
|
|
577
593
|
return {
|
|
578
594
|
data: signedData,
|
|
579
595
|
success: verifyResult.success,
|
|
580
|
-
certificate: modalResult.selected
|
|
581
|
-
validateResult: verifyResult.validateResult
|
|
596
|
+
certificate: modalResult.selected
|
|
582
597
|
};
|
|
583
598
|
}
|
|
584
599
|
else {
|
|
@@ -622,12 +637,15 @@ class CryptoTsProvider {
|
|
|
622
637
|
}
|
|
623
638
|
const signedData = yield service.sign(modalResult.selected.certificate, data);
|
|
624
639
|
if (!(options === null || options === void 0 ? void 0 : options.skipServerCheck)) {
|
|
625
|
-
const
|
|
640
|
+
const verifyResult = yield this.cryptoApiService.verify({
|
|
641
|
+
data: data,
|
|
642
|
+
signature: Base64.encode(signedData),
|
|
643
|
+
detached: false
|
|
644
|
+
}).toPromise();
|
|
626
645
|
return {
|
|
627
646
|
data,
|
|
628
647
|
signed: signedData,
|
|
629
|
-
success:
|
|
630
|
-
validateResult: validateResult.validateResult,
|
|
648
|
+
success: verifyResult.success,
|
|
631
649
|
certificate: modalResult.selected,
|
|
632
650
|
};
|
|
633
651
|
}
|
|
@@ -636,7 +654,6 @@ class CryptoTsProvider {
|
|
|
636
654
|
data,
|
|
637
655
|
signed: signedData,
|
|
638
656
|
success: true,
|
|
639
|
-
validateResult: '',
|
|
640
657
|
certificate: modalResult.selected,
|
|
641
658
|
};
|
|
642
659
|
}
|