rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(fix): fixes sync response not correctly identifying all errors (#2346)

Browse Source
This commit is contained in:
Mo
2023-07-05 11:28:45 -05:00
committed by GitHub
parent 2a050fd966
commit 0ab6b5c6fe
19 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/services/src/Domain/AsymmetricMessage/UseCase/GetInboundAsymmetricMessages.ts
View File

@@ -8,7 +8,7 @@ export class GetInboundAsymmetricMessages {
const response = await this.messageServer.getMessages()
if (isErrorResponse(response)) {
return ClientDisplayableError.FromError(response.data.error)
return ClientDisplayableError.FromNetworkError(response)
}
return response.data.messages

2
packages/services/src/Domain/AsymmetricMessage/UseCase/GetOutboundAsymmetricMessages.ts
View File

@@ -8,7 +8,7 @@ export class GetOutboundAsymmetricMessages {
const response = await this.messageServer.getOutboundUserMessages()
if (isErrorResponse(response)) {
return ClientDisplayableError.FromError(response.data.error)
return ClientDisplayableError.FromNetworkError(response)
}
return response.data.messages

2
packages/services/src/Domain/AsymmetricMessage/UseCase/SendAsymmetricMessageUseCase.ts
View File

@@ -16,7 +16,7 @@ export class SendAsymmetricMessageUseCase {
})
if (isErrorResponse(response)) {
return ClientDisplayableError.FromError(response.data.error)
return ClientDisplayableError.FromNetworkError(response)
}
return response.data.message

4
packages/services/src/Domain/Files/FileService.ts
View File

@@ -386,7 +386,7 @@ export class FileService extends AbstractService implements FilesClientInterface
const result = await this.api.deleteFile(tokenResult, file.shared_vault_uuid ? 'shared-vault' : 'user')
if (result.data?.error) {
if (isErrorResponse(result)) {
const deleteAnyway = await this.alertService.confirm(
spaceSeparatedStrings(
'This file could not be deleted from the server, possibly because you are attempting to delete a file item',
@@ -400,7 +400,7 @@ export class FileService extends AbstractService implements FilesClientInterface
)
if (!deleteAnyway) {
return ClientDisplayableError.FromError(result.data?.error)
return ClientDisplayableError.FromNetworkError(result)
}
}

8
packages/services/src/Domain/Revision/RevisionManager.ts
View File

@@ -1,6 +1,6 @@
import { RevisionApiServiceInterface } from '@standardnotes/api'
import { Uuid } from '@standardnotes/domain-core'
import { isErrorResponse } from '@standardnotes/responses'
import { getErrorFromErrorResponse, isErrorResponse } from '@standardnotes/responses'
import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
import { AbstractService } from '../Service/AbstractService'
@@ -21,7 +21,7 @@ export class RevisionManager extends AbstractService implements RevisionClientIn
const result = await this.revisionApiService.listRevisions(itemUuid.value)
if (isErrorResponse(result)) {
throw new Error(result.data.error.message)
throw new Error(getErrorFromErrorResponse(result).message)
}
return result.data.revisions
@@ -31,7 +31,7 @@ export class RevisionManager extends AbstractService implements RevisionClientIn
const result = await this.revisionApiService.deleteRevision(itemUuid.value, revisionUuid.value)
if (isErrorResponse(result)) {
throw new Error(result.data.error.message)
throw new Error(getErrorFromErrorResponse(result).message)
}
return result.data.message
@@ -41,7 +41,7 @@ export class RevisionManager extends AbstractService implements RevisionClientIn
const result = await this.revisionApiService.getRevision(itemUuid.value, revisionUuid.value)
if (isErrorResponse(result)) {
throw new Error(result.data.error.message)
throw new Error(getErrorFromErrorResponse(result).message)
}
return result.data.revision

2
packages/services/src/Domain/SharedVaults/UseCase/SendSharedVaultInviteUseCase.ts
View File

@@ -23,7 +23,7 @@ export class SendSharedVaultInviteUseCase {
})
if (isErrorResponse(response)) {
return ClientDisplayableError.FromError(response.data.error)
return ClientDisplayableError.FromNetworkError(response)
}
return response.data.invite

2
packages/services/src/Domain/SharedVaults/UseCase/UpdateSharedVaultInvite.ts
View File

@@ -23,7 +23,7 @@ export class UpdateSharedVaultInviteUseCase {
})
if (isErrorResponse(response)) {
return ClientDisplayableError.FromError(response.data.error)
return ClientDisplayableError.FromNetworkError(response)
}
return response.data.invite

6
packages/services/src/Domain/Subscription/SubscriptionManager.ts
View File

@@ -4,7 +4,7 @@ import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface
import { AbstractService } from '../Service/AbstractService'
import { SubscriptionClientInterface } from './SubscriptionClientInterface'
import { AppleIAPReceipt } from './AppleIAPReceipt'
import { isErrorResponse } from '@standardnotes/responses'
import { getErrorFromErrorResponse, isErrorResponse } from '@standardnotes/responses'
export class SubscriptionManager extends AbstractService implements SubscriptionClientInterface {
constructor(
@@ -19,7 +19,7 @@ export class SubscriptionManager extends AbstractService implements Subscription
const result = await this.subscriptionApiService.acceptInvite(inviteUuid)
if (isErrorResponse(result)) {
return { success: false, message: result.data.error.message }
return { success: false, message: getErrorFromErrorResponse(result).message }
}
return result.data
@@ -81,7 +81,7 @@ export class SubscriptionManager extends AbstractService implements Subscription
})
if (isErrorResponse(result)) {
return { success: false, message: result.data.error.message }
return { success: false, message: getErrorFromErrorResponse(result).message }
}
return result.data

10
packages/services/src/Domain/User/UserService.ts
View File

@@ -1,6 +1,12 @@
import { Base64String } from '@standardnotes/sncrypto-common'
import { EncryptionProviderInterface, SNRootKey, SNRootKeyParams } from '@standardnotes/encryption'
import { HttpResponse, SignInResponse, User, isErrorResponse } from '@standardnotes/responses'
import {
HttpResponse,
SignInResponse,
User,
getErrorFromErrorResponse,
isErrorResponse,
} from '@standardnotes/responses'
import { KeyParamsOrigination, UserRequestType } from '@standardnotes/common'
import { UuidGenerator } from '@standardnotes/utils'
import { UserApiServiceInterface, UserRegistrationResponseBody } from '@standardnotes/api'
@@ -227,7 +233,7 @@ export class UserService
if (isErrorResponse(response)) {
return {
error: true,
message: response.data.error.message,
message: getErrorFromErrorResponse(response).message,
}
}