@lifeready/core 1.0.12 → 1.0.15
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/README.md +62 -62
- package/bundles/lifeready-core.umd.js +14315 -14315
- package/bundles/lifeready-core.umd.js.map +1 -1
- package/bundles/lifeready-core.umd.min.js.map +1 -1
- package/esm2015/lib/_common/ast.js +40 -40
- package/esm2015/lib/_common/deferred-promise.js +24 -24
- package/esm2015/lib/_common/exceptions.js +157 -157
- package/esm2015/lib/_common/queries.gql.js +190 -190
- package/esm2015/lib/_common/run-outside-angular.js +79 -79
- package/esm2015/lib/_common/types.js +1 -1
- package/esm2015/lib/_common/utils.js +52 -52
- package/esm2015/lib/api/contact-card.gql.js +79 -79
- package/esm2015/lib/api/contact-card.service.js +154 -154
- package/esm2015/lib/api/contact-card2.gql.js +60 -60
- package/esm2015/lib/api/contact-card2.service.js +103 -103
- package/esm2015/lib/api/file.service.js +74 -74
- package/esm2015/lib/api/key-exchange.gql.js +188 -188
- package/esm2015/lib/api/key-exchange.service.js +442 -442
- package/esm2015/lib/api/key-exchange.types.js +18 -18
- package/esm2015/lib/api/key-exchange2.gql.js +171 -171
- package/esm2015/lib/api/key-exchange2.service.js +479 -479
- package/esm2015/lib/api/lock.gql.js +40 -40
- package/esm2015/lib/api/lock.service.js +64 -64
- package/esm2015/lib/api/lr-apollo.service.js +46 -46
- package/esm2015/lib/api/lr-graphql/index.js +6 -6
- package/esm2015/lib/api/lr-graphql/lr-graphql.service.js +155 -155
- package/esm2015/lib/api/lr-graphql/lr-merged-mutation.js +213 -213
- package/esm2015/lib/api/lr-graphql/lr-mutation-base.js +51 -51
- package/esm2015/lib/api/lr-graphql/lr-mutation.js +48 -48
- package/esm2015/lib/api/lr-graphql/lr.service.js +18 -18
- package/esm2015/lib/api/message.service.js +138 -138
- package/esm2015/lib/api/persist.service.js +181 -181
- package/esm2015/lib/api/query-processor/common-processors.service.js +93 -93
- package/esm2015/lib/api/query-processor/index.js +3 -3
- package/esm2015/lib/api/query-processor/query-processor.service.js +262 -262
- package/esm2015/lib/api/query-processor/tp-password-reset-processor.service.js +109 -109
- package/esm2015/lib/api/shared-contact-card.service.js +119 -119
- package/esm2015/lib/api/shared-contact-card2.gql.js +41 -41
- package/esm2015/lib/api/shared-contact-card2.service.js +117 -117
- package/esm2015/lib/api/time.service.js +146 -146
- package/esm2015/lib/api/types/graphql.types.js +7 -7
- package/esm2015/lib/api/types/index.js +3 -3
- package/esm2015/lib/api/types/lr-graphql.types.js +101 -101
- package/esm2015/lib/auth/auth.config.js +57 -57
- package/esm2015/lib/auth/auth.gql.js +48 -48
- package/esm2015/lib/auth/auth.types.js +27 -27
- package/esm2015/lib/auth/idle.service.js +168 -168
- package/esm2015/lib/auth/idle.types.js +7 -7
- package/esm2015/lib/auth/lbop.service.js +355 -355
- package/esm2015/lib/auth/life-ready-auth.service.js +488 -488
- package/esm2015/lib/auth/password.service.js +320 -320
- package/esm2015/lib/auth/register.service.js +172 -172
- package/esm2015/lib/auth/two-factor.service.js +74 -74
- package/esm2015/lib/category/category-meta.service.js +99 -99
- package/esm2015/lib/category/category.gql.js +406 -406
- package/esm2015/lib/category/category.service.js +390 -390
- package/esm2015/lib/category/category.types.js +29 -29
- package/esm2015/lib/cryptography/cryptography.types.js +11 -11
- package/esm2015/lib/cryptography/encryption.service.js +189 -189
- package/esm2015/lib/cryptography/key-factory.service.js +237 -237
- package/esm2015/lib/cryptography/key-graph.service.js +299 -299
- package/esm2015/lib/cryptography/key-meta.service.js +200 -200
- package/esm2015/lib/cryptography/key.service.js +124 -124
- package/esm2015/lib/cryptography/slip39.service.js +169 -169
- package/esm2015/lib/cryptography/web-crypto.service.js +29 -29
- package/esm2015/lib/items2/item2.gql.js +139 -139
- package/esm2015/lib/items2/item2.service.js +498 -498
- package/esm2015/lib/items2/item2.types.js +1 -1
- package/esm2015/lib/life-ready.config.js +84 -84
- package/esm2015/lib/life-ready.module.js +74 -74
- package/esm2015/lib/notification/notification.gql.js +43 -43
- package/esm2015/lib/notification/notification.service.js +118 -118
- package/esm2015/lib/plan/plan.gql.js +123 -123
- package/esm2015/lib/plan/plan.service.js +149 -149
- package/esm2015/lib/plan/plan.types.js +11 -11
- package/esm2015/lib/record/record-attachment.service.js +101 -101
- package/esm2015/lib/record/record.gql.js +179 -179
- package/esm2015/lib/record/record.service.js +206 -206
- package/esm2015/lib/record/record.types.js +15 -15
- package/esm2015/lib/record-type/record-type.service.js +75 -75
- package/esm2015/lib/record-type/record-type.types.js +28 -28
- package/esm2015/lib/scenario/scenario.constants.js +2 -2
- package/esm2015/lib/scenario/scenario.controller.js +34 -34
- package/esm2015/lib/scenario/scenario.gql.js +72 -72
- package/esm2015/lib/scenario/scenario.gql.private.js +198 -198
- package/esm2015/lib/scenario/scenario.service.js +538 -538
- package/esm2015/lib/scenario/scenario.types.js +1 -1
- package/esm2015/lib/trusted-parties/tp-assembly.gql.private.js +22 -22
- package/esm2015/lib/trusted-parties/tp-assembly.js +362 -362
- package/esm2015/lib/trusted-parties/tp-assembly.types.js +1 -1
- package/esm2015/lib/trusted-parties/tp-password-reset-request.service.js +113 -113
- package/esm2015/lib/trusted-parties/tp-password-reset-user.service.js +129 -129
- package/esm2015/lib/trusted-parties/tp-password-reset.constants.js +4 -4
- package/esm2015/lib/trusted-parties/tp-password-reset.controller.js +34 -34
- package/esm2015/lib/trusted-parties/tp-password-reset.gql.js +236 -236
- package/esm2015/lib/trusted-parties/tp-password-reset.service.js +95 -95
- package/esm2015/lib/trusted-parties/trusted-party.gql.js +148 -148
- package/esm2015/lib/trusted-parties/trusted-party.service.js +326 -326
- package/esm2015/lib/trusted-parties/trusted-party.types.js +41 -41
- package/esm2015/lib/trusted-parties/trusted-party2.gql.js +87 -87
- package/esm2015/lib/trusted-parties/trusted-party2.service.js +215 -215
- package/esm2015/lib/users/profile-details.service.js +214 -214
- package/esm2015/lib/users/profile.gql.js +97 -97
- package/esm2015/lib/users/profile.service.js +169 -169
- package/esm2015/lib/users/profile.types.js +34 -34
- package/esm2015/lib/users/user.gql.js +60 -60
- package/esm2015/lib/users/user.service.js +79 -79
- package/esm2015/lib/users/user.types.js +5 -5
- package/esm2015/lifeready-core.js +13 -13
- package/esm2015/public-api.js +71 -71
- package/fesm2015/lifeready-core.js +12258 -12258
- package/fesm2015/lifeready-core.js.map +1 -1
- package/lib/_common/ast.d.ts +11 -11
- package/lib/_common/deferred-promise.d.ts +12 -12
- package/lib/_common/exceptions.d.ts +109 -109
- package/lib/_common/queries.gql.d.ts +10 -10
- package/lib/_common/run-outside-angular.d.ts +14 -14
- package/lib/_common/types.d.ts +10 -10
- package/lib/_common/utils.d.ts +9 -9
- package/lib/api/contact-card.gql.d.ts +7 -7
- package/lib/api/contact-card.service.d.ts +52 -52
- package/lib/api/contact-card2.gql.d.ts +34 -34
- package/lib/api/contact-card2.service.d.ts +49 -49
- package/lib/api/file.service.d.ts +18 -18
- package/lib/api/key-exchange.gql.d.ts +9 -9
- package/lib/api/key-exchange.service.d.ts +39 -39
- package/lib/api/key-exchange.types.d.ts +196 -196
- package/lib/api/key-exchange2.gql.d.ts +125 -125
- package/lib/api/key-exchange2.service.d.ts +187 -187
- package/lib/api/lock.gql.d.ts +27 -27
- package/lib/api/lock.service.d.ts +34 -34
- package/lib/api/lr-apollo.service.d.ts +15 -15
- package/lib/api/lr-graphql/index.d.ts +5 -5
- package/lib/api/lr-graphql/lr-graphql.service.d.ts +60 -60
- package/lib/api/lr-graphql/lr-merged-mutation.d.ts +28 -28
- package/lib/api/lr-graphql/lr-mutation-base.d.ts +28 -28
- package/lib/api/lr-graphql/lr-mutation.d.ts +8 -8
- package/lib/api/lr-graphql/lr.service.d.ts +9 -9
- package/lib/api/message.service.d.ts +58 -58
- package/lib/api/persist.service.d.ts +31 -31
- package/lib/api/query-processor/common-processors.service.d.ts +36 -36
- package/lib/api/query-processor/index.d.ts +2 -2
- package/lib/api/query-processor/query-processor.service.d.ts +18 -18
- package/lib/api/query-processor/tp-password-reset-processor.service.d.ts +15 -15
- package/lib/api/shared-contact-card.service.d.ts +33 -33
- package/lib/api/shared-contact-card2.gql.d.ts +36 -36
- package/lib/api/shared-contact-card2.service.d.ts +45 -45
- package/lib/api/time.service.d.ts +16 -16
- package/lib/api/types/graphql.types.d.ts +29 -29
- package/lib/api/types/index.d.ts +2 -2
- package/lib/api/types/lr-graphql.types.d.ts +502 -502
- package/lib/auth/auth.config.d.ts +5 -5
- package/lib/auth/auth.gql.d.ts +15 -15
- package/lib/auth/auth.types.d.ts +66 -66
- package/lib/auth/idle.service.d.ts +40 -40
- package/lib/auth/idle.types.d.ts +10 -10
- package/lib/auth/lbop.service.d.ts +91 -91
- package/lib/auth/life-ready-auth.service.d.ts +61 -61
- package/lib/auth/password.service.d.ts +78 -78
- package/lib/auth/register.service.d.ts +25 -25
- package/lib/auth/two-factor.service.d.ts +15 -15
- package/lib/category/category-meta.service.d.ts +23 -23
- package/lib/category/category.gql.d.ts +45 -45
- package/lib/category/category.service.d.ts +67 -67
- package/lib/category/category.types.d.ts +79 -79
- package/lib/cryptography/cryptography.types.d.ts +83 -83
- package/lib/cryptography/encryption.service.d.ts +41 -41
- package/lib/cryptography/key-factory.service.d.ts +38 -38
- package/lib/cryptography/key-graph.service.d.ts +41 -41
- package/lib/cryptography/key-meta.service.d.ts +44 -44
- package/lib/cryptography/key.service.d.ts +36 -36
- package/lib/cryptography/slip39.service.d.ts +43 -43
- package/lib/cryptography/web-crypto.service.d.ts +5 -5
- package/lib/items2/item2.gql.d.ts +123 -123
- package/lib/items2/item2.service.d.ts +203 -203
- package/lib/items2/item2.types.d.ts +70 -70
- package/lib/life-ready.config.d.ts +14 -14
- package/lib/life-ready.module.d.ts +5 -5
- package/lib/notification/notification.gql.d.ts +37 -37
- package/lib/notification/notification.service.d.ts +63 -63
- package/lib/plan/plan.gql.d.ts +11 -11
- package/lib/plan/plan.service.d.ts +33 -33
- package/lib/plan/plan.types.d.ts +31 -31
- package/lib/record/record-attachment.service.d.ts +16 -16
- package/lib/record/record.gql.d.ts +14 -14
- package/lib/record/record.service.d.ts +25 -25
- package/lib/record/record.types.d.ts +57 -57
- package/lib/record-type/record-type.service.d.ts +11 -11
- package/lib/record-type/record-type.types.d.ts +50 -50
- package/lib/scenario/scenario.constants.d.ts +1 -1
- package/lib/scenario/scenario.controller.d.ts +10 -10
- package/lib/scenario/scenario.gql.d.ts +62 -62
- package/lib/scenario/scenario.gql.private.d.ts +16 -16
- package/lib/scenario/scenario.service.d.ts +233 -233
- package/lib/scenario/scenario.types.d.ts +50 -50
- package/lib/trusted-parties/tp-assembly.d.ts +177 -177
- package/lib/trusted-parties/tp-assembly.gql.private.d.ts +5 -5
- package/lib/trusted-parties/tp-assembly.types.d.ts +38 -38
- package/lib/trusted-parties/tp-password-reset-request.service.d.ts +20 -20
- package/lib/trusted-parties/tp-password-reset-user.service.d.ts +35 -35
- package/lib/trusted-parties/tp-password-reset.constants.d.ts +3 -3
- package/lib/trusted-parties/tp-password-reset.controller.d.ts +10 -10
- package/lib/trusted-parties/tp-password-reset.gql.d.ts +223 -223
- package/lib/trusted-parties/tp-password-reset.service.d.ts +188 -188
- package/lib/trusted-parties/trusted-party.gql.d.ts +9 -9
- package/lib/trusted-parties/trusted-party.service.d.ts +44 -44
- package/lib/trusted-parties/trusted-party.types.d.ts +102 -102
- package/lib/trusted-parties/trusted-party2.gql.d.ts +79 -79
- package/lib/trusted-parties/trusted-party2.service.d.ts +114 -114
- package/lib/users/profile-details.service.d.ts +21 -21
- package/lib/users/profile.gql.d.ts +11 -11
- package/lib/users/profile.service.d.ts +35 -35
- package/lib/users/profile.types.d.ts +96 -96
- package/lib/users/user.gql.d.ts +9 -9
- package/lib/users/user.service.d.ts +12 -12
- package/lib/users/user.types.d.ts +23 -23
- package/lifeready-core.d.ts +12 -12
- package/package.json +1 -1
- package/public-api.d.ts +67 -67
|
@@ -1,117 +1,117 @@
|
|
|
1
|
-
import { __awaiter, __decorate } from "tslib";
|
|
2
|
-
import { Injectable, NgZone } from '@angular/core';
|
|
3
|
-
import { EncryptionService } from '../cryptography/encryption.service';
|
|
4
|
-
import { KeyGraphService } from '../cryptography/key-graph.service';
|
|
5
|
-
import { KeyService } from '../cryptography/key.service';
|
|
6
|
-
import { RunOutsideAngular } from '../_common/run-outside-angular';
|
|
7
|
-
import { LrGraphQLService, LrMutation } from './lr-graphql';
|
|
8
|
-
import { GetOwnedContactCardKeyIdsQuery, GetReceivedContactCardKeyIdQuery, UpdateOwnedContactCardMutation, UpdateReceivedContactCardMutation, } from './shared-contact-card2.gql';
|
|
9
|
-
import * as i0 from "@angular/core";
|
|
10
|
-
import * as i1 from "../cryptography/key.service";
|
|
11
|
-
import * as i2 from "../cryptography/key-graph.service";
|
|
12
|
-
import * as i3 from "../cryptography/encryption.service";
|
|
13
|
-
import * as i4 from "./lr-graphql/lr-graphql.service";
|
|
14
|
-
let SharedContactCard2Service = class SharedContactCard2Service {
|
|
15
|
-
constructor(ngZone, keyService, keyGraph, encryptionService, lrGraphQL) {
|
|
16
|
-
this.ngZone = ngZone;
|
|
17
|
-
this.keyService = keyService;
|
|
18
|
-
this.keyGraph = keyGraph;
|
|
19
|
-
this.encryptionService = encryptionService;
|
|
20
|
-
this.lrGraphQL = lrGraphQL;
|
|
21
|
-
}
|
|
22
|
-
getOwnedContactCardKeyIds(id) {
|
|
23
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const { ownedContactCard: cc } = yield this.lrGraphQL.query({
|
|
25
|
-
query: GetOwnedContactCardKeyIdsQuery,
|
|
26
|
-
variables: {
|
|
27
|
-
id,
|
|
28
|
-
},
|
|
29
|
-
});
|
|
30
|
-
return {
|
|
31
|
-
sharedKeyId: cc.sharedKey.id,
|
|
32
|
-
ownerKeyId: cc.ownerKey.id,
|
|
33
|
-
};
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
getReceivedContactCardKeyId(id) {
|
|
37
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
return (yield this.lrGraphQL.query({
|
|
39
|
-
query: GetReceivedContactCardKeyIdQuery,
|
|
40
|
-
variables: {
|
|
41
|
-
id,
|
|
42
|
-
},
|
|
43
|
-
})).receivedContactCard.receiverKey.id;
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
updateOwnedContactCard({ id, ownerKeyId, sharedKeyId, ownerPlainDataJson, ownerCipherDataClearJson, sharedCipherDataClearJson, }) {
|
|
47
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
let ownerKey;
|
|
49
|
-
let sharedKey;
|
|
50
|
-
try {
|
|
51
|
-
ownerKey = yield this.keyGraph.getKey(ownerKeyId);
|
|
52
|
-
sharedKey = yield this.keyGraph.getKey(sharedKeyId);
|
|
53
|
-
}
|
|
54
|
-
catch (error) {
|
|
55
|
-
const keys = yield this.getOwnedContactCardKeyIds(id);
|
|
56
|
-
// try again
|
|
57
|
-
ownerKey = yield this.keyGraph.getKey(keys.ownerKeyId);
|
|
58
|
-
sharedKey = yield this.keyGraph.getKey(keys.sharedKeyId);
|
|
59
|
-
}
|
|
60
|
-
const sigPxk = yield this.keyService.getCurrentSigPxk();
|
|
61
|
-
const sharedCipherData = yield this.encryptionService.encrypt(sharedKey.jwk, sharedCipherDataClearJson);
|
|
62
|
-
const sharedCipherDataSig = JSON.stringify(yield this.encryptionService.sign(sigPxk.jwk, sharedCipherData));
|
|
63
|
-
const ownerPlainDataSig = JSON.stringify(yield this.encryptionService.sign(sigPxk.jwk, ownerPlainDataJson));
|
|
64
|
-
const ownerCipherData = yield this.encryptionService.encryptToString(ownerKey.jwk, ownerCipherDataClearJson);
|
|
65
|
-
return new LrMutation({
|
|
66
|
-
mutation: UpdateOwnedContactCardMutation,
|
|
67
|
-
variables: {
|
|
68
|
-
input: {
|
|
69
|
-
id,
|
|
70
|
-
ownerCipherData,
|
|
71
|
-
ownerKeyId: ownerKey.id,
|
|
72
|
-
sharedCipherDataSig,
|
|
73
|
-
sharedKeyId: sharedKey.id,
|
|
74
|
-
sigPxkId: sigPxk.id,
|
|
75
|
-
ownerPlainDataSig,
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
});
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
updateReceivedContactCard({ id, receiverKeyId, receiverCipherDataClearJson, }) {
|
|
82
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
const receiverKey = yield this.keyGraph.getKey(receiverKeyId, () => this.getReceivedContactCardKeyId(id));
|
|
84
|
-
const receiverCipherData = yield this.encryptionService.encryptToString(receiverKey.jwk, receiverCipherDataClearJson);
|
|
85
|
-
return new LrMutation({
|
|
86
|
-
mutation: UpdateReceivedContactCardMutation,
|
|
87
|
-
variables: {
|
|
88
|
-
input: {
|
|
89
|
-
id,
|
|
90
|
-
receiverCipherData,
|
|
91
|
-
receiverKeyId: receiverKey.id,
|
|
92
|
-
},
|
|
93
|
-
},
|
|
94
|
-
});
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
};
|
|
98
|
-
SharedContactCard2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function SharedContactCard2Service_Factory() { return new SharedContactCard2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i1.KeyService), i0.ɵɵinject(i2.KeyGraphService), i0.ɵɵinject(i3.EncryptionService), i0.ɵɵinject(i4.LrGraphQLService)); }, token: SharedContactCard2Service, providedIn: "root" });
|
|
99
|
-
SharedContactCard2Service.decorators = [
|
|
100
|
-
{ type: Injectable, args: [{
|
|
101
|
-
providedIn: 'root',
|
|
102
|
-
},] }
|
|
103
|
-
];
|
|
104
|
-
SharedContactCard2Service.ctorParameters = () => [
|
|
105
|
-
{ type: NgZone },
|
|
106
|
-
{ type: KeyService },
|
|
107
|
-
{ type: KeyGraphService },
|
|
108
|
-
{ type: EncryptionService },
|
|
109
|
-
{ type: LrGraphQLService }
|
|
110
|
-
];
|
|
111
|
-
SharedContactCard2Service = __decorate([
|
|
112
|
-
RunOutsideAngular({
|
|
113
|
-
ngZoneName: 'ngZone',
|
|
114
|
-
})
|
|
115
|
-
], SharedContactCard2Service);
|
|
116
|
-
export { SharedContactCard2Service };
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shared-contact-card2.service.js","sourceRoot":"/opt/atlassian/pipelines/agent/build/projects/core/src/","sources":["lib/api/shared-contact-card2.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, NgZone } from '@angular/core';\nimport { Key } from '../cryptography/cryptography.types';\nimport { EncryptionService } from '../cryptography/encryption.service';\nimport { KeyGraphService } from '../cryptography/key-graph.service';\nimport { KeyService } from '../cryptography/key.service';\nimport { RunOutsideAngular } from '../_common/run-outside-angular';\nimport {\n  ContactCardReceiverCipherData,\n  SendContactCardInput,\n} from './key-exchange2.service';\nimport { LrGraphQLService, LrMutation } from './lr-graphql';\nimport {\n  GetOwnedContactCardKeyIdsQuery,\n  GetReceivedContactCardKeyIdQuery,\n  UpdateOwnedContactCardMutation,\n  UpdateReceivedContactCardMutation,\n} from './shared-contact-card2.gql';\nimport { LrRelayIdInput } from './types';\n\nexport interface UpdateOwnedContactCardInput extends SendContactCardInput {\n  id: LrRelayIdInput;\n  ownerKeyId?: LrRelayIdInput;\n  sharedKeyId?: LrRelayIdInput;\n}\n\nexport interface UpdateReceivedContactCardInput\n  extends ContactCardReceiverCipherData {\n  id: LrRelayIdInput;\n  receiverKeyId?: LrRelayIdInput;\n}\n\n@RunOutsideAngular({\n  ngZoneName: 'ngZone',\n})\n@Injectable({\n  providedIn: 'root',\n})\nexport class SharedContactCard2Service {\n  constructor(\n    private ngZone: NgZone,\n    private keyService: KeyService,\n    private keyGraph: KeyGraphService,\n    private encryptionService: EncryptionService,\n    private lrGraphQL: LrGraphQLService\n  ) {}\n\n  private async getOwnedContactCardKeyIds(id: LrRelayIdInput) {\n    const { ownedContactCard: cc } = await this.lrGraphQL.query({\n      query: GetOwnedContactCardKeyIdsQuery,\n      variables: {\n        id,\n      },\n    });\n\n    return {\n      sharedKeyId: cc.sharedKey.id,\n      ownerKeyId: cc.ownerKey.id,\n    };\n  }\n\n  private async getReceivedContactCardKeyId(id: LrRelayIdInput) {\n    return (\n      await this.lrGraphQL.query({\n        query: GetReceivedContactCardKeyIdQuery,\n        variables: {\n          id,\n        },\n      })\n    ).receivedContactCard.receiverKey.id;\n  }\n\n  async updateOwnedContactCard({\n    id,\n    ownerKeyId,\n    sharedKeyId,\n    ownerPlainDataJson,\n    ownerCipherDataClearJson,\n    sharedCipherDataClearJson,\n  }: UpdateOwnedContactCardInput) {\n    let ownerKey: Key;\n    let sharedKey: Key;\n\n    try {\n      ownerKey = await this.keyGraph.getKey(ownerKeyId);\n      sharedKey = await this.keyGraph.getKey(sharedKeyId);\n    } catch (error) {\n      const keys = await this.getOwnedContactCardKeyIds(id);\n\n      // try again\n      ownerKey = await this.keyGraph.getKey(keys.ownerKeyId);\n      sharedKey = await this.keyGraph.getKey(keys.sharedKeyId);\n    }\n\n    const sigPxk = await this.keyService.getCurrentSigPxk();\n\n    const sharedCipherData = await this.encryptionService.encrypt(\n      sharedKey.jwk,\n      sharedCipherDataClearJson\n    );\n    const sharedCipherDataSig = JSON.stringify(\n      await this.encryptionService.sign(sigPxk.jwk, sharedCipherData)\n    );\n\n    const ownerPlainDataSig = JSON.stringify(\n      await this.encryptionService.sign(sigPxk.jwk, ownerPlainDataJson)\n    );\n\n    const ownerCipherData = await this.encryptionService.encryptToString(\n      ownerKey.jwk,\n      ownerCipherDataClearJson\n    );\n\n    return new LrMutation({\n      mutation: UpdateOwnedContactCardMutation,\n      variables: {\n        input: {\n          id,\n          ownerCipherData,\n          ownerKeyId: ownerKey.id,\n          sharedCipherDataSig,\n          sharedKeyId: sharedKey.id,\n          sigPxkId: sigPxk.id,\n          ownerPlainDataSig,\n        },\n      },\n    });\n  }\n\n  async updateReceivedContactCard({\n    id,\n    receiverKeyId,\n    receiverCipherDataClearJson,\n  }: UpdateReceivedContactCardInput) {\n    const receiverKey = await this.keyGraph.getKey(receiverKeyId, () =>\n      this.getReceivedContactCardKeyId(id)\n    );\n\n    const receiverCipherData = await this.encryptionService.encryptToString(\n      receiverKey.jwk,\n      receiverCipherDataClearJson\n    );\n\n    return new LrMutation({\n      mutation: UpdateReceivedContactCardMutation,\n      variables: {\n        input: {\n          id,\n          receiverCipherData,\n          receiverKeyId: receiverKey.id,\n        },\n      },\n    });\n  }\n}\n"]}
|
|
1
|
+
import { __awaiter, __decorate } from "tslib";
|
|
2
|
+
import { Injectable, NgZone } from '@angular/core';
|
|
3
|
+
import { EncryptionService } from '../cryptography/encryption.service';
|
|
4
|
+
import { KeyGraphService } from '../cryptography/key-graph.service';
|
|
5
|
+
import { KeyService } from '../cryptography/key.service';
|
|
6
|
+
import { RunOutsideAngular } from '../_common/run-outside-angular';
|
|
7
|
+
import { LrGraphQLService, LrMutation } from './lr-graphql';
|
|
8
|
+
import { GetOwnedContactCardKeyIdsQuery, GetReceivedContactCardKeyIdQuery, UpdateOwnedContactCardMutation, UpdateReceivedContactCardMutation, } from './shared-contact-card2.gql';
|
|
9
|
+
import * as i0 from "@angular/core";
|
|
10
|
+
import * as i1 from "../cryptography/key.service";
|
|
11
|
+
import * as i2 from "../cryptography/key-graph.service";
|
|
12
|
+
import * as i3 from "../cryptography/encryption.service";
|
|
13
|
+
import * as i4 from "./lr-graphql/lr-graphql.service";
|
|
14
|
+
let SharedContactCard2Service = class SharedContactCard2Service {
|
|
15
|
+
constructor(ngZone, keyService, keyGraph, encryptionService, lrGraphQL) {
|
|
16
|
+
this.ngZone = ngZone;
|
|
17
|
+
this.keyService = keyService;
|
|
18
|
+
this.keyGraph = keyGraph;
|
|
19
|
+
this.encryptionService = encryptionService;
|
|
20
|
+
this.lrGraphQL = lrGraphQL;
|
|
21
|
+
}
|
|
22
|
+
getOwnedContactCardKeyIds(id) {
|
|
23
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
const { ownedContactCard: cc } = yield this.lrGraphQL.query({
|
|
25
|
+
query: GetOwnedContactCardKeyIdsQuery,
|
|
26
|
+
variables: {
|
|
27
|
+
id,
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
return {
|
|
31
|
+
sharedKeyId: cc.sharedKey.id,
|
|
32
|
+
ownerKeyId: cc.ownerKey.id,
|
|
33
|
+
};
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
getReceivedContactCardKeyId(id) {
|
|
37
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
return (yield this.lrGraphQL.query({
|
|
39
|
+
query: GetReceivedContactCardKeyIdQuery,
|
|
40
|
+
variables: {
|
|
41
|
+
id,
|
|
42
|
+
},
|
|
43
|
+
})).receivedContactCard.receiverKey.id;
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
updateOwnedContactCard({ id, ownerKeyId, sharedKeyId, ownerPlainDataJson, ownerCipherDataClearJson, sharedCipherDataClearJson, }) {
|
|
47
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
+
let ownerKey;
|
|
49
|
+
let sharedKey;
|
|
50
|
+
try {
|
|
51
|
+
ownerKey = yield this.keyGraph.getKey(ownerKeyId);
|
|
52
|
+
sharedKey = yield this.keyGraph.getKey(sharedKeyId);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
const keys = yield this.getOwnedContactCardKeyIds(id);
|
|
56
|
+
// try again
|
|
57
|
+
ownerKey = yield this.keyGraph.getKey(keys.ownerKeyId);
|
|
58
|
+
sharedKey = yield this.keyGraph.getKey(keys.sharedKeyId);
|
|
59
|
+
}
|
|
60
|
+
const sigPxk = yield this.keyService.getCurrentSigPxk();
|
|
61
|
+
const sharedCipherData = yield this.encryptionService.encrypt(sharedKey.jwk, sharedCipherDataClearJson);
|
|
62
|
+
const sharedCipherDataSig = JSON.stringify(yield this.encryptionService.sign(sigPxk.jwk, sharedCipherData));
|
|
63
|
+
const ownerPlainDataSig = JSON.stringify(yield this.encryptionService.sign(sigPxk.jwk, ownerPlainDataJson));
|
|
64
|
+
const ownerCipherData = yield this.encryptionService.encryptToString(ownerKey.jwk, ownerCipherDataClearJson);
|
|
65
|
+
return new LrMutation({
|
|
66
|
+
mutation: UpdateOwnedContactCardMutation,
|
|
67
|
+
variables: {
|
|
68
|
+
input: {
|
|
69
|
+
id,
|
|
70
|
+
ownerCipherData,
|
|
71
|
+
ownerKeyId: ownerKey.id,
|
|
72
|
+
sharedCipherDataSig,
|
|
73
|
+
sharedKeyId: sharedKey.id,
|
|
74
|
+
sigPxkId: sigPxk.id,
|
|
75
|
+
ownerPlainDataSig,
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
updateReceivedContactCard({ id, receiverKeyId, receiverCipherDataClearJson, }) {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
const receiverKey = yield this.keyGraph.getKey(receiverKeyId, () => this.getReceivedContactCardKeyId(id));
|
|
84
|
+
const receiverCipherData = yield this.encryptionService.encryptToString(receiverKey.jwk, receiverCipherDataClearJson);
|
|
85
|
+
return new LrMutation({
|
|
86
|
+
mutation: UpdateReceivedContactCardMutation,
|
|
87
|
+
variables: {
|
|
88
|
+
input: {
|
|
89
|
+
id,
|
|
90
|
+
receiverCipherData,
|
|
91
|
+
receiverKeyId: receiverKey.id,
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
SharedContactCard2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function SharedContactCard2Service_Factory() { return new SharedContactCard2Service(i0.ɵɵinject(i0.NgZone), i0.ɵɵinject(i1.KeyService), i0.ɵɵinject(i2.KeyGraphService), i0.ɵɵinject(i3.EncryptionService), i0.ɵɵinject(i4.LrGraphQLService)); }, token: SharedContactCard2Service, providedIn: "root" });
|
|
99
|
+
SharedContactCard2Service.decorators = [
|
|
100
|
+
{ type: Injectable, args: [{
|
|
101
|
+
providedIn: 'root',
|
|
102
|
+
},] }
|
|
103
|
+
];
|
|
104
|
+
SharedContactCard2Service.ctorParameters = () => [
|
|
105
|
+
{ type: NgZone },
|
|
106
|
+
{ type: KeyService },
|
|
107
|
+
{ type: KeyGraphService },
|
|
108
|
+
{ type: EncryptionService },
|
|
109
|
+
{ type: LrGraphQLService }
|
|
110
|
+
];
|
|
111
|
+
SharedContactCard2Service = __decorate([
|
|
112
|
+
RunOutsideAngular({
|
|
113
|
+
ngZoneName: 'ngZone',
|
|
114
|
+
})
|
|
115
|
+
], SharedContactCard2Service);
|
|
116
|
+
export { SharedContactCard2Service };
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shared-contact-card2.service.js","sourceRoot":"C:/Projects/kc-client/projects/core/src/","sources":["lib/api/shared-contact-card2.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, NgZone } from '@angular/core';\r\nimport { Key } from '../cryptography/cryptography.types';\r\nimport { EncryptionService } from '../cryptography/encryption.service';\r\nimport { KeyGraphService } from '../cryptography/key-graph.service';\r\nimport { KeyService } from '../cryptography/key.service';\r\nimport { RunOutsideAngular } from '../_common/run-outside-angular';\r\nimport {\r\n  ContactCardReceiverCipherData,\r\n  SendContactCardInput,\r\n} from './key-exchange2.service';\r\nimport { LrGraphQLService, LrMutation } from './lr-graphql';\r\nimport {\r\n  GetOwnedContactCardKeyIdsQuery,\r\n  GetReceivedContactCardKeyIdQuery,\r\n  UpdateOwnedContactCardMutation,\r\n  UpdateReceivedContactCardMutation,\r\n} from './shared-contact-card2.gql';\r\nimport { LrRelayIdInput } from './types';\r\n\r\nexport interface UpdateOwnedContactCardInput extends SendContactCardInput {\r\n  id: LrRelayIdInput;\r\n  ownerKeyId?: LrRelayIdInput;\r\n  sharedKeyId?: LrRelayIdInput;\r\n}\r\n\r\nexport interface UpdateReceivedContactCardInput\r\n  extends ContactCardReceiverCipherData {\r\n  id: LrRelayIdInput;\r\n  receiverKeyId?: LrRelayIdInput;\r\n}\r\n\r\n@RunOutsideAngular({\r\n  ngZoneName: 'ngZone',\r\n})\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class SharedContactCard2Service {\r\n  constructor(\r\n    private ngZone: NgZone,\r\n    private keyService: KeyService,\r\n    private keyGraph: KeyGraphService,\r\n    private encryptionService: EncryptionService,\r\n    private lrGraphQL: LrGraphQLService\r\n  ) {}\r\n\r\n  private async getOwnedContactCardKeyIds(id: LrRelayIdInput) {\r\n    const { ownedContactCard: cc } = await this.lrGraphQL.query({\r\n      query: GetOwnedContactCardKeyIdsQuery,\r\n      variables: {\r\n        id,\r\n      },\r\n    });\r\n\r\n    return {\r\n      sharedKeyId: cc.sharedKey.id,\r\n      ownerKeyId: cc.ownerKey.id,\r\n    };\r\n  }\r\n\r\n  private async getReceivedContactCardKeyId(id: LrRelayIdInput) {\r\n    return (\r\n      await this.lrGraphQL.query({\r\n        query: GetReceivedContactCardKeyIdQuery,\r\n        variables: {\r\n          id,\r\n        },\r\n      })\r\n    ).receivedContactCard.receiverKey.id;\r\n  }\r\n\r\n  async updateOwnedContactCard({\r\n    id,\r\n    ownerKeyId,\r\n    sharedKeyId,\r\n    ownerPlainDataJson,\r\n    ownerCipherDataClearJson,\r\n    sharedCipherDataClearJson,\r\n  }: UpdateOwnedContactCardInput) {\r\n    let ownerKey: Key;\r\n    let sharedKey: Key;\r\n\r\n    try {\r\n      ownerKey = await this.keyGraph.getKey(ownerKeyId);\r\n      sharedKey = await this.keyGraph.getKey(sharedKeyId);\r\n    } catch (error) {\r\n      const keys = await this.getOwnedContactCardKeyIds(id);\r\n\r\n      // try again\r\n      ownerKey = await this.keyGraph.getKey(keys.ownerKeyId);\r\n      sharedKey = await this.keyGraph.getKey(keys.sharedKeyId);\r\n    }\r\n\r\n    const sigPxk = await this.keyService.getCurrentSigPxk();\r\n\r\n    const sharedCipherData = await this.encryptionService.encrypt(\r\n      sharedKey.jwk,\r\n      sharedCipherDataClearJson\r\n    );\r\n    const sharedCipherDataSig = JSON.stringify(\r\n      await this.encryptionService.sign(sigPxk.jwk, sharedCipherData)\r\n    );\r\n\r\n    const ownerPlainDataSig = JSON.stringify(\r\n      await this.encryptionService.sign(sigPxk.jwk, ownerPlainDataJson)\r\n    );\r\n\r\n    const ownerCipherData = await this.encryptionService.encryptToString(\r\n      ownerKey.jwk,\r\n      ownerCipherDataClearJson\r\n    );\r\n\r\n    return new LrMutation({\r\n      mutation: UpdateOwnedContactCardMutation,\r\n      variables: {\r\n        input: {\r\n          id,\r\n          ownerCipherData,\r\n          ownerKeyId: ownerKey.id,\r\n          sharedCipherDataSig,\r\n          sharedKeyId: sharedKey.id,\r\n          sigPxkId: sigPxk.id,\r\n          ownerPlainDataSig,\r\n        },\r\n      },\r\n    });\r\n  }\r\n\r\n  async updateReceivedContactCard({\r\n    id,\r\n    receiverKeyId,\r\n    receiverCipherDataClearJson,\r\n  }: UpdateReceivedContactCardInput) {\r\n    const receiverKey = await this.keyGraph.getKey(receiverKeyId, () =>\r\n      this.getReceivedContactCardKeyId(id)\r\n    );\r\n\r\n    const receiverCipherData = await this.encryptionService.encryptToString(\r\n      receiverKey.jwk,\r\n      receiverCipherDataClearJson\r\n    );\r\n\r\n    return new LrMutation({\r\n      mutation: UpdateReceivedContactCardMutation,\r\n      variables: {\r\n        input: {\r\n          id,\r\n          receiverCipherData,\r\n          receiverKeyId: receiverKey.id,\r\n        },\r\n      },\r\n    });\r\n  }\r\n}\r\n"]}
|
|
@@ -1,146 +1,146 @@
|
|
|
1
|
-
import { __awaiter } from "tslib";
|
|
2
|
-
import { Injectable } from '@angular/core';
|
|
3
|
-
import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
|
|
4
|
-
import { Apollo } from 'apollo-angular';
|
|
5
|
-
import gql from 'graphql-tag';
|
|
6
|
-
import * as moment_ from 'moment';
|
|
7
|
-
import { LrErrorCode, LrException, handleApolloError, } from '../_common/exceptions';
|
|
8
|
-
import * as i0 from "@angular/core";
|
|
9
|
-
import * as i1 from "@aws-amplify/auth/lib-esm/Auth";
|
|
10
|
-
import * as i2 from "apollo-angular";
|
|
11
|
-
// "why?" you ask: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment
|
|
12
|
-
const moment = moment_;
|
|
13
|
-
export const ServerTimeQuery = gql `
|
|
14
|
-
query {
|
|
15
|
-
serverTime {
|
|
16
|
-
timestamp
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
`;
|
|
20
|
-
export class TimeService {
|
|
21
|
-
constructor(auth, apollo) {
|
|
22
|
-
this.auth = auth;
|
|
23
|
-
this.apollo = apollo;
|
|
24
|
-
this.VERIFY_ENABLED = true;
|
|
25
|
-
this.MAX_DIFF_MSEC = moment
|
|
26
|
-
.duration({ seconds: 30 })
|
|
27
|
-
.asMilliseconds();
|
|
28
|
-
this.offsetMs = null; // Millisecond offset of local clock.
|
|
29
|
-
this.verified = false; // Verified with independent time source
|
|
30
|
-
}
|
|
31
|
-
getAccessToken() {
|
|
32
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
-
try {
|
|
34
|
-
return (yield this.auth.currentAuthenticatedUser())
|
|
35
|
-
.getSignInUserSession()
|
|
36
|
-
.getAccessToken()
|
|
37
|
-
.getJwtToken();
|
|
38
|
-
}
|
|
39
|
-
catch (error) {
|
|
40
|
-
return ''; // Not authenticated
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
// Get time from independent source to confirm.
|
|
45
|
-
verifyCognito() {
|
|
46
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
-
const accessToken = yield this.getAccessToken();
|
|
48
|
-
if (!accessToken) {
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
// Request headers from AWS Amplify Auth lib
|
|
52
|
-
// accept: */*
|
|
53
|
-
// accept-encoding: gzip, deflate, br
|
|
54
|
-
// accept-language: en-GB,en-US;q=0.9,en;q=0.8
|
|
55
|
-
// cache-control: no-cache
|
|
56
|
-
// content-length: 1089
|
|
57
|
-
// content-type: application/x-amz-json-1.1
|
|
58
|
-
// origin: http://localhost:4200
|
|
59
|
-
// pragma: no-cache
|
|
60
|
-
// referer: http://localhost:4200/
|
|
61
|
-
// sec-fetch-dest: empty
|
|
62
|
-
// sec-fetch-mode: cors
|
|
63
|
-
// sec-fetch-site: cross-site
|
|
64
|
-
// user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36
|
|
65
|
-
// x-amz-target: AWSCognitoIdentityProviderService.GetUser
|
|
66
|
-
// x-amz-user-agent: aws-amplify/0.1.x js
|
|
67
|
-
// We are only interested in the Date field.
|
|
68
|
-
// AZ: I suppose we could use any end-point that provides a reliable Date field in the header. And we don't
|
|
69
|
-
// need to be authenticated. Even a 400 response would have a Date header. But the worry is that AWS might
|
|
70
|
-
// think it's some sort of attack, and block the IP or domain. At least in an authenticated call it can't be
|
|
71
|
-
// seen as illegitimate.
|
|
72
|
-
const response = yield fetch('https://cognito-idp.ap-southeast-2.amazonaws.com/', {
|
|
73
|
-
method: 'POST',
|
|
74
|
-
mode: 'cors',
|
|
75
|
-
cache: 'no-cache',
|
|
76
|
-
headers: {
|
|
77
|
-
'x-amz-target': 'AWSCognitoIdentityProviderService.GetUser',
|
|
78
|
-
'x-amz-user-agent': 'aws-amplify/0.1.x js',
|
|
79
|
-
'Content-Type': 'application/x-amz-json-1.1',
|
|
80
|
-
},
|
|
81
|
-
// redirect: 'follow', // manual, *follow, error
|
|
82
|
-
// referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
|
|
83
|
-
body: JSON.stringify({
|
|
84
|
-
AccessToken: accessToken,
|
|
85
|
-
}),
|
|
86
|
-
});
|
|
87
|
-
const now = Date.now();
|
|
88
|
-
const verifyTime = moment(response.headers.get('Date')).valueOf();
|
|
89
|
-
const serverTime = now + this.offsetMs;
|
|
90
|
-
const diff = Math.abs(serverTime - verifyTime);
|
|
91
|
-
if (diff > this.MAX_DIFF_MSEC) {
|
|
92
|
-
throw new LrException({
|
|
93
|
-
code: LrErrorCode.BadTimeSync,
|
|
94
|
-
message: `Server time does not match independent source. ServerTime: ${serverTime}, Cognito time: ${verifyTime}`,
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
this.verified = true;
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
refresh() {
|
|
101
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
-
const start = Date.now();
|
|
103
|
-
const res = yield this.apollo
|
|
104
|
-
.query({ query: ServerTimeQuery })
|
|
105
|
-
.toPromise();
|
|
106
|
-
const end = Date.now();
|
|
107
|
-
handleApolloError(res.errors);
|
|
108
|
-
const serverTime = parseInt(res.data.serverTime.timestamp, 10);
|
|
109
|
-
const roundtrip = end - start;
|
|
110
|
-
this.offsetMs = serverTime - (start + roundtrip / 2);
|
|
111
|
-
if (this.VERIFY_ENABLED) {
|
|
112
|
-
yield this.verifyCognito();
|
|
113
|
-
}
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
serverNow() {
|
|
117
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
118
|
-
let needsRefresh = false;
|
|
119
|
-
// First call
|
|
120
|
-
if (this.offsetMs === null) {
|
|
121
|
-
needsRefresh = true;
|
|
122
|
-
}
|
|
123
|
-
if (this.VERIFY_ENABLED) {
|
|
124
|
-
// logged in but not yet verified time matches.
|
|
125
|
-
if (!this.verified && (yield this.getAccessToken())) {
|
|
126
|
-
needsRefresh = true;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
if (needsRefresh) {
|
|
130
|
-
yield this.refresh();
|
|
131
|
-
}
|
|
132
|
-
return Date.now() + this.offsetMs;
|
|
133
|
-
});
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
TimeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TimeService_Factory() { return new TimeService(i0.ɵɵinject(i1.AuthClass), i0.ɵɵinject(i2.Apollo)); }, token: TimeService, providedIn: "root" });
|
|
137
|
-
TimeService.decorators = [
|
|
138
|
-
{ type: Injectable, args: [{
|
|
139
|
-
providedIn: 'root',
|
|
140
|
-
},] }
|
|
141
|
-
];
|
|
142
|
-
TimeService.ctorParameters = () => [
|
|
143
|
-
{ type: AuthClass },
|
|
144
|
-
{ type: Apollo }
|
|
145
|
-
];
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"time.service.js","sourceRoot":"/opt/atlassian/pipelines/agent/build/projects/core/src/","sources":["lib/api/time.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';\nimport { Apollo } from 'apollo-angular';\nimport gql from 'graphql-tag';\nimport * as moment_ from 'moment';\nimport {\n  LrErrorCode,\n  LrException,\n  handleApolloError,\n} from '../_common/exceptions';\n// \"why?\" you ask: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment\nconst moment = moment_;\n\nexport const ServerTimeQuery = gql`\n  query {\n    serverTime {\n      timestamp\n    }\n  }\n`;\n\ninterface ServerTime {\n  timestamp: string;\n}\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class TimeService {\n  public VERIFY_ENABLED = true;\n  private readonly MAX_DIFF_MSEC = moment\n    .duration({ seconds: 30 })\n    .asMilliseconds();\n\n  offsetMs: number = null; // Millisecond offset of local clock.\n  verified = false; // Verified with independent time source\n\n  constructor(private auth: AuthClass, private apollo: Apollo) {}\n\n  private async getAccessToken(): Promise<string> {\n    try {\n      return (await this.auth.currentAuthenticatedUser())\n        .getSignInUserSession()\n        .getAccessToken()\n        .getJwtToken();\n    } catch (error) {\n      return ''; // Not authenticated\n    }\n  }\n\n  // Get time from independent source to confirm.\n  private async verifyCognito(): Promise<void> {\n    const accessToken = await this.getAccessToken();\n    if (!accessToken) {\n      return;\n    }\n\n    // Request headers from AWS Amplify Auth lib\n    // accept: */*\n    // accept-encoding: gzip, deflate, br\n    // accept-language: en-GB,en-US;q=0.9,en;q=0.8\n    // cache-control: no-cache\n    // content-length: 1089\n    // content-type: application/x-amz-json-1.1\n    // origin: http://localhost:4200\n    // pragma: no-cache\n    // referer: http://localhost:4200/\n    // sec-fetch-dest: empty\n    // sec-fetch-mode: cors\n    // sec-fetch-site: cross-site\n    // user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36\n    // x-amz-target: AWSCognitoIdentityProviderService.GetUser\n    // x-amz-user-agent: aws-amplify/0.1.x js\n\n    // We are only interested in the Date field.\n    // AZ: I suppose we could use any end-point that provides a reliable Date field in the header. And we don't\n    // need to be authenticated. Even a 400 response would have a Date header. But the worry is that AWS might\n    // think it's some sort of attack, and block the IP or domain. At least in an authenticated call it can't be\n    // seen as illegitimate.\n    const response = await fetch(\n      'https://cognito-idp.ap-southeast-2.amazonaws.com/',\n      {\n        method: 'POST', // *GET, POST, PUT, DELETE, etc.\n        mode: 'cors', // no-cors, *cors, same-origin\n        cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached\n        headers: {\n          'x-amz-target': 'AWSCognitoIdentityProviderService.GetUser',\n          'x-amz-user-agent': 'aws-amplify/0.1.x js',\n          'Content-Type': 'application/x-amz-json-1.1',\n        },\n        // redirect: 'follow', // manual, *follow, error\n        // referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url\n        body: JSON.stringify({\n          AccessToken: accessToken,\n        }), // body data type must match \"Content-Type\" header\n      }\n    );\n\n    const now = Date.now();\n\n    const verifyTime = moment(response.headers.get('Date')).valueOf();\n    const serverTime = now + this.offsetMs;\n    const diff = Math.abs(serverTime - verifyTime);\n\n    if (diff > this.MAX_DIFF_MSEC) {\n      throw new LrException({\n        code: LrErrorCode.BadTimeSync,\n        message: `Server time does not match independent source. ServerTime: ${serverTime}, Cognito time: ${verifyTime}`,\n      });\n    }\n\n    this.verified = true;\n  }\n\n  private async refresh(): Promise<void> {\n    const start = Date.now();\n    const res = await this.apollo\n      .query<{ serverTime: ServerTime }>({ query: ServerTimeQuery })\n      .toPromise();\n    const end = Date.now();\n\n    handleApolloError(res.errors);\n\n    const serverTime = parseInt(res.data.serverTime.timestamp, 10);\n\n    const roundtrip = end - start;\n    this.offsetMs = serverTime - (start + roundtrip / 2);\n\n    if (this.VERIFY_ENABLED) {\n      await this.verifyCognito();\n    }\n  }\n\n  async serverNow(): Promise<number> {\n    let needsRefresh = false;\n\n    // First call\n    if (this.offsetMs === null) {\n      needsRefresh = true;\n    }\n\n    if (this.VERIFY_ENABLED) {\n      // logged in but not yet verified time matches.\n      if (!this.verified && (await this.getAccessToken())) {\n        needsRefresh = true;\n      }\n    }\n\n    if (needsRefresh) {\n      await this.refresh();\n    }\n\n    return Date.now() + this.offsetMs;\n  }\n}\n"]}
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
2
|
+
import { Injectable } from '@angular/core';
|
|
3
|
+
import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
|
|
4
|
+
import { Apollo } from 'apollo-angular';
|
|
5
|
+
import gql from 'graphql-tag';
|
|
6
|
+
import * as moment_ from 'moment';
|
|
7
|
+
import { LrErrorCode, LrException, handleApolloError, } from '../_common/exceptions';
|
|
8
|
+
import * as i0 from "@angular/core";
|
|
9
|
+
import * as i1 from "@aws-amplify/auth/lib-esm/Auth";
|
|
10
|
+
import * as i2 from "apollo-angular";
|
|
11
|
+
// "why?" you ask: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment
|
|
12
|
+
const moment = moment_;
|
|
13
|
+
export const ServerTimeQuery = gql `
|
|
14
|
+
query {
|
|
15
|
+
serverTime {
|
|
16
|
+
timestamp
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
`;
|
|
20
|
+
export class TimeService {
|
|
21
|
+
constructor(auth, apollo) {
|
|
22
|
+
this.auth = auth;
|
|
23
|
+
this.apollo = apollo;
|
|
24
|
+
this.VERIFY_ENABLED = true;
|
|
25
|
+
this.MAX_DIFF_MSEC = moment
|
|
26
|
+
.duration({ seconds: 30 })
|
|
27
|
+
.asMilliseconds();
|
|
28
|
+
this.offsetMs = null; // Millisecond offset of local clock.
|
|
29
|
+
this.verified = false; // Verified with independent time source
|
|
30
|
+
}
|
|
31
|
+
getAccessToken() {
|
|
32
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
try {
|
|
34
|
+
return (yield this.auth.currentAuthenticatedUser())
|
|
35
|
+
.getSignInUserSession()
|
|
36
|
+
.getAccessToken()
|
|
37
|
+
.getJwtToken();
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
return ''; // Not authenticated
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
// Get time from independent source to confirm.
|
|
45
|
+
verifyCognito() {
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
const accessToken = yield this.getAccessToken();
|
|
48
|
+
if (!accessToken) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
// Request headers from AWS Amplify Auth lib
|
|
52
|
+
// accept: */*
|
|
53
|
+
// accept-encoding: gzip, deflate, br
|
|
54
|
+
// accept-language: en-GB,en-US;q=0.9,en;q=0.8
|
|
55
|
+
// cache-control: no-cache
|
|
56
|
+
// content-length: 1089
|
|
57
|
+
// content-type: application/x-amz-json-1.1
|
|
58
|
+
// origin: http://localhost:4200
|
|
59
|
+
// pragma: no-cache
|
|
60
|
+
// referer: http://localhost:4200/
|
|
61
|
+
// sec-fetch-dest: empty
|
|
62
|
+
// sec-fetch-mode: cors
|
|
63
|
+
// sec-fetch-site: cross-site
|
|
64
|
+
// user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36
|
|
65
|
+
// x-amz-target: AWSCognitoIdentityProviderService.GetUser
|
|
66
|
+
// x-amz-user-agent: aws-amplify/0.1.x js
|
|
67
|
+
// We are only interested in the Date field.
|
|
68
|
+
// AZ: I suppose we could use any end-point that provides a reliable Date field in the header. And we don't
|
|
69
|
+
// need to be authenticated. Even a 400 response would have a Date header. But the worry is that AWS might
|
|
70
|
+
// think it's some sort of attack, and block the IP or domain. At least in an authenticated call it can't be
|
|
71
|
+
// seen as illegitimate.
|
|
72
|
+
const response = yield fetch('https://cognito-idp.ap-southeast-2.amazonaws.com/', {
|
|
73
|
+
method: 'POST',
|
|
74
|
+
mode: 'cors',
|
|
75
|
+
cache: 'no-cache',
|
|
76
|
+
headers: {
|
|
77
|
+
'x-amz-target': 'AWSCognitoIdentityProviderService.GetUser',
|
|
78
|
+
'x-amz-user-agent': 'aws-amplify/0.1.x js',
|
|
79
|
+
'Content-Type': 'application/x-amz-json-1.1',
|
|
80
|
+
},
|
|
81
|
+
// redirect: 'follow', // manual, *follow, error
|
|
82
|
+
// referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
|
|
83
|
+
body: JSON.stringify({
|
|
84
|
+
AccessToken: accessToken,
|
|
85
|
+
}),
|
|
86
|
+
});
|
|
87
|
+
const now = Date.now();
|
|
88
|
+
const verifyTime = moment(response.headers.get('Date')).valueOf();
|
|
89
|
+
const serverTime = now + this.offsetMs;
|
|
90
|
+
const diff = Math.abs(serverTime - verifyTime);
|
|
91
|
+
if (diff > this.MAX_DIFF_MSEC) {
|
|
92
|
+
throw new LrException({
|
|
93
|
+
code: LrErrorCode.BadTimeSync,
|
|
94
|
+
message: `Server time does not match independent source. ServerTime: ${serverTime}, Cognito time: ${verifyTime}`,
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
this.verified = true;
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
refresh() {
|
|
101
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
+
const start = Date.now();
|
|
103
|
+
const res = yield this.apollo
|
|
104
|
+
.query({ query: ServerTimeQuery })
|
|
105
|
+
.toPromise();
|
|
106
|
+
const end = Date.now();
|
|
107
|
+
handleApolloError(res.errors);
|
|
108
|
+
const serverTime = parseInt(res.data.serverTime.timestamp, 10);
|
|
109
|
+
const roundtrip = end - start;
|
|
110
|
+
this.offsetMs = serverTime - (start + roundtrip / 2);
|
|
111
|
+
if (this.VERIFY_ENABLED) {
|
|
112
|
+
yield this.verifyCognito();
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
serverNow() {
|
|
117
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
118
|
+
let needsRefresh = false;
|
|
119
|
+
// First call
|
|
120
|
+
if (this.offsetMs === null) {
|
|
121
|
+
needsRefresh = true;
|
|
122
|
+
}
|
|
123
|
+
if (this.VERIFY_ENABLED) {
|
|
124
|
+
// logged in but not yet verified time matches.
|
|
125
|
+
if (!this.verified && (yield this.getAccessToken())) {
|
|
126
|
+
needsRefresh = true;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
if (needsRefresh) {
|
|
130
|
+
yield this.refresh();
|
|
131
|
+
}
|
|
132
|
+
return Date.now() + this.offsetMs;
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
TimeService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TimeService_Factory() { return new TimeService(i0.ɵɵinject(i1.AuthClass), i0.ɵɵinject(i2.Apollo)); }, token: TimeService, providedIn: "root" });
|
|
137
|
+
TimeService.decorators = [
|
|
138
|
+
{ type: Injectable, args: [{
|
|
139
|
+
providedIn: 'root',
|
|
140
|
+
},] }
|
|
141
|
+
];
|
|
142
|
+
TimeService.ctorParameters = () => [
|
|
143
|
+
{ type: AuthClass },
|
|
144
|
+
{ type: Apollo }
|
|
145
|
+
];
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"time.service.js","sourceRoot":"C:/Projects/kc-client/projects/core/src/","sources":["lib/api/time.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\r\nimport { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';\r\nimport { Apollo } from 'apollo-angular';\r\nimport gql from 'graphql-tag';\r\nimport * as moment_ from 'moment';\r\nimport {\r\n  LrErrorCode,\r\n  LrException,\r\n  handleApolloError,\r\n} from '../_common/exceptions';\r\n// \"why?\" you ask: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment\r\nconst moment = moment_;\r\n\r\nexport const ServerTimeQuery = gql`\r\n  query {\r\n    serverTime {\r\n      timestamp\r\n    }\r\n  }\r\n`;\r\n\r\ninterface ServerTime {\r\n  timestamp: string;\r\n}\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class TimeService {\r\n  public VERIFY_ENABLED = true;\r\n  private readonly MAX_DIFF_MSEC = moment\r\n    .duration({ seconds: 30 })\r\n    .asMilliseconds();\r\n\r\n  offsetMs: number = null; // Millisecond offset of local clock.\r\n  verified = false; // Verified with independent time source\r\n\r\n  constructor(private auth: AuthClass, private apollo: Apollo) {}\r\n\r\n  private async getAccessToken(): Promise<string> {\r\n    try {\r\n      return (await this.auth.currentAuthenticatedUser())\r\n        .getSignInUserSession()\r\n        .getAccessToken()\r\n        .getJwtToken();\r\n    } catch (error) {\r\n      return ''; // Not authenticated\r\n    }\r\n  }\r\n\r\n  // Get time from independent source to confirm.\r\n  private async verifyCognito(): Promise<void> {\r\n    const accessToken = await this.getAccessToken();\r\n    if (!accessToken) {\r\n      return;\r\n    }\r\n\r\n    // Request headers from AWS Amplify Auth lib\r\n    // accept: */*\r\n    // accept-encoding: gzip, deflate, br\r\n    // accept-language: en-GB,en-US;q=0.9,en;q=0.8\r\n    // cache-control: no-cache\r\n    // content-length: 1089\r\n    // content-type: application/x-amz-json-1.1\r\n    // origin: http://localhost:4200\r\n    // pragma: no-cache\r\n    // referer: http://localhost:4200/\r\n    // sec-fetch-dest: empty\r\n    // sec-fetch-mode: cors\r\n    // sec-fetch-site: cross-site\r\n    // user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36\r\n    // x-amz-target: AWSCognitoIdentityProviderService.GetUser\r\n    // x-amz-user-agent: aws-amplify/0.1.x js\r\n\r\n    // We are only interested in the Date field.\r\n    // AZ: I suppose we could use any end-point that provides a reliable Date field in the header. And we don't\r\n    // need to be authenticated. Even a 400 response would have a Date header. But the worry is that AWS might\r\n    // think it's some sort of attack, and block the IP or domain. At least in an authenticated call it can't be\r\n    // seen as illegitimate.\r\n    const response = await fetch(\r\n      'https://cognito-idp.ap-southeast-2.amazonaws.com/',\r\n      {\r\n        method: 'POST', // *GET, POST, PUT, DELETE, etc.\r\n        mode: 'cors', // no-cors, *cors, same-origin\r\n        cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached\r\n        headers: {\r\n          'x-amz-target': 'AWSCognitoIdentityProviderService.GetUser',\r\n          'x-amz-user-agent': 'aws-amplify/0.1.x js',\r\n          'Content-Type': 'application/x-amz-json-1.1',\r\n        },\r\n        // redirect: 'follow', // manual, *follow, error\r\n        // referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url\r\n        body: JSON.stringify({\r\n          AccessToken: accessToken,\r\n        }), // body data type must match \"Content-Type\" header\r\n      }\r\n    );\r\n\r\n    const now = Date.now();\r\n\r\n    const verifyTime = moment(response.headers.get('Date')).valueOf();\r\n    const serverTime = now + this.offsetMs;\r\n    const diff = Math.abs(serverTime - verifyTime);\r\n\r\n    if (diff > this.MAX_DIFF_MSEC) {\r\n      throw new LrException({\r\n        code: LrErrorCode.BadTimeSync,\r\n        message: `Server time does not match independent source. ServerTime: ${serverTime}, Cognito time: ${verifyTime}`,\r\n      });\r\n    }\r\n\r\n    this.verified = true;\r\n  }\r\n\r\n  private async refresh(): Promise<void> {\r\n    const start = Date.now();\r\n    const res = await this.apollo\r\n      .query<{ serverTime: ServerTime }>({ query: ServerTimeQuery })\r\n      .toPromise();\r\n    const end = Date.now();\r\n\r\n    handleApolloError(res.errors);\r\n\r\n    const serverTime = parseInt(res.data.serverTime.timestamp, 10);\r\n\r\n    const roundtrip = end - start;\r\n    this.offsetMs = serverTime - (start + roundtrip / 2);\r\n\r\n    if (this.VERIFY_ENABLED) {\r\n      await this.verifyCognito();\r\n    }\r\n  }\r\n\r\n  async serverNow(): Promise<number> {\r\n    let needsRefresh = false;\r\n\r\n    // First call\r\n    if (this.offsetMs === null) {\r\n      needsRefresh = true;\r\n    }\r\n\r\n    if (this.VERIFY_ENABLED) {\r\n      // logged in but not yet verified time matches.\r\n      if (!this.verified && (await this.getAccessToken())) {\r\n        needsRefresh = true;\r\n      }\r\n    }\r\n\r\n    if (needsRefresh) {\r\n      await this.refresh();\r\n    }\r\n\r\n    return Date.now() + this.offsetMs;\r\n  }\r\n}\r\n"]}
|