@nmshd/transport 2.0.0-beta.10 → 2.0.0-beta.11

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.
Files changed (14) hide show
  1. package/dist/buildInformation.js +4 -4
  2. package/dist/core/Transport.d.ts +2 -0
  3. package/dist/core/Transport.js +5 -1
  4. package/dist/core/Transport.js.map +1 -1
  5. package/dist/modules/accounts/AccountController.d.ts +1 -5
  6. package/dist/modules/accounts/AccountController.js +7 -6
  7. package/dist/modules/accounts/AccountController.js.map +1 -1
  8. package/dist/modules/accounts/backbone/IdentityClient.d.ts +1 -0
  9. package/dist/modules/accounts/backbone/IdentityClient.js.map +1 -1
  10. package/lib-web/nmshd.transport.js +16 -11
  11. package/lib-web/nmshd.transport.js.map +1 -1
  12. package/lib-web/nmshd.transport.min.js +1 -1
  13. package/lib-web/nmshd.transport.min.js.map +1 -1
  14. package/package.json +1 -1
package/dist/buildInformation.js CHANGED
@@ -4,10 +4,10 @@ exports.buildInformation = void 0;
4
4
  const ts_serval_1 = require("@js-soft/ts-serval");
5
5
  const crypto_1 = require("@nmshd/crypto");
6
6
  exports.buildInformation = {
7
- version: "2.0.0-beta.10",
8
- build: "41",
9
- date: "2022-10-04T10:55:16+00:00",
10
- commit: "6b78f7f4e253a165c87b5e35893cc46c4abcfcd5",
7
+ version: "2.0.0-beta.11",
8
+ build: "42",
9
+ date: "2022-10-05T07:12:57+00:00",
10
+ commit: "8c01f49b6e1d1ba1b266662d3a90f09300011d93",
11
11
  dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.3.0","axios":"^0.27.2","deep-equal":"^2.0.5","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.0.4","qs":"^6.11.0","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
12
12
  libraries: {
13
13
  crypto: crypto_1.buildInformation,
package/dist/core/Transport.d.ts CHANGED
@@ -9,6 +9,7 @@ import { Realm } from "../modules/accounts/data/Identity";
9
9
  import { TransportContext } from "./TransportContext";
10
10
  export interface IConfig {
11
11
  supportedDatawalletVersion: number;
12
+ supportedIdentityVersion: number;
12
13
  debug: boolean;
13
14
  platformClientId: string;
14
15
  platformClientSecret: string;
@@ -26,6 +27,7 @@ export interface IConfigOverwrite {
26
27
  debug?: boolean;
27
28
  platformClientId: string;
28
29
  platformClientSecret: string;
30
+ supportedIdentityVersion: number;
29
31
  platformTimeout?: number;
30
32
  platformMaxRedirects?: number;
31
33
  platformMaxUnencryptedFileSize?: number;
package/dist/core/Transport.js CHANGED
@@ -30,7 +30,10 @@ class Transport {
30
30
  throw CoreErrors_1.CoreErrors.general.baseUrlNotSet().logWith(log);
31
31
  }
32
32
  if (this._config.supportedDatawalletVersion < 1) {
33
- throw new TransportError_1.TransportError("The given identity version is invalid. The value must be 0 or higher.");
33
+ throw new TransportError_1.TransportError("The given supported datawallet version is invalid. The value must be 1 or higher.");
34
+ }
35
+ if (this._config.supportedIdentityVersion < 1) {
36
+ throw new TransportError_1.TransportError("The given supported identity version is invalid. The value must be 1 or higher.");
34
37
  }
35
38
  if (this._config.realm.length !== 3) {
36
39
  throw CoreErrors_1.CoreErrors.general.realmLength();
@@ -56,6 +59,7 @@ class Transport {
56
59
  exports.Transport = Transport;
57
60
  Transport.defaultConfig = {
58
61
  supportedDatawalletVersion: 1,
62
+ supportedIdentityVersion: -1,
59
63
  debug: false,
60
64
  platformClientId: "",
61
65
  platformClientSecret: "",
package/dist/core/Transport.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Transport.js","sourceRoot":"","sources":["../../src/core/Transport.ts"],"names":[],"mappings":";;;;;;AAEA,0DAA4D;AAE5D,0CAA6C;AAG7C,oDAAsB;AACtB,gEAAyD;AACzD,6CAAyC;AACzC,yDAAqD;AACrD,qDAAiD;AACjD,qEAAiE;AAEjE,IAAI,GAAY,CAAA;AAiChB,MAAa,SAAS;IA+BlB,YACI,kBAAuC,EACvC,YAA8B,EACd,QAAkB,EAClC,gBAAgC,IAAI,mCAAmB,EAAE;QADzC,aAAQ,GAAR,QAAQ,CAAU;QAGlC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,gBAAC,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC,CAAA;QAExE,+CAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC1C,GAAG,GAAG,+CAAsB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAEjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;YAChC,MAAM,uBAAU,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SACjE;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;YACpC,MAAM,uBAAU,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SACrE;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACvB,MAAM,uBAAU,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SACxD;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,0BAA0B,GAAG,CAAC,EAAE;YAC7C,MAAM,IAAI,+BAAc,CAAC,uEAAuE,CAAC,CAAA;SACpG;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,uBAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAA;SACzC;IACL,CAAC;IA1DD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IA0DM,KAAK,CAAC,IAAI;QACb,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;QACtC,MAAM,sBAAa,CAAC,KAAK,EAAE,CAAA;QAC3B,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAElC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QAEjC,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,IAAY;QACpC,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAEM,MAAM,KAAK,OAAO;QACrB,OAAO,mCAAgB,CAAC,cAAc,EAAE,CAAA;IAC5C,CAAC;;AAhFL,8BAiFC;AAzE2B,uBAAa,GAAY;IAC7C,0BAA0B,EAAE,CAAC;IAC7B,KAAK,EAAE,KAAK;IACZ,gBAAgB,EAAE,EAAE;IACpB,oBAAoB,EAAE,EAAE;IACxB,eAAe,EAAE,KAAK;IACtB,oBAAoB,EAAE,EAAE;IACxB,8BAA8B,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAChD,OAAO,EAAE,EAAE;IACX,KAAK,EAAE,gBAAK,CAAC,IAAI;IACjB,iBAAiB,EAAE,KAAK;IACxB,SAAS,EAAE;QACP,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,CAAC;QACb,cAAc,EAAE,CAAC;KACpB;IACD,UAAU,EAAE;QACR,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,CAAC;QACb,cAAc,EAAE,CAAC;KACpB;CACJ,CAAA"}
1
+ {"version":3,"file":"Transport.js","sourceRoot":"","sources":["../../src/core/Transport.ts"],"names":[],"mappings":"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"}
package/dist/modules/accounts/AccountController.d.ts CHANGED
@@ -22,7 +22,6 @@ import { SyncProgressCallback } from "../sync/SyncCallback";
22
22
  import { SynchronizedCollection } from "../sync/SynchronizedCollection";
23
23
  import { TokenController } from "../tokens/TokenController";
24
24
  import { IdentityClient } from "./backbone/IdentityClient";
25
- import { Identity, Realm } from "./data/Identity";
26
25
  import { IdentityController } from "./IdentityController";
27
26
  export declare class AccountController {
28
27
  private readonly _transport;
@@ -70,10 +69,7 @@ export declare class AccountController {
70
69
  syncEverything(syncProgressCallback?: SyncProgressCallback): Promise<ChangedItems>;
71
70
  getLastCompletedSyncTime(): Promise<CoreDate | undefined>;
72
71
  getLastCompletedDatawalletSyncTime(): Promise<CoreDate | undefined>;
73
- createIdentityAndDevice(realm?: Realm): Promise<{
74
- identity: Identity;
75
- device: Device;
76
- }>;
72
+ private createIdentityAndDevice;
77
73
  onboardDevice(deviceSharedSecret: DeviceSharedSecret): Promise<Device>;
78
74
  registerPushNotificationToken(token: BackbonePutDevicesPushNotificationRequest): Promise<void>;
79
75
  fetchDeviceInfo(): Promise<DeviceInfo>;
package/dist/modules/accounts/AccountController.js CHANGED
@@ -102,7 +102,7 @@ class AccountController {
102
102
  if (!deviceSharedSecret) {
103
103
  // Identity creation
104
104
  this._log.trace("No account information found. Creating new account...");
105
- const result = await this.createIdentityAndDevice(this.config.realm);
105
+ const result = await this.createIdentityAndDevice();
106
106
  identityCreated = true;
107
107
  device = result.device;
108
108
  this.deviceAuthClient = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.authenticator);
@@ -191,7 +191,7 @@ class AccountController {
191
191
  async getLastCompletedDatawalletSyncTime() {
192
192
  return await this.synchronization.getLastCompletedDatawalletSyncTime();
193
193
  }
194
- async createIdentityAndDevice(realm = Identity_1.Realm.Prod) {
194
+ async createIdentityAndDevice() {
195
195
  const [identityKeypair, devicePwdD1, deviceKeypair, privBaseShared, privBaseDevice] = await Promise.all([
196
196
  // Generate identity keypair
197
197
  CoreCrypto_1.CoreCrypto.generateSignatureKeypair(),
@@ -215,12 +215,13 @@ class AccountController {
215
215
  identityPublicKey: identityKeypair.publicKey.toBase64(),
216
216
  signedChallenge: signedChallenge.toJSON(false),
217
217
  clientId: this._config.platformClientId,
218
- clientSecret: this._config.platformClientSecret
218
+ clientSecret: this._config.platformClientSecret,
219
+ identityVersion: this._config.supportedIdentityVersion
219
220
  }),
220
221
  // Generate Synchronization Root Key
221
222
  CoreCrypto_1.CoreCrypto.generateSecretKey(),
222
223
  // Generate address locally
223
- IdentityUtil_1.IdentityUtil.createAddress(identityKeypair.publicKey, realm),
224
+ IdentityUtil_1.IdentityUtil.createAddress(identityKeypair.publicKey, this._config.realm),
224
225
  this.fetchDeviceInfo()
225
226
  ]);
226
227
  if (deviceResponseResult.isError) {
@@ -236,7 +237,7 @@ class AccountController {
236
237
  }
237
238
  const identity = Identity_1.Identity.from({
238
239
  address: core_1.CoreAddress.from(deviceResponse.address),
239
- realm: realm,
240
+ realm: this._config.realm,
240
241
  publicKey: identityKeypair.publicKey
241
242
  });
242
243
  const deviceId = core_1.CoreId.from(deviceResponse.device.id);
@@ -351,7 +352,7 @@ __decorate([
351
352
  __decorate([
352
353
  (0, ts_utils_1.log)(),
353
354
  __metadata("design:type", Function),
354
- __metadata("design:paramtypes", [String]),
355
+ __metadata("design:paramtypes", []),
355
356
  __metadata("design:returntype", Promise)
356
357
  ], AccountController.prototype, "createIdentityAndDevice", null);
357
358
  exports.AccountController = AccountController;
package/dist/modules/accounts/AccountController.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccountController.js","sourceRoot":"","sources":["../../../src/modules/accounts/AccountController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AccountController.js","sourceRoot":"","sources":["../../../src/modules/accounts/AccountController.ts"],"names":[],"mappings":"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"}
package/dist/modules/accounts/backbone/IdentityClient.d.ts CHANGED
@@ -7,6 +7,7 @@ export interface PlatformIdentityPostRequest {
7
7
  signedChallenge: IChallengeSignedSerialized;
8
8
  clientId: string;
9
9
  clientSecret: string;
10
+ identityVersion: number;
10
11
  }
11
12
  export interface PlatformIdentityDevice {
12
13
  id: string;
package/dist/modules/accounts/backbone/IdentityClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IdentityClient.js","sourceRoot":"","sources":["../../../../src/modules/accounts/backbone/IdentityClient.ts"],"names":[],"mappings":";;;AAAA,wCAAkE;AAuBlE,MAAa,cAAe,SAAQ,iBAAU;IAA9C;;QACuB,kBAAa,GAAG,6BAAsB,CAAC,WAAW,CAAA;IAOzE,CAAC;IALU,KAAK,CAAC,cAAc,CACvB,KAAkC;QAElC,OAAO,MAAM,IAAI,CAAC,IAAI,CAA+B,oBAAoB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IACzF,CAAC;CACJ;AARD,wCAQC"}
1
+ {"version":3,"file":"IdentityClient.js","sourceRoot":"","sources":["../../../../src/modules/accounts/backbone/IdentityClient.ts"],"names":[],"mappings":";;;AAAA,wCAAkE;AAwBlE,MAAa,cAAe,SAAQ,iBAAU;IAA9C;;QACuB,kBAAa,GAAG,6BAAsB,CAAC,WAAW,CAAA;IAOzE,CAAC;IALU,KAAK,CAAC,cAAc,CACvB,KAAkC;QAElC,OAAO,MAAM,IAAI,CAAC,IAAI,CAA+B,oBAAoB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IACzF,CAAC;CACJ;AARD,wCAQC"}
package/lib-web/nmshd.transport.js CHANGED
@@ -15,10 +15,10 @@ exports.buildInformation = void 0;
15
15
  const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
16
16
  const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
17
17
  exports.buildInformation = {
18
- version: "2.0.0-beta.10",
19
- build: "41",
20
- date: "2022-10-04T10:55:16+00:00",
21
- commit: "6b78f7f4e253a165c87b5e35893cc46c4abcfcd5",
18
+ version: "2.0.0-beta.11",
19
+ build: "42",
20
+ date: "2022-10-05T07:12:57+00:00",
21
+ commit: "8c01f49b6e1d1ba1b266662d3a90f09300011d93",
22
22
  dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.3.0","axios":"^0.27.2","deep-equal":"^2.0.5","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.0.4","qs":"^6.11.0","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
23
23
  libraries: {
24
24
  crypto: crypto_1.buildInformation,
@@ -902,7 +902,10 @@ class Transport {
902
902
  throw CoreErrors_1.CoreErrors.general.baseUrlNotSet().logWith(log);
903
903
  }
904
904
  if (this._config.supportedDatawalletVersion < 1) {
905
- throw new TransportError_1.TransportError("The given identity version is invalid. The value must be 0 or higher.");
905
+ throw new TransportError_1.TransportError("The given supported datawallet version is invalid. The value must be 1 or higher.");
906
+ }
907
+ if (this._config.supportedIdentityVersion < 1) {
908
+ throw new TransportError_1.TransportError("The given supported identity version is invalid. The value must be 1 or higher.");
906
909
  }
907
910
  if (this._config.realm.length !== 3) {
908
911
  throw CoreErrors_1.CoreErrors.general.realmLength();
@@ -928,6 +931,7 @@ class Transport {
928
931
  exports.Transport = Transport;
929
932
  Transport.defaultConfig = {
930
933
  supportedDatawalletVersion: 1,
934
+ supportedIdentityVersion: -1,
931
935
  debug: false,
932
936
  platformClientId: "",
933
937
  platformClientSecret: "",
@@ -2899,7 +2903,7 @@ class AccountController {
2899
2903
  if (!deviceSharedSecret) {
2900
2904
  // Identity creation
2901
2905
  this._log.trace("No account information found. Creating new account...");
2902
- const result = await this.createIdentityAndDevice(this.config.realm);
2906
+ const result = await this.createIdentityAndDevice();
2903
2907
  identityCreated = true;
2904
2908
  device = result.device;
2905
2909
  this.deviceAuthClient = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.authenticator);
@@ -2988,7 +2992,7 @@ class AccountController {
2988
2992
  async getLastCompletedDatawalletSyncTime() {
2989
2993
  return await this.synchronization.getLastCompletedDatawalletSyncTime();
2990
2994
  }
2991
- async createIdentityAndDevice(realm = Identity_1.Realm.Prod) {
2995
+ async createIdentityAndDevice() {
2992
2996
  const [identityKeypair, devicePwdD1, deviceKeypair, privBaseShared, privBaseDevice] = await Promise.all([
2993
2997
  // Generate identity keypair
2994
2998
  CoreCrypto_1.CoreCrypto.generateSignatureKeypair(),
@@ -3012,12 +3016,13 @@ class AccountController {
3012
3016
  identityPublicKey: identityKeypair.publicKey.toBase64(),
3013
3017
  signedChallenge: signedChallenge.toJSON(false),
3014
3018
  clientId: this._config.platformClientId,
3015
- clientSecret: this._config.platformClientSecret
3019
+ clientSecret: this._config.platformClientSecret,
3020
+ identityVersion: this._config.supportedIdentityVersion
3016
3021
  }),
3017
3022
  // Generate Synchronization Root Key
3018
3023
  CoreCrypto_1.CoreCrypto.generateSecretKey(),
3019
3024
  // Generate address locally
3020
- IdentityUtil_1.IdentityUtil.createAddress(identityKeypair.publicKey, realm),
3025
+ IdentityUtil_1.IdentityUtil.createAddress(identityKeypair.publicKey, this._config.realm),
3021
3026
  this.fetchDeviceInfo()
3022
3027
  ]);
3023
3028
  if (deviceResponseResult.isError) {
@@ -3033,7 +3038,7 @@ class AccountController {
3033
3038
  }
3034
3039
  const identity = Identity_1.Identity.from({
3035
3040
  address: core_1.CoreAddress.from(deviceResponse.address),
3036
- realm: realm,
3041
+ realm: this._config.realm,
3037
3042
  publicKey: identityKeypair.publicKey
3038
3043
  });
3039
3044
  const deviceId = core_1.CoreId.from(deviceResponse.device.id);
@@ -3148,7 +3153,7 @@ __decorate([
3148
3153
  __decorate([
3149
3154
  (0, ts_utils_1.log)(),
3150
3155
  __metadata("design:type", Function),
3151
- __metadata("design:paramtypes", [String]),
3156
+ __metadata("design:paramtypes", []),
3152
3157
  __metadata("design:returntype", Promise)
3153
3158
  ], AccountController.prototype, "createIdentityAndDevice", null);
3154
3159
  exports.AccountController = AccountController;