refactor: streamline device identifier handling and error management #230
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,37 @@ | ||
| import { DependencyInjectionUserProvider } from './../../../apps/shared/dependency-injection/DependencyInjectionUserProvider'; | ||
| import { createNewDevice } from './createNewDevice'; | ||
| import { BrowserWindow } from 'electron'; | ||
| import { broadcastToWindows } from '../../../apps/main/windows'; | ||
| import { logger } from '@internxt/drive-desktop-core/build/backend'; | ||
| import { getDeviceIdentifier } from './getDeviceIdentifier'; | ||
|
|
||
| export async function createAndSetupNewDevice() { | ||
| const { error, data: deviceIdentifier } = getDeviceIdentifier(); | ||
| if (error) return { error }; | ||
|
|
||
| const createNewDeviceEither = await createNewDevice(deviceIdentifier); | ||
| if (createNewDeviceEither.isLeft()) { | ||
| logger.error({ | ||
| tag: 'BACKUPS', | ||
| msg: '[DEVICE] Error creating new device', | ||
| error: createNewDeviceEither.getLeft(), | ||
| }); | ||
| return { error: createNewDeviceEither.getLeft() }; | ||
| } | ||
|
|
||
| const device = createNewDeviceEither.getRight(); | ||
| const user = DependencyInjectionUserProvider.get(); | ||
| user.backupsBucket = device.bucket; | ||
|
|
||
| const mainWindow = BrowserWindow.getAllWindows()[0]; | ||
| if (mainWindow) { | ||
| mainWindow.webContents.send('reinitialize-backups'); | ||
| } | ||
| broadcastToWindows('device-created', device); | ||
| logger.debug({ | ||
| tag: 'BACKUPS', | ||
| msg: '[DEVICE] Created new device', | ||
| deviceUUID: device.uuid, | ||
| }); | ||
| return { data: device }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,59 @@ | ||
| import { driveServerModule } from './../../../infra/drive-server/drive-server.module'; | ||
| import { logger } from '@internxt/drive-desktop-core/build/backend'; | ||
| import { BackupError } from '../../../infra/drive-server/services/backup/backup.error'; | ||
| import { addUnknownDeviceIssue } from './addUnknownDeviceIssue'; | ||
| import { DeviceIdentifierDTO } from './device.types'; | ||
|
|
||
| export type FetchDeviceProps = { deviceIdentifier: DeviceIdentifierDTO } | { uuid: string } | { legacyId: string }; | ||
|
|
||
| async function getDeviceByProps(props: FetchDeviceProps) { | ||
|
There was a problem hiding this comment. [Non blocking] Just to give some information. We found that maybe this is no longer necessary since this is just a backup to recover to the device identifier of the user in case the app is uninstalled. However, the backup paths are lost anyway, so this doesn't provide a solution. |
||
| if ('deviceIdentifier' in props) { | ||
| const query = { | ||
| key: props.deviceIdentifier.key, | ||
| platform: props.deviceIdentifier.platform, | ||
| hostname: props.deviceIdentifier.hostname, | ||
| limit: 1, | ||
| offset: 0, | ||
| }; | ||
| const { error, data } = await driveServerModule.backup.getDevicesByIdentifier({ query }); | ||
| if (error) return { error }; | ||
|
|
||
| if (data.length === 0) { | ||
| return { error: new BackupError('Device not found with given identifier', 'NOT_FOUND') }; | ||
| } | ||
|
|
||
| return { data: data[0] }; | ||
| } else { | ||
| const deviceResult = | ||
| 'uuid' in props | ||
| ? await driveServerModule.backup.getDevice(props.uuid) | ||
| : await driveServerModule.backup.getDeviceById(props.legacyId); | ||
|
|
||
| if (deviceResult.isLeft()) return { error: deviceResult.getLeft() }; | ||
|
|
||
| return { data: deviceResult.getRight() }; | ||
| } | ||
| } | ||
|
|
||
| export async function fetchDevice(props: FetchDeviceProps) { | ||
| const { error, data } = await getDeviceByProps(props); | ||
|
|
||
| if (error) { | ||
| if (error instanceof BackupError && error.code === 'NOT_FOUND') { | ||
| const msg = 'Device not found'; | ||
| logger.debug({ tag: 'BACKUPS', msg: `[DEVICE] ${msg}` }); | ||
| addUnknownDeviceIssue(new Error(msg)); | ||
| } | ||
|
|
||
| if (error instanceof BackupError && error.code === 'FORBIDDEN') { | ||
| const msg = 'Device request returned forbidden'; | ||
| logger.debug({ tag: 'BACKUPS', msg: `[DEVICE] ${msg}` }); | ||
| addUnknownDeviceIssue(new Error(msg)); | ||
| } | ||
|
|
||
| logger.error({ tag: 'BACKUPS', msg: '[DEVICE] Error fetching device', error: error.name }); | ||
| return { error }; | ||
| } | ||
|
|
||
| return { data }; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically
backupsBucketis always defined so we shouldn't do this anymore. We had the same code on windows and we deleted it. Check if that's true and you can simplify this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran some tests and confirmed that the backupsBucket does not exist for new users until they create their first device, so this line is still necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh shit, then we have a bug on windows. Thanks for the info :)