diff --git a/packages/transport/src/modules/accounts/AccountController.ts b/packages/transport/src/modules/accounts/AccountController.ts index df78544ec..09cfc4a4e 100644 --- a/packages/transport/src/modules/accounts/AccountController.ts +++ b/packages/transport/src/modules/accounts/AccountController.ts @@ -18,7 +18,6 @@ import { DeviceController } from "../devices/DeviceController"; import { DeviceSecretType } from "../devices/DeviceSecretController"; import { DevicesController } from "../devices/DevicesController"; import { BackbonePutDevicesPushNotificationRequest, DeviceAuthClient } from "../devices/backbone/DeviceAuthClient"; -import { DeviceClient } from "../devices/backbone/DeviceClient"; import { Device, DeviceInfo, DeviceType } from "../devices/local/Device"; import { DeviceSecretCredentials } from "../devices/local/DeviceSecretCredentials"; import { DeviceSharedSecret } from "../devices/transmission/DeviceSharedSecret"; @@ -48,7 +47,6 @@ export class AccountController { return this._authenticator; } - public deviceClient: DeviceClient; public deviceAuthClient: DeviceAuthClient; public identityClient: IdentityClient; @@ -123,7 +121,6 @@ export class AccountController { this.info = await this.db.getMap("AccountInfo"); this.unpushedDatawalletModifications = await this.db.getCollection(DbCollectionName.UnpushedDatawalletModifications); - this.deviceClient = new DeviceClient(this.config, this._transport.correlator); this.identityClient = new IdentityClient(this.config, this._transport.correlator); this._identity = new IdentityController(this); @@ -281,7 +278,7 @@ export class AccountController { const signedChallenge = await this.challenges.createAccountCreationChallenge(identityKeypair); this._log.trace("Challenge signed. Creating device..."); - const [deviceResponseResult, privSync, localAddress, deviceInfo] = await Promise.all([ + const [createIdentityResponse, privSync, localAddress, deviceInfo] = await Promise.all([ // Register first device (and identity) on backbone this.identityClient.createIdentity({ devicePassword: devicePwdD1, @@ -299,30 +296,30 @@ export class AccountController { this.fetchDeviceInfo() ]); - if (deviceResponseResult.isError) { - const error = deviceResponseResult.error; + if (createIdentityResponse.isError) { + const error = createIdentityResponse.error; if (error.code === "error.platform.unauthorized") { throw TransportCoreErrors.general.platformClientInvalid(); } } - const deviceResponse = deviceResponseResult.value; + const createdIdentity = createIdentityResponse.value; - this._log.trace(`Registered identity with address ${deviceResponse.address}, device id is ${deviceResponse.device.id}.`); + this._log.trace(`Registered identity with address ${createdIdentity.address}, device id is ${createdIdentity.device.id}.`); - if (!localAddress.equals(deviceResponse.address)) { - throw new TransportError(`The backbone address '${deviceResponse.address}' does not match the local address '${localAddress.toString()}'.`); + if (!localAddress.equals(createdIdentity.address)) { + throw new TransportError(`The backbone address '${createdIdentity.address}' does not match the local address '${localAddress.toString()}'.`); } const identity = Identity.from({ - address: CoreAddress.from(deviceResponse.address), + address: CoreAddress.from(createdIdentity.address), publicKey: identityKeypair.publicKey }); - const deviceId = CoreId.from(deviceResponse.device.id); + const deviceId = CoreId.from(createdIdentity.device.id); const device = Device.from({ - createdAt: CoreDate.from(deviceResponse.createdAt), + createdAt: CoreDate.from(createdIdentity.createdAt), createdByDevice: deviceId, id: deviceId, name: "Device 1", @@ -331,7 +328,7 @@ export class AccountController { publicKey: deviceKeypair.publicKey, type: deviceInfo.type, certificate: "", - username: deviceResponse.device.username, + username: createdIdentity.device.username, datawalletVersion: this._config.supportedDatawalletVersion }); @@ -342,7 +339,7 @@ export class AccountController { const deviceCredentials = DeviceSecretCredentials.from({ id: device.id, - username: deviceResponse.device.username, + username: createdIdentity.device.username, password: devicePwdD1 }); diff --git a/packages/transport/src/modules/devices/backbone/DeviceAuthClient.ts b/packages/transport/src/modules/devices/backbone/DeviceAuthClient.ts index 11530a0ab..f28a81240 100644 --- a/packages/transport/src/modules/devices/backbone/DeviceAuthClient.ts +++ b/packages/transport/src/modules/devices/backbone/DeviceAuthClient.ts @@ -23,11 +23,11 @@ export class DeviceAuthClient extends RESTClientAuthenticate { protected override _logDirective = RESTClientLogDirective.LogResponse; public async changeDevicePassword(input: BackbonePutDevicesPasswordRequest): Promise> { - return await this.put("/api/v1/Devices/Self/Password", input, {}); + return await this.put("/api/v1/Devices/Self/Password", input); } public async createDevice(value: BackbonePostDevicesRequest): Promise> { - return await this.post("/api/v1/Devices", value, {}); + return await this.post("/api/v1/Devices", value); } public async deleteDevice(deviceId: string): Promise> { diff --git a/packages/transport/src/modules/devices/backbone/DeviceClient.ts b/packages/transport/src/modules/devices/backbone/DeviceClient.ts deleted file mode 100644 index bcc1f533d..000000000 --- a/packages/transport/src/modules/devices/backbone/DeviceClient.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { RESTClient, RESTClientLogDirective } from "../../../core"; -import { ClientResult } from "../../../core/backbone/ClientResult"; -import { BackbonePostDevicesRequest, BackbonePostDevicesResponse } from "./BackbonePostDevices"; - -export class DeviceClient extends RESTClient { - protected override _logDirective = RESTClientLogDirective.LogResponse; - - public async createDevice(value: BackbonePostDevicesRequest): Promise> { - return await this.post("/api/v1/Devices", value, {}); - } -} diff --git a/packages/transport/src/modules/index.ts b/packages/transport/src/modules/index.ts index 71274f426..0fb6f07ae 100644 --- a/packages/transport/src/modules/index.ts +++ b/packages/transport/src/modules/index.ts @@ -35,7 +35,6 @@ export * from "./challenges/data/ChallengeSigned"; export * from "./devices/backbone/BackbonePostDevices"; export * from "./devices/backbone/BackboneUpdateDevice"; export * from "./devices/backbone/DeviceAuthClient"; -export * from "./devices/backbone/DeviceClient"; export * from "./devices/DeviceController"; export * from "./devices/DevicesController"; export * from "./devices/DeviceSecretController";