Skip to content

Surface ComposeMessageError details to user #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 3 commits into from
Oct 5, 2021
Merged

Surface ComposeMessageError details to user #618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d5d2d0
Surface ComposeMessageError details to user
ivan-ushakov Oct 5, 2021
cba65da
Surface ComposeMessageError details to user
ivan-ushakov Oct 5, 2021
e99799d
Merge branch 'master' into feature/issue-586-surface-ComposeMessageEr…
flowcrypt-machine-user Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions FlowCrypt/Core/Core.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import FlowCryptCommon
import JavaScriptCore
import Combine

enum CoreError: Error, Equatable {
enum CoreError: LocalizedError, Equatable {
case exception(String)
case notReady(String)
case format(String)
Expand All @@ -18,18 +18,30 @@ enum CoreError: Error, Equatable {
// wrong value passed into a function
case value(String)

init?(coreError: CoreRes.Error) {
guard let errorType = coreError.error.type else {
return nil
}
switch errorType {
init(coreError: CoreRes.Error) {
switch coreError.error.type {
case "format": self = .format(coreError.error.message)
case "key_mismatch": self = .keyMismatch(coreError.error.message)
case "no_mdc": self = .noMDC(coreError.error.message)
case "bad_mdc": self = .badMDC(coreError.error.message)
case "need_passphrase": self = .needPassphrase(coreError.error.message)
case "wrong_passphrase": self = .wrongPassphrase(coreError.error.message)
default: return nil
default: self = .exception(coreError.error.message + "\n" + (coreError.error.stack ?? "no stack"))
}
}

var errorDescription: String? {
switch self {
case .exception(let message),
.notReady(let message),
.format(let message),
.keyMismatch(let message),
.noMDC(let message),
.badMDC(let message),
.needPassphrase(let message),
.wrongPassphrase(let message),
.value(let message):
return message
}
}
}
Expand Down Expand Up @@ -233,7 +245,7 @@ final class Core: KeyDecrypter, CoreComposeMessageType {
let errMsg = "------ js err -------\nCore \(endpoint):\n\(error.error.message)\n\(error.error.stack ?? "no stack")\n------- end js err -----"
logger.logError(errMsg)

throw CoreError.init(coreError: error) ?? CoreError.exception(errMsg)
throw CoreError(coreError: error)
}

return RawRes(json: resJsonData, data: Data(rawResponse))
Expand Down