@nmshd/transport 1.2.1 → 2.0.0-alpha.1
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/dist/buildInformation.js +4 -4
- package/dist/core/CoreSerializable.d.ts +1 -3
- package/dist/core/CoreSerializable.js +4 -11
- package/dist/core/CoreSerializable.js.map +1 -1
- package/dist/core/CoreSerializableAsync.d.ts +1 -3
- package/dist/core/CoreSerializableAsync.js +5 -11
- package/dist/core/CoreSerializableAsync.js.map +1 -1
- package/dist/core/CoreSynchronizable.d.ts +3 -3
- package/dist/core/CoreSynchronizable.js +2 -2
- package/dist/core/CoreSynchronizable.js.map +1 -1
- package/dist/core/TransportController.d.ts +1 -3
- package/dist/core/TransportController.js +2 -20
- package/dist/core/TransportController.js.map +1 -1
- package/dist/core/TransportErrors.d.ts +1 -0
- package/dist/core/TransportErrors.js +3 -0
- package/dist/core/TransportErrors.js.map +1 -1
- package/dist/core/backbone/RESTClientAuthenticate.js.map +1 -1
- package/dist/core/backbone/RequestError.js.map +1 -1
- package/dist/core/types/CoreAddress.d.ts +1 -1
- package/dist/core/types/CoreAddress.js +7 -13
- package/dist/core/types/CoreAddress.js.map +1 -1
- package/dist/core/types/CoreDate.d.ts +4 -3
- package/dist/core/types/CoreDate.js +17 -14
- package/dist/core/types/CoreDate.js.map +1 -1
- package/dist/core/types/CoreHash.d.ts +1 -1
- package/dist/core/types/CoreHash.js +7 -7
- package/dist/core/types/CoreHash.js.map +1 -1
- package/dist/core/types/CoreId.d.ts +1 -1
- package/dist/core/types/CoreId.js +9 -9
- package/dist/core/types/CoreId.js.map +1 -1
- package/dist/modules/accounts/AccountController.js +5 -5
- package/dist/modules/accounts/AccountController.js.map +1 -1
- package/dist/modules/accounts/IdentityController.js.map +1 -1
- package/dist/modules/accounts/backbone/IdentityClient.js.map +1 -1
- package/dist/modules/accounts/data/Identity.d.ts +5 -4
- package/dist/modules/accounts/data/Identity.js +12 -11
- package/dist/modules/accounts/data/Identity.js.map +1 -1
- package/dist/modules/accounts/data/IdentitySecretCredentials.d.ts +4 -4
- package/dist/modules/accounts/data/IdentitySecretCredentials.js +4 -5
- package/dist/modules/accounts/data/IdentitySecretCredentials.js.map +1 -1
- package/dist/modules/certificates/CertificateIssuer.js +2 -2
- package/dist/modules/certificates/CertificateIssuer.js.map +1 -1
- package/dist/modules/certificates/data/Certificate.d.ts +4 -5
- package/dist/modules/certificates/data/Certificate.js +4 -8
- package/dist/modules/certificates/data/Certificate.js.map +1 -1
- package/dist/modules/certificates/data/CertificateConstraint.d.ts +4 -5
- package/dist/modules/certificates/data/CertificateConstraint.js +4 -8
- package/dist/modules/certificates/data/CertificateConstraint.js.map +1 -1
- package/dist/modules/certificates/data/CertificateContent.d.ts +4 -5
- package/dist/modules/certificates/data/CertificateContent.js +4 -8
- package/dist/modules/certificates/data/CertificateContent.js.map +1 -1
- package/dist/modules/certificates/data/CertificateItem.d.ts +4 -5
- package/dist/modules/certificates/data/CertificateItem.js +4 -8
- package/dist/modules/certificates/data/CertificateItem.js.map +1 -1
- package/dist/modules/certificates/data/constraints/CertificateBorderConstraint.d.ts +1 -1
- package/dist/modules/certificates/data/constraints/CertificateBorderConstraint.js +4 -5
- package/dist/modules/certificates/data/constraints/CertificateBorderConstraint.js.map +1 -1
- package/dist/modules/certificates/data/constraints/CertificateCityConstraint.d.ts +1 -1
- package/dist/modules/certificates/data/constraints/CertificateCityConstraint.js +4 -5
- package/dist/modules/certificates/data/constraints/CertificateCityConstraint.js.map +1 -1
- package/dist/modules/certificates/data/constraints/CertificateIdentityConstraint.d.ts +1 -1
- package/dist/modules/certificates/data/constraints/CertificateIdentityConstraint.js +4 -5
- package/dist/modules/certificates/data/constraints/CertificateIdentityConstraint.js.map +1 -1
- package/dist/modules/certificates/data/constraints/CertificateTimeConstraint.d.ts +1 -1
- package/dist/modules/certificates/data/constraints/CertificateTimeConstraint.js +4 -5
- package/dist/modules/certificates/data/constraints/CertificateTimeConstraint.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificateAuthorizationItem.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificateAuthorizationItem.js +4 -5
- package/dist/modules/certificates/data/items/CertificateAuthorizationItem.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificateDelegateItem.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificateDelegateItem.js +4 -5
- package/dist/modules/certificates/data/items/CertificateDelegateItem.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItem.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItem.js +4 -5
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItem.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItemSource.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItemSource.js +4 -5
- package/dist/modules/certificates/data/items/CertificatePrivateAttributeItemSource.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificatePublicAttributeItem.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificatePublicAttributeItem.js +4 -5
- package/dist/modules/certificates/data/items/CertificatePublicAttributeItem.js.map +1 -1
- package/dist/modules/certificates/data/items/CertificateRoleItem.d.ts +1 -1
- package/dist/modules/certificates/data/items/CertificateRoleItem.js +4 -5
- package/dist/modules/certificates/data/items/CertificateRoleItem.js.map +1 -1
- package/dist/modules/challenges/ChallengeController.js +5 -5
- package/dist/modules/challenges/ChallengeController.js.map +1 -1
- package/dist/modules/challenges/data/Challenge.d.ts +4 -5
- package/dist/modules/challenges/data/Challenge.js +4 -8
- package/dist/modules/challenges/data/Challenge.js.map +1 -1
- package/dist/modules/challenges/data/ChallengeSigned.d.ts +5 -5
- package/dist/modules/challenges/data/ChallengeSigned.js +7 -8
- package/dist/modules/challenges/data/ChallengeSigned.js.map +1 -1
- package/dist/modules/devices/DeviceController.js.map +1 -1
- package/dist/modules/devices/DeviceSecretController.js +6 -6
- package/dist/modules/devices/DeviceSecretController.js.map +1 -1
- package/dist/modules/devices/DevicesController.js +4 -4
- package/dist/modules/devices/DevicesController.js.map +1 -1
- package/dist/modules/devices/backbone/DeviceAuthClient.js.map +1 -1
- package/dist/modules/devices/backbone/DeviceClient.js.map +1 -1
- package/dist/modules/devices/local/Device.d.ts +1 -1
- package/dist/modules/devices/local/Device.js +4 -5
- package/dist/modules/devices/local/Device.js.map +1 -1
- package/dist/modules/devices/local/DeviceSecretCredentials.d.ts +3 -3
- package/dist/modules/devices/local/DeviceSecretCredentials.js +4 -5
- package/dist/modules/devices/local/DeviceSecretCredentials.js.map +1 -1
- package/dist/modules/devices/local/SendDeviceParameters.d.ts +4 -5
- package/dist/modules/devices/local/SendDeviceParameters.js +4 -8
- package/dist/modules/devices/local/SendDeviceParameters.js.map +1 -1
- package/dist/modules/devices/transmission/DeviceSharedSecret.d.ts +3 -4
- package/dist/modules/devices/transmission/DeviceSharedSecret.js +4 -8
- package/dist/modules/devices/transmission/DeviceSharedSecret.js.map +1 -1
- package/dist/modules/files/FileController.d.ts +2 -2
- package/dist/modules/files/FileController.js +14 -14
- package/dist/modules/files/FileController.js.map +1 -1
- package/dist/modules/files/local/CachedFile.d.ts +5 -5
- package/dist/modules/files/local/CachedFile.js +6 -6
- package/dist/modules/files/local/CachedFile.js.map +1 -1
- package/dist/modules/files/local/File.d.ts +2 -3
- package/dist/modules/files/local/File.js +10 -11
- package/dist/modules/files/local/File.js.map +1 -1
- package/dist/modules/files/local/SendFileParameters.d.ts +4 -5
- package/dist/modules/files/local/SendFileParameters.js +4 -8
- package/dist/modules/files/local/SendFileParameters.js.map +1 -1
- package/dist/modules/files/transmission/FileMetadata.d.ts +4 -5
- package/dist/modules/files/transmission/FileMetadata.js +4 -8
- package/dist/modules/files/transmission/FileMetadata.js.map +1 -1
- package/dist/modules/files/transmission/FileReference.d.ts +5 -7
- package/dist/modules/files/transmission/FileReference.js +6 -9
- package/dist/modules/files/transmission/FileReference.js.map +1 -1
- package/dist/modules/messages/MessageController.d.ts +2 -2
- package/dist/modules/messages/MessageController.js +28 -28
- package/dist/modules/messages/MessageController.js.map +1 -1
- package/dist/modules/messages/local/CachedMessage.d.ts +7 -7
- package/dist/modules/messages/local/CachedMessage.js +5 -6
- package/dist/modules/messages/local/CachedMessage.js.map +1 -1
- package/dist/modules/messages/local/Message.d.ts +1 -1
- package/dist/modules/messages/local/Message.js +4 -5
- package/dist/modules/messages/local/Message.js.map +1 -1
- package/dist/modules/messages/local/SendMessageParameters.d.ts +7 -8
- package/dist/modules/messages/local/SendMessageParameters.js +5 -9
- package/dist/modules/messages/local/SendMessageParameters.js.map +1 -1
- package/dist/modules/messages/transmission/MessageEnvelope.d.ts +5 -5
- package/dist/modules/messages/transmission/MessageEnvelope.js +6 -7
- package/dist/modules/messages/transmission/MessageEnvelope.js.map +1 -1
- package/dist/modules/messages/transmission/MessageEnvelopeRecipient.d.ts +4 -4
- package/dist/modules/messages/transmission/MessageEnvelopeRecipient.js +4 -5
- package/dist/modules/messages/transmission/MessageEnvelopeRecipient.js.map +1 -1
- package/dist/modules/messages/transmission/MessagePlain.d.ts +8 -8
- package/dist/modules/messages/transmission/MessagePlain.js +7 -8
- package/dist/modules/messages/transmission/MessagePlain.js.map +1 -1
- package/dist/modules/messages/transmission/MessageSignature.d.ts +4 -4
- package/dist/modules/messages/transmission/MessageSignature.js +4 -5
- package/dist/modules/messages/transmission/MessageSignature.js.map +1 -1
- package/dist/modules/messages/transmission/MessageSigned.d.ts +4 -5
- package/dist/modules/messages/transmission/MessageSigned.js +4 -9
- package/dist/modules/messages/transmission/MessageSigned.js.map +1 -1
- package/dist/modules/relationshipTemplates/RelationshipTemplateController.d.ts +2 -2
- package/dist/modules/relationshipTemplates/RelationshipTemplateController.js +14 -14
- package/dist/modules/relationshipTemplates/RelationshipTemplateController.js.map +1 -1
- package/dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.d.ts +7 -8
- package/dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js +4 -7
- package/dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js.map +1 -1
- package/dist/modules/relationshipTemplates/local/RelationshipTemplate.d.ts +1 -2
- package/dist/modules/relationshipTemplates/local/RelationshipTemplate.js +4 -8
- package/dist/modules/relationshipTemplates/local/RelationshipTemplate.js.map +1 -1
- package/dist/modules/relationshipTemplates/local/SendRelationshipTemplateParameters.d.ts +7 -8
- package/dist/modules/relationshipTemplates/local/SendRelationshipTemplateParameters.js +5 -9
- package/dist/modules/relationshipTemplates/local/SendRelationshipTemplateParameters.js.map +1 -1
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.d.ts +7 -8
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js +5 -9
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js.map +1 -1
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.d.ts +4 -5
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.js +15 -24
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.js.map +1 -1
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateSigned.d.ts +4 -5
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateSigned.js +4 -8
- package/dist/modules/relationshipTemplates/transmission/RelationshipTemplateSigned.js.map +1 -1
- package/dist/modules/relationships/RelationshipSecretController.d.ts +6 -6
- package/dist/modules/relationships/RelationshipSecretController.js +7 -3
- package/dist/modules/relationships/RelationshipSecretController.js.map +1 -1
- package/dist/modules/relationships/RelationshipsController.d.ts +2 -2
- package/dist/modules/relationships/RelationshipsController.js +32 -32
- package/dist/modules/relationships/RelationshipsController.js.map +1 -1
- package/dist/modules/relationships/local/CachedRelationship.d.ts +4 -5
- package/dist/modules/relationships/local/CachedRelationship.js +4 -8
- package/dist/modules/relationships/local/CachedRelationship.js.map +1 -1
- package/dist/modules/relationships/local/Relationship.d.ts +3 -4
- package/dist/modules/relationships/local/Relationship.js +8 -11
- package/dist/modules/relationships/local/Relationship.js.map +1 -1
- package/dist/modules/relationships/local/SendRelationshipParameters.d.ts +7 -8
- package/dist/modules/relationships/local/SendRelationshipParameters.js +5 -9
- package/dist/modules/relationships/local/SendRelationshipParameters.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChange.d.ts +5 -6
- package/dist/modules/relationships/transmission/changes/RelationshipChange.js +8 -12
- package/dist/modules/relationships/transmission/changes/RelationshipChange.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChangeRequest.d.ts +6 -7
- package/dist/modules/relationships/transmission/changes/RelationshipChangeRequest.js +7 -11
- package/dist/modules/relationships/transmission/changes/RelationshipChangeRequest.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChangeResponse.d.ts +8 -9
- package/dist/modules/relationships/transmission/changes/RelationshipChangeResponse.js +7 -11
- package/dist/modules/relationships/transmission/changes/RelationshipChangeResponse.js.map +1 -1
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestCipher.d.ts +5 -6
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestCipher.js +6 -10
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestCipher.js.map +1 -1
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.d.ts +7 -8
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js +5 -9
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js.map +1 -1
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestSigned.d.ts +4 -5
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestSigned.js +4 -8
- package/dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestSigned.js.map +1 -1
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseCipher.d.ts +5 -6
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseCipher.js +6 -10
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseCipher.js.map +1 -1
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.d.ts +7 -8
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js +5 -9
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js.map +1 -1
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseSigned.d.ts +4 -5
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseSigned.js +4 -8
- package/dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseSigned.js.map +1 -1
- package/dist/modules/secrets/SecretController.js +7 -7
- package/dist/modules/secrets/SecretController.js.map +1 -1
- package/dist/modules/secrets/data/SecretContainerCipher.d.ts +1 -1
- package/dist/modules/secrets/data/SecretContainerCipher.js +4 -5
- package/dist/modules/secrets/data/SecretContainerCipher.js.map +1 -1
- package/dist/modules/secrets/data/SecretContainerPlain.d.ts +7 -7
- package/dist/modules/secrets/data/SecretContainerPlain.js +5 -6
- package/dist/modules/secrets/data/SecretContainerPlain.js.map +1 -1
- package/dist/modules/sync/DatawalletModificationsProcessor.js +4 -4
- package/dist/modules/sync/DatawalletModificationsProcessor.js.map +1 -1
- package/dist/modules/sync/SyncController.js.map +1 -1
- package/dist/modules/sync/SynchronizedCollection.js +2 -2
- package/dist/modules/sync/SynchronizedCollection.js.map +1 -1
- package/dist/modules/sync/local/DatawalletModification.d.ts +0 -1
- package/dist/modules/sync/local/DatawalletModification.js +3 -7
- package/dist/modules/sync/local/DatawalletModification.js.map +1 -1
- package/dist/modules/tokens/AnonymousTokenController.js +6 -6
- package/dist/modules/tokens/AnonymousTokenController.js.map +1 -1
- package/dist/modules/tokens/TokenController.d.ts +2 -2
- package/dist/modules/tokens/TokenController.js +14 -14
- package/dist/modules/tokens/TokenController.js.map +1 -1
- package/dist/modules/tokens/local/CachedToken.d.ts +7 -8
- package/dist/modules/tokens/local/CachedToken.js +5 -9
- package/dist/modules/tokens/local/CachedToken.js.map +1 -1
- package/dist/modules/tokens/local/SendTokenParameters.d.ts +7 -8
- package/dist/modules/tokens/local/SendTokenParameters.js +5 -9
- package/dist/modules/tokens/local/SendTokenParameters.js.map +1 -1
- package/dist/modules/tokens/local/Token.d.ts +3 -4
- package/dist/modules/tokens/local/Token.js +12 -13
- package/dist/modules/tokens/local/Token.js.map +1 -1
- package/dist/modules/tokens/transmission/TokenContentDeviceSharedSecret.d.ts +4 -5
- package/dist/modules/tokens/transmission/TokenContentDeviceSharedSecret.js +4 -8
- package/dist/modules/tokens/transmission/TokenContentDeviceSharedSecret.js.map +1 -1
- package/dist/modules/tokens/transmission/TokenContentFile.d.ts +4 -5
- package/dist/modules/tokens/transmission/TokenContentFile.js +4 -8
- package/dist/modules/tokens/transmission/TokenContentFile.js.map +1 -1
- package/dist/modules/tokens/transmission/TokenContentRelationshipTemplate.d.ts +4 -5
- package/dist/modules/tokens/transmission/TokenContentRelationshipTemplate.js +4 -8
- package/dist/modules/tokens/transmission/TokenContentRelationshipTemplate.js.map +1 -1
- package/dist/modules/tokens/transmission/TokenReference.d.ts +5 -6
- package/dist/modules/tokens/transmission/TokenReference.js +6 -14
- package/dist/modules/tokens/transmission/TokenReference.js.map +1 -1
- package/lib-web/nmshd.transport.js +944 -979
- package/lib-web/nmshd.transport.js.map +1 -1
- package/lib-web/nmshd.transport.min.js +1 -1
- package/lib-web/nmshd.transport.min.js.map +1 -1
- package/package.json +7 -5
|
@@ -8,19 +8,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var ChallengeSigned_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.ChallengeSigned = void 0;
|
|
14
13
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
15
14
|
const crypto_1 = require("@nmshd/crypto");
|
|
16
15
|
const core_1 = require("../../../core");
|
|
17
|
-
let ChallengeSigned =
|
|
18
|
-
static
|
|
19
|
-
return
|
|
16
|
+
let ChallengeSigned = class ChallengeSigned extends core_1.CoreSerializable {
|
|
17
|
+
static from(value) {
|
|
18
|
+
return this.fromAny(value);
|
|
20
19
|
}
|
|
21
|
-
static
|
|
22
|
-
const signature =
|
|
23
|
-
return
|
|
20
|
+
static fromJSON(value) {
|
|
21
|
+
const signature = crypto_1.CryptoSignature.fromBase64(value.signature);
|
|
22
|
+
return this.from({ signature: signature, challenge: value.challenge });
|
|
24
23
|
}
|
|
25
24
|
toJSON(verbose = true) {
|
|
26
25
|
const obj = {
|
|
@@ -43,7 +42,7 @@ __decorate([
|
|
|
43
42
|
(0, ts_serval_1.serialize)({ enforceString: true }),
|
|
44
43
|
__metadata("design:type", crypto_1.CryptoSignature)
|
|
45
44
|
], ChallengeSigned.prototype, "signature", void 0);
|
|
46
|
-
ChallengeSigned =
|
|
45
|
+
ChallengeSigned = __decorate([
|
|
47
46
|
(0, ts_serval_1.type)("ChallengeSigned")
|
|
48
47
|
], ChallengeSigned);
|
|
49
48
|
exports.ChallengeSigned = ChallengeSigned;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChallengeSigned.js","sourceRoot":"","sources":["../../../../src/modules/challenges/data/ChallengeSigned.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ChallengeSigned.js","sourceRoot":"","sources":["../../../../src/modules/challenges/data/ChallengeSigned.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2E;AAC3E,0CAAiE;AACjE,wCAAmE;AAanE,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,uBAAgB;IAS1C,MAAM,CAAC,IAAI,CAAC,KAAuB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAiC;QACpD,MAAM,SAAS,GAAG,wBAAe,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;IAC1E,CAAC;IAEe,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,MAAM,GAAG,GAA+B;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;SACvC,CAAA;QACD,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAA;SACnC;QACD,OAAO,GAAG,CAAA;IACd,CAAC;CACJ,CAAA;AA1BG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;;kDACX;AAIxB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;8BACjB,wBAAe;kDAAA;AAPxB,eAAe;IAD3B,IAAA,gBAAI,EAAC,iBAAiB,CAAC;GACX,eAAe,CA6B3B;AA7BY,0CAAe"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceController.js","sourceRoot":"","sources":["../../../src/modules/devices/DeviceController.ts"],"names":[],"mappings":";;;AAAA,0CAMsB;AACtB,qCAQmB;AAEnB,qEAAmF;AAEnF,6EAAyE;AAEzE,MAAa,gBAAiB,SAAQ,0BAAmB;IA+CrD,YAAmB,MAAyB;QACxC,KAAK,CAAC,qBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,CAAC;IAhDD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAGD,IAAW,EAAE;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;IACzB,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAChC,CAAC;IAED,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;IAClC,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAED,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;IAClC,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAA;IACtC,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAChC,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAGD,IAAW,MAAM;QACb,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,sBAAe,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;QAC9D,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACD,IAAW,iBAAiB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"DeviceController.js","sourceRoot":"","sources":["../../../src/modules/devices/DeviceController.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
|
|
|
47
47
|
validFrom: date,
|
|
48
48
|
active: true
|
|
49
49
|
};
|
|
50
|
-
const container =
|
|
50
|
+
const container = SecretContainerCipher_1.SecretContainerCipher.from(secretContainerInterface);
|
|
51
51
|
this.log.trace(`Created device secret id:${container.id} name:${container.name} on ${container.createdAt.toISOString()}.`);
|
|
52
52
|
await this.secrets.set(name, container.toJSON());
|
|
53
53
|
return container;
|
|
@@ -57,12 +57,12 @@ class DeviceSecretController extends TransportController_1.TransportController {
|
|
|
57
57
|
if (!secretObj)
|
|
58
58
|
return;
|
|
59
59
|
const baseKey = this.getBaseKey();
|
|
60
|
-
const secret =
|
|
60
|
+
const secret = SecretContainerCipher_1.SecretContainerCipher.from(secretObj);
|
|
61
61
|
const decryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(baseKey, 1, DeviceSecretController.secretContext);
|
|
62
62
|
const plainBuffer = await core_1.CoreCrypto.decrypt(secret.cipher, decryptionKey);
|
|
63
63
|
const plainString = plainBuffer.toUtf8();
|
|
64
|
-
const decryptedSecret =
|
|
65
|
-
const plainSecret =
|
|
64
|
+
const decryptedSecret = ts_serval_1.Serializable.deserializeUnknown(plainString);
|
|
65
|
+
const plainSecret = SecretContainerPlain_1.SecretContainerPlain.from({
|
|
66
66
|
id: secret.id,
|
|
67
67
|
createdAt: secret.createdAt,
|
|
68
68
|
name: secret.name,
|
|
@@ -99,7 +99,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
|
|
|
99
99
|
throw core_1.TransportErrors.secrets.secretNotFound("IdentityKey").logWith(this._log);
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
|
-
const deviceSharedSecret =
|
|
102
|
+
const deviceSharedSecret = DeviceSharedSecret_1.DeviceSharedSecret.from({
|
|
103
103
|
id: device.id,
|
|
104
104
|
createdAt: device.createdAt,
|
|
105
105
|
createdByDevice: device.createdByDevice,
|
|
@@ -136,7 +136,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
|
|
|
136
136
|
if (!payloadCipherBase64) {
|
|
137
137
|
return undefined;
|
|
138
138
|
}
|
|
139
|
-
const payloadCipher =
|
|
139
|
+
const payloadCipher = crypto_1.CryptoCipher.fromBase64(payloadCipherBase64);
|
|
140
140
|
const privSync = await this.loadSecret(DeviceSecretType.IdentitySynchronizationMaster);
|
|
141
141
|
if (!privSync || !(privSync.secret instanceof crypto_1.CryptoSecretKey)) {
|
|
142
142
|
throw core_1.TransportErrors.secrets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSecretController.js","sourceRoot":"","sources":["../../../src/modules/devices/DeviceSecretController.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"DeviceSecretController.js","sourceRoot":"","sources":["../../../src/modules/devices/DeviceSecretController.ts"],"names":[],"mappings":";;;AACA,kDAAiD;AACjD,0CAUsB;AACtB,qCAAkE;AAClE,wEAAoF;AACpF,0DAAsD;AAEtD,iFAAqG;AACrG,+EAA2E;AAI3E,0EAAsE;AAEtE,IAAY,gBAOX;AAPD,WAAY,gBAAgB;IACxB,qFAAiE,CAAA;IACjE,4DAAwC,CAAA;IACxC,0DAAsC,CAAA;IACtC,0DAAsC,CAAA;IACtC,wDAAoC,CAAA;IACpC,4DAAwC,CAAA;AAC5C,CAAC,EAPW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAO3B;AAED;;;;GAIG;AACH,MAAa,sBAAuB,SAAQ,yCAAmB;IAO3D,YAAmB,MAAyB,EAAE,OAAwB;QAClE,KAAK,CAAC,oCAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAEe,KAAK,CAAC,IAAI;QACtB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAEpD,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,WAAW,CACpB,MAMqB,EACrB,IAAY;QAEZ,MAAM,WAAW,GAAW,MAAM,CAAC,SAAS,EAAE,CAAA;QAC9C,MAAM,WAAW,GAAe,mBAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAEhE,MAAM,aAAa,GAAoB,MAAM,iBAAU,CAAC,iBAAiB,CACrE,IAAI,CAAC,UAAU,EAAE,EACjB,CAAC,EACD,sBAAsB,CAAC,aAAa,CACvC,CAAA;QAED,MAAM,MAAM,GAAkB,MAAM,iBAAU,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;QAClF,MAAM,IAAI,GAAa,eAAQ,CAAC,GAAG,EAAE,CAAA;QACrC,MAAM,wBAAwB,GAA2B;YACrD,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,MAAM,2BAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,IAAI;SACf,CAAA;QACD,MAAM,SAAS,GAA0B,6CAAqB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;QAE7F,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,4BAA4B,SAAS,CAAC,EAAE,SAAS,SAAS,CAAC,IAAI,OAAO,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAC7G,CAAA;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QAEhD,OAAO,SAAS,CAAA;IACpB,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAY;QAChC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS;YAAE,OAAM;QAEtB,MAAM,OAAO,GAAoB,IAAI,CAAC,UAAU,EAAE,CAAA;QAClD,MAAM,MAAM,GAA0B,6CAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC3E,MAAM,aAAa,GAAoB,MAAM,iBAAU,CAAC,iBAAiB,CACrE,OAAO,EACP,CAAC,EACD,sBAAsB,CAAC,aAAa,CACvC,CAAA;QACD,MAAM,WAAW,GAAgB,MAAM,iBAAU,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QACvF,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,EAAE,CAAA;QAEhD,MAAM,eAAe,GAAG,wBAAY,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QAEpE,MAAM,WAAW,GAAyB,2CAAoB,CAAC,IAAI,CAAC;YAChE,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,eAAe;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;SACxB,CAAC,CAAA;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,6BAA6B,WAAW,CAAC,EAAE,SAAS,WAAW,CAAC,IAAI,OAAO,eAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,GAAG,CAC7G,CAAA;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAY;QAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,KAAK,CAAA;SACf;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,4BAA4B,SAAS,CAAC,EAAE,SAAS,SAAS,CAAC,IAAI,OAAO,eAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,GAAG,CACxG,CAAA;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,wBAAwB,CACjC,MAAc,EACd,WAAmB,EACnB,yBAAyB,GAAG,KAAK;QAEjC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAA;QAChG,IAAI,CAAC,kBAAkB,IAAI,CAAC,CAAC,kBAAkB,CAAC,MAAM,YAAY,wBAAe,CAAC,EAAE;YAChF,MAAM,sBAAe,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACxF;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,YAAY,wBAAe,CAAC,EAAE;YAC1D,MAAM,sBAAe,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC7E;QAED,IAAI,kBAAkB,CAAA;QACtB,IAAI,yBAAyB,EAAE;YAC3B,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAA;YAC9E,IAAI,CAAC,kBAAkB,IAAI,CAAC,CAAC,kBAAkB,CAAC,MAAM,YAAY,kCAAyB,CAAC,EAAE;gBAC1F,MAAM,sBAAe,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACjF;SACJ;QAED,MAAM,kBAAkB,GAAG,uCAAkB,CAAC,IAAI,CAAC;YAC/C,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,WAAW,EAAE,WAAW;YACxB,aAAa,EAAE,OAAO,CAAC,MAAM;YAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,kBAAkB,EAAE,kBAAkB,CAAC,MAAM;YAC7C,kBAAkB,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAmC;YAC3E,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,eAAgB;YACjC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ;SAC1C,CAAC,CAAA;QAEF,2CAA2C;QAC3C,OAAO,kBAAkB,CAAA;IAC7B,CAAC;IAEM,KAAK,CAAC,oCAAoC,CAC7C,KAA6B,EAC7B,KAAa;QAEb,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAChB,OAAO,SAAS,CAAA;SACnB;QAED,MAAM,eAAe,GAAG,mBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;QAC1E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAA;QACtF,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,YAAY,wBAAe,CAAC,EAAE;YAC5D,MAAM,sBAAe,CAAC,OAAO;iBACxB,cAAc,CAAC,gBAAgB,CAAC,6BAA6B,CAAC;iBAC9D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC1B;QAED,MAAM,aAAa,GAAG,MAAM,iBAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QAE5F,MAAM,MAAM,GAAG,MAAM,iBAAU,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;QACvE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACvB,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,oCAAoC,CAC7C,mBAAkC,EAClC,KAAa;QAEb,IAAI,CAAC,mBAAmB,EAAE;YACtB,OAAO,SAAS,CAAA;SACnB;QAED,MAAM,aAAa,GAAG,qBAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA;QAElE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAA;QACtF,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,YAAY,wBAAe,CAAC,EAAE;YAC5D,MAAM,sBAAe,CAAC,OAAO;iBACxB,cAAc,CAAC,gBAAgB,CAAC,6BAA6B,CAAC;iBAC9D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC1B;QAED,MAAM,aAAa,GAAG,MAAM,iBAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QAE5F,MAAM,SAAS,GAAG,MAAM,iBAAU,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;QACxE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QAEvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QAEzD,OAAO,kBAAkB,CAAA;IAC7B,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,sBAAe,CAAC,OAAO;iBACxB,cAAc,CAAC,wBAAe,EAAE,gBAAgB,CAAC,mBAAmB,CAAC;iBACrE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC1B;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;;AA3ML,wDA4MC;AAzM2B,oCAAa,GAAW,UAAU,CAAA"}
|
|
@@ -24,7 +24,7 @@ class DevicesController extends TransportController_1.TransportController {
|
|
|
24
24
|
if (!result) {
|
|
25
25
|
return undefined;
|
|
26
26
|
}
|
|
27
|
-
return
|
|
27
|
+
return Device_1.Device.from(result);
|
|
28
28
|
}
|
|
29
29
|
async addExistingDevice(device) {
|
|
30
30
|
await this.devices.create(device);
|
|
@@ -40,7 +40,7 @@ class DevicesController extends TransportController_1.TransportController {
|
|
|
40
40
|
devicePassword: devicePwdDn
|
|
41
41
|
})).value;
|
|
42
42
|
this.log.trace(`Created device with id ${response.id}.`);
|
|
43
|
-
const device =
|
|
43
|
+
const device = Device_1.Device.from({
|
|
44
44
|
createdAt: core_1.CoreDate.from(response.createdAt),
|
|
45
45
|
createdByDevice: core_1.CoreId.from(response.createdByDevice),
|
|
46
46
|
id: core_1.CoreId.from(response.id),
|
|
@@ -54,7 +54,7 @@ class DevicesController extends TransportController_1.TransportController {
|
|
|
54
54
|
return device;
|
|
55
55
|
}
|
|
56
56
|
async sendDevice(parameters) {
|
|
57
|
-
parameters =
|
|
57
|
+
parameters = SendDeviceParameters_1.SendDeviceParameters.from(parameters);
|
|
58
58
|
if (!parameters.name) {
|
|
59
59
|
const devices = await this.parent.devices.list();
|
|
60
60
|
parameters.name = `Device ${devices.length + 1}`;
|
|
@@ -69,7 +69,7 @@ class DevicesController extends TransportController_1.TransportController {
|
|
|
69
69
|
throw core_1.TransportErrors.general.recordNotFound(Device_1.Device, id.toString());
|
|
70
70
|
}
|
|
71
71
|
const count = await this.devices.count();
|
|
72
|
-
const device =
|
|
72
|
+
const device = Device_1.Device.from(deviceDoc);
|
|
73
73
|
if (!device.initialPassword || device.publicKey || device.lastLoginAt) {
|
|
74
74
|
throw core_1.TransportErrors.device.alreadyOnboarded();
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevicesController.js","sourceRoot":"","sources":["../../../src/modules/devices/DevicesController.ts"],"names":[],"mappings":";;;AAAA,qCAA8D;AAC9D,kEAA8D;AAC9D,wEAAoF;AACpF,qCAA8C;AAE9C,4DAA4D;AAE5D,kEAA8D;AAC9D,2CAAmD;AACnD,uEAA0F;AAG1F,MAAa,iBAAkB,SAAQ,yCAAmB;IAItD,YAAmB,MAAyB;QACxC,KAAK,CAAC,oCAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC;
|
|
1
|
+
{"version":3,"file":"DevicesController.js","sourceRoot":"","sources":["../../../src/modules/devices/DevicesController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceAuthClient.js","sourceRoot":"","sources":["../../../../src/modules/devices/backbone/DeviceAuthClient.ts"],"names":[],"mappings":";;;AAAA,wCAA8E;AAe9E,MAAa,gBAAiB,SAAQ,6BAAsB;IAA5D;;
|
|
1
|
+
{"version":3,"file":"DeviceAuthClient.js","sourceRoot":"","sources":["../../../../src/modules/devices/backbone/DeviceAuthClient.ts"],"names":[],"mappings":";;;AAAA,wCAA8E;AAe9E,MAAa,gBAAiB,SAAQ,6BAAsB;IAA5D;;QACuB,kBAAa,GAAG,6BAAsB,CAAC,WAAW,CAAA;IAezE,CAAC;IAbU,KAAK,CAAC,oBAAoB,CAAC,KAAwC;QACtE,OAAO,MAAM,IAAI,CAAC,GAAG,CAAO,+BAA+B,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,KAAiC;QACvD,OAAO,MAAM,IAAI,CAAC,IAAI,CAA8B,iBAAiB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IACrF,CAAC;IAEM,KAAK,CAAC,6BAA6B,CACtC,KAAgD;QAEhD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAO,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAChF,CAAC;CACJ;AAhBD,4CAgBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceClient.js","sourceRoot":"","sources":["../../../../src/modules/devices/backbone/DeviceClient.ts"],"names":[],"mappings":";;;AAAA,wCAAkE;AAIlE,MAAa,YAAa,SAAQ,iBAAU;IAA5C;;
|
|
1
|
+
{"version":3,"file":"DeviceClient.js","sourceRoot":"","sources":["../../../../src/modules/devices/backbone/DeviceClient.ts"],"names":[],"mappings":";;;AAAA,wCAAkE;AAIlE,MAAa,YAAa,SAAQ,iBAAU;IAA5C;;QACuB,kBAAa,GAAG,6BAAsB,CAAC,WAAW,CAAA;IAKzE,CAAC;IAHU,KAAK,CAAC,YAAY,CAAC,KAAiC;QACvD,OAAO,MAAM,IAAI,CAAC,IAAI,CAA8B,iBAAiB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IACrF,CAAC;CACJ;AAND,oCAMC"}
|
|
@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var Device_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.Device = exports.DeviceType = void 0;
|
|
14
13
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
@@ -25,7 +24,7 @@ var DeviceType;
|
|
|
25
24
|
DeviceType[DeviceType["Desktop"] = 3] = "Desktop";
|
|
26
25
|
DeviceType[DeviceType["Connector"] = 4] = "Connector";
|
|
27
26
|
})(DeviceType = exports.DeviceType || (exports.DeviceType = {}));
|
|
28
|
-
let Device =
|
|
27
|
+
let Device = class Device extends core_1.CoreSynchronizable {
|
|
29
28
|
constructor() {
|
|
30
29
|
super(...arguments);
|
|
31
30
|
this.technicalProperties = [
|
|
@@ -45,8 +44,8 @@ let Device = Device_1 = class Device extends core_1.CoreSynchronizable {
|
|
|
45
44
|
];
|
|
46
45
|
this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((d) => d.name), (0, ts_simple_nameof_1.nameof)((d) => d.description)];
|
|
47
46
|
}
|
|
48
|
-
static
|
|
49
|
-
return
|
|
47
|
+
static from(value) {
|
|
48
|
+
return this.fromAny(value);
|
|
50
49
|
}
|
|
51
50
|
};
|
|
52
51
|
__decorate([
|
|
@@ -114,7 +113,7 @@ __decorate([
|
|
|
114
113
|
(0, ts_serval_1.serialize)(),
|
|
115
114
|
__metadata("design:type", Number)
|
|
116
115
|
], Device.prototype, "datawalletVersion", void 0);
|
|
117
|
-
Device =
|
|
116
|
+
Device = __decorate([
|
|
118
117
|
(0, ts_serval_1.type)("Device")
|
|
119
118
|
], Device);
|
|
120
119
|
exports.Device = Device;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/Device.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/Device.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { CoreId,
|
|
1
|
+
import { CoreId, CoreSerializable, ICoreId } from "../../../core";
|
|
2
2
|
export interface IDeviceSecretCredentials {
|
|
3
3
|
id: ICoreId;
|
|
4
4
|
password?: string;
|
|
5
5
|
username?: string;
|
|
6
6
|
}
|
|
7
|
-
export declare class DeviceSecretCredentials extends
|
|
7
|
+
export declare class DeviceSecretCredentials extends CoreSerializable implements IDeviceSecretCredentials {
|
|
8
8
|
id: CoreId;
|
|
9
9
|
password?: string;
|
|
10
10
|
username?: string;
|
|
11
|
-
static from(value: IDeviceSecretCredentials):
|
|
11
|
+
static from(value: IDeviceSecretCredentials): DeviceSecretCredentials;
|
|
12
12
|
}
|
|
@@ -8,14 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var DeviceSecretCredentials_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.DeviceSecretCredentials = void 0;
|
|
14
13
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
15
14
|
const core_1 = require("../../../core");
|
|
16
|
-
let DeviceSecretCredentials =
|
|
17
|
-
static
|
|
18
|
-
return
|
|
15
|
+
let DeviceSecretCredentials = class DeviceSecretCredentials extends core_1.CoreSerializable {
|
|
16
|
+
static from(value) {
|
|
17
|
+
return this.fromAny(value);
|
|
19
18
|
}
|
|
20
19
|
};
|
|
21
20
|
__decorate([
|
|
@@ -33,7 +32,7 @@ __decorate([
|
|
|
33
32
|
(0, ts_serval_1.validate)({ nullable: true }),
|
|
34
33
|
__metadata("design:type", String)
|
|
35
34
|
], DeviceSecretCredentials.prototype, "username", void 0);
|
|
36
|
-
DeviceSecretCredentials =
|
|
35
|
+
DeviceSecretCredentials = __decorate([
|
|
37
36
|
(0, ts_serval_1.type)("DeviceSecretCredentials")
|
|
38
37
|
], DeviceSecretCredentials);
|
|
39
38
|
exports.DeviceSecretCredentials = DeviceSecretCredentials;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSecretCredentials.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/DeviceSecretCredentials.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DeviceSecretCredentials.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/DeviceSecretCredentials.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,wCAAiE;AASjE,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,uBAAgB;IAalD,MAAM,CAAC,IAAI,CAAC,KAA+B;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAbG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACA,aAAM;mDAAA;AAIjB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACL;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACL;AAXf,uBAAuB;IADnC,IAAA,gBAAI,EAAC,yBAAyB,CAAC;GACnB,uBAAuB,CAgBnC;AAhBY,0DAAuB"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export interface ISendDeviceParameters extends
|
|
1
|
+
import { CoreSerializable, ICoreSerializable } from "../../../core";
|
|
2
|
+
export interface ISendDeviceParameters extends ICoreSerializable {
|
|
3
3
|
name?: string;
|
|
4
4
|
description?: string;
|
|
5
5
|
isAdmin?: boolean;
|
|
6
6
|
}
|
|
7
|
-
export declare class SendDeviceParameters extends
|
|
7
|
+
export declare class SendDeviceParameters extends CoreSerializable implements ISendDeviceParameters {
|
|
8
8
|
name?: string;
|
|
9
9
|
description?: string;
|
|
10
10
|
isAdmin?: boolean;
|
|
11
|
-
static from(value: ISendDeviceParameters):
|
|
12
|
-
static deserialize(value: string): Promise<SendDeviceParameters>;
|
|
11
|
+
static from(value: ISendDeviceParameters): SendDeviceParameters;
|
|
13
12
|
}
|
|
@@ -8,17 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var SendDeviceParameters_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.SendDeviceParameters = void 0;
|
|
14
13
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
15
14
|
const core_1 = require("../../../core");
|
|
16
|
-
let SendDeviceParameters =
|
|
17
|
-
static
|
|
18
|
-
return
|
|
19
|
-
}
|
|
20
|
-
static async deserialize(value) {
|
|
21
|
-
return await super.deserializeT(value, SendDeviceParameters_1);
|
|
15
|
+
let SendDeviceParameters = class SendDeviceParameters extends core_1.CoreSerializable {
|
|
16
|
+
static from(value) {
|
|
17
|
+
return this.fromAny(value);
|
|
22
18
|
}
|
|
23
19
|
};
|
|
24
20
|
__decorate([
|
|
@@ -36,7 +32,7 @@ __decorate([
|
|
|
36
32
|
(0, ts_serval_1.serialize)(),
|
|
37
33
|
__metadata("design:type", Boolean)
|
|
38
34
|
], SendDeviceParameters.prototype, "isAdmin", void 0);
|
|
39
|
-
SendDeviceParameters =
|
|
35
|
+
SendDeviceParameters = __decorate([
|
|
40
36
|
(0, ts_serval_1.type)("SendDeviceParameters")
|
|
41
37
|
], SendDeviceParameters);
|
|
42
38
|
exports.SendDeviceParameters = SendDeviceParameters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendDeviceParameters.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/SendDeviceParameters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SendDeviceParameters.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/SendDeviceParameters.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,wCAAmE;AASnE,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,uBAAgB;IAa/C,MAAM,CAAC,IAAI,CAAC,KAA4B;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAbG;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;kDACQ;AAIpB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;yDACe;AAI3B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;qDACY;AAXf,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAgBhC;AAhBY,oDAAoB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CryptoSecretKey, CryptoSignaturePrivateKey, ICryptoSecretKey, ICryptoSignaturePrivateKey } from "@nmshd/crypto";
|
|
2
|
-
import { CoreDate, CoreId,
|
|
2
|
+
import { CoreDate, CoreId, CoreSerializable, ICoreId } from "../../../core";
|
|
3
3
|
import { Identity, IIdentity } from "../../accounts/data/Identity";
|
|
4
4
|
export interface IDeviceSharedSecret {
|
|
5
5
|
id: ICoreId;
|
|
@@ -15,7 +15,7 @@ export interface IDeviceSharedSecret {
|
|
|
15
15
|
password: string;
|
|
16
16
|
username: string;
|
|
17
17
|
}
|
|
18
|
-
export declare class DeviceSharedSecret extends
|
|
18
|
+
export declare class DeviceSharedSecret extends CoreSerializable implements IDeviceSharedSecret {
|
|
19
19
|
id: CoreId;
|
|
20
20
|
createdByDevice: CoreId;
|
|
21
21
|
createdAt: CoreDate;
|
|
@@ -28,6 +28,5 @@ export declare class DeviceSharedSecret extends CoreSerializableAsync implements
|
|
|
28
28
|
identity: Identity;
|
|
29
29
|
username: string;
|
|
30
30
|
password: string;
|
|
31
|
-
static from(value: IDeviceSharedSecret):
|
|
32
|
-
static deserialize(value: string): Promise<DeviceSharedSecret>;
|
|
31
|
+
static from(value: IDeviceSharedSecret): DeviceSharedSecret;
|
|
33
32
|
}
|
|
@@ -8,19 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var DeviceSharedSecret_1;
|
|
12
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
12
|
exports.DeviceSharedSecret = void 0;
|
|
14
13
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
15
14
|
const crypto_1 = require("@nmshd/crypto");
|
|
16
15
|
const core_1 = require("../../../core");
|
|
17
16
|
const Identity_1 = require("../../accounts/data/Identity");
|
|
18
|
-
let DeviceSharedSecret =
|
|
19
|
-
static
|
|
20
|
-
return
|
|
21
|
-
}
|
|
22
|
-
static async deserialize(value) {
|
|
23
|
-
return await super.deserializeT(value, DeviceSharedSecret_1);
|
|
17
|
+
let DeviceSharedSecret = class DeviceSharedSecret extends core_1.CoreSerializable {
|
|
18
|
+
static from(value) {
|
|
19
|
+
return this.fromAny(value);
|
|
24
20
|
}
|
|
25
21
|
};
|
|
26
22
|
__decorate([
|
|
@@ -83,7 +79,7 @@ __decorate([
|
|
|
83
79
|
(0, ts_serval_1.validate)(),
|
|
84
80
|
__metadata("design:type", String)
|
|
85
81
|
], DeviceSharedSecret.prototype, "password", void 0);
|
|
86
|
-
DeviceSharedSecret =
|
|
82
|
+
DeviceSharedSecret = __decorate([
|
|
87
83
|
(0, ts_serval_1.type)("DeviceSharedSecret")
|
|
88
84
|
], DeviceSharedSecret);
|
|
89
85
|
exports.DeviceSharedSecret = DeviceSharedSecret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSharedSecret.js","sourceRoot":"","sources":["../../../../src/modules/devices/transmission/DeviceSharedSecret.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DeviceSharedSecret.js","sourceRoot":"","sources":["../../../../src/modules/devices/transmission/DeviceSharedSecret.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,0CAAwH;AACxH,wCAA2E;AAC3E,2DAAkE;AAkBlE,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,uBAAgB;IAiD7C,MAAM,CAAC,IAAI,CAAC,KAA0B;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAjDG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACA,aAAM;8CAAA;AAIjB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACa,aAAM;2DAAA;AAI9B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,eAAQ;qDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACT;AAIpB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACF;AAI3B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACgB,wBAAe;8DAAA;AAI1C;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACW,wBAAe;yDAAA;AAIrC;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;uDACe;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACD,kCAAyB;8DAAA;AAIrD;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACM,mBAAQ;oDAAA;AAIzB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;oDACY;AAIvB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;oDACY;AA/Cd,kBAAkB;IAD9B,IAAA,gBAAI,EAAC,oBAAoB,CAAC;GACd,kBAAkB,CAoD9B;AApDY,gDAAkB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ISerializable } from "@js-soft/ts-serval";
|
|
2
2
|
import { CoreBuffer, CryptoSecretKey } from "@nmshd/crypto";
|
|
3
3
|
import { CoreId } from "../../core";
|
|
4
4
|
import { TransportController } from "../../core/TransportController";
|
|
@@ -25,7 +25,7 @@ export declare class FileController extends TransportController {
|
|
|
25
25
|
loadPeerFileByTruncated(truncated: string): Promise<File>;
|
|
26
26
|
loadPeerFileByReference(fileReference: FileReference): Promise<File>;
|
|
27
27
|
loadPeerFile(id: CoreId, secretKey: CryptoSecretKey): Promise<File>;
|
|
28
|
-
setFileMetadata(idOrFile: CoreId | File, metadata:
|
|
28
|
+
setFileMetadata(idOrFile: CoreId | File, metadata: ISerializable): Promise<File>;
|
|
29
29
|
sendFile(parameters: ISendFileParameters): Promise<File>;
|
|
30
30
|
downloadFileContent(idOrFile: CoreId | File): Promise<CoreBuffer>;
|
|
31
31
|
}
|
|
@@ -27,7 +27,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
27
27
|
}
|
|
28
28
|
async getFile(id) {
|
|
29
29
|
const doc = await this.files.read(id.toString());
|
|
30
|
-
return doc ?
|
|
30
|
+
return doc ? File_1.File.from(doc) : undefined;
|
|
31
31
|
}
|
|
32
32
|
async fetchCaches(ids) {
|
|
33
33
|
if (ids.length === 0)
|
|
@@ -35,7 +35,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
35
35
|
const backboneFiles = await (await this.client.getFiles({ ids: ids.map((id) => id.id) })).value.collect();
|
|
36
36
|
const decryptionPromises = backboneFiles.map(async (f) => {
|
|
37
37
|
const fileDoc = await this.files.read(f.id);
|
|
38
|
-
const file =
|
|
38
|
+
const file = File_1.File.from(fileDoc);
|
|
39
39
|
return { id: core_1.CoreId.from(f.id), cache: await this.decryptFile(f, file.secretKey) };
|
|
40
40
|
});
|
|
41
41
|
return await Promise.all(decryptionPromises);
|
|
@@ -57,7 +57,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
57
57
|
if (!fileDoc) {
|
|
58
58
|
throw core_1.TransportErrors.general.recordNotFound(File_1.File, id).logWith(this._log);
|
|
59
59
|
}
|
|
60
|
-
const file =
|
|
60
|
+
const file = File_1.File.from(fileDoc);
|
|
61
61
|
await this.updateCacheOfFile(file, response);
|
|
62
62
|
await this.files.update(fileDoc, file);
|
|
63
63
|
return file;
|
|
@@ -73,18 +73,18 @@ class FileController extends TransportController_1.TransportController {
|
|
|
73
73
|
file.isOwn = this.parent.identity.isMe(cachedFile.createdBy);
|
|
74
74
|
}
|
|
75
75
|
async decryptFile(response, secretKey) {
|
|
76
|
-
const cipher =
|
|
76
|
+
const cipher = crypto_1.CryptoCipher.fromBase64(response.encryptedProperties);
|
|
77
77
|
const plaintextMetadataBuffer = await core_1.CoreCrypto.decrypt(cipher, secretKey);
|
|
78
|
-
const plaintextMetadata =
|
|
78
|
+
const plaintextMetadata = FileMetadata_1.FileMetadata.deserialize(plaintextMetadataBuffer.toUtf8());
|
|
79
79
|
if (!(plaintextMetadata instanceof FileMetadata_1.FileMetadata)) {
|
|
80
80
|
throw core_1.TransportErrors.files.invalidMetadata(response.id).logWith(this._log);
|
|
81
81
|
}
|
|
82
82
|
// TODO: JSSNMSHDD-2486 (check signature)
|
|
83
|
-
const cachedFile =
|
|
83
|
+
const cachedFile = CachedFile_1.CachedFile.fromBackbone(response, plaintextMetadata);
|
|
84
84
|
return cachedFile;
|
|
85
85
|
}
|
|
86
86
|
async loadPeerFileByTruncated(truncated) {
|
|
87
|
-
const reference =
|
|
87
|
+
const reference = FileReference_1.FileReference.fromTruncated(truncated);
|
|
88
88
|
return await this.loadPeerFileByReference(reference);
|
|
89
89
|
}
|
|
90
90
|
async loadPeerFileByReference(fileReference) {
|
|
@@ -95,7 +95,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
95
95
|
if (fileDoc) {
|
|
96
96
|
return await this.updateCacheOfExistingFileInDb(id.toString());
|
|
97
97
|
}
|
|
98
|
-
const file =
|
|
98
|
+
const file = File_1.File.from({
|
|
99
99
|
id: id,
|
|
100
100
|
secretKey: secretKey,
|
|
101
101
|
isOwn: false
|
|
@@ -110,13 +110,13 @@ class FileController extends TransportController_1.TransportController {
|
|
|
110
110
|
if (!fileDoc) {
|
|
111
111
|
throw core_1.TransportErrors.general.recordNotFound(File_1.File, id.toString()).logWith(this._log);
|
|
112
112
|
}
|
|
113
|
-
const file =
|
|
113
|
+
const file = File_1.File.from(fileDoc);
|
|
114
114
|
file.setMetadata(metadata);
|
|
115
115
|
await this.files.update(fileDoc, file);
|
|
116
116
|
return file;
|
|
117
117
|
}
|
|
118
118
|
async sendFile(parameters) {
|
|
119
|
-
const input =
|
|
119
|
+
const input = SendFileParameters_1.SendFileParameters.from(parameters);
|
|
120
120
|
const content = input.buffer;
|
|
121
121
|
const fileSize = content.length;
|
|
122
122
|
if (fileSize > this.config.platformMaxUnencryptedFileSize) {
|
|
@@ -131,7 +131,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
131
131
|
const cipherBuffer = crypto_1.CoreBuffer.fromBase64URL(cipher.toBase64());
|
|
132
132
|
const cipherHash = await crypto_1.CryptoHash.hash(cipherBuffer, 2 /* SHA512 */);
|
|
133
133
|
const cipherCoreHash = core_1.CoreHash.from(cipherHash.toBase64URL());
|
|
134
|
-
const metadata =
|
|
134
|
+
const metadata = FileMetadata_1.FileMetadata.from({
|
|
135
135
|
title: input.title,
|
|
136
136
|
description: input.description,
|
|
137
137
|
filename: input.filename,
|
|
@@ -154,7 +154,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
154
154
|
expiresAt: input.expiresAt.toString(),
|
|
155
155
|
encryptedProperties: metadataCipher.toBase64()
|
|
156
156
|
})).value;
|
|
157
|
-
const cachedFile =
|
|
157
|
+
const cachedFile = CachedFile_1.CachedFile.from({
|
|
158
158
|
title: input.title,
|
|
159
159
|
description: input.description,
|
|
160
160
|
filename: input.filename,
|
|
@@ -171,7 +171,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
171
171
|
ownerSignature: signature,
|
|
172
172
|
plaintextHash: plaintextHash
|
|
173
173
|
});
|
|
174
|
-
const file =
|
|
174
|
+
const file = File_1.File.from({
|
|
175
175
|
id: core_1.CoreId.from(response.id),
|
|
176
176
|
secretKey: metadataKey,
|
|
177
177
|
isOwn: true
|
|
@@ -202,7 +202,7 @@ class FileController extends TransportController_1.TransportController {
|
|
|
202
202
|
throw CoreErrors.General.SignatureNotValid("file").logWith(this._log)
|
|
203
203
|
}
|
|
204
204
|
*/
|
|
205
|
-
const cipher =
|
|
205
|
+
const cipher = crypto_1.CryptoCipher.fromBase64(buffer.toBase64URL());
|
|
206
206
|
const decrypt = await core_1.CoreCrypto.decrypt(cipher, file.cache.cipherKey);
|
|
207
207
|
const plaintextHashesMatch = await file.cache.plaintextHash.verify(decrypt, 2 /* SHA512 */);
|
|
208
208
|
if (!plaintextHashesMatch) {
|