Skip to content

Commit 82b2a2b

Browse files
ambrose40ambrose40
committed
Updates and fixes after Accessibility testing. (#179)
* NFC-140 Updates and fixes after Accessibility testing. * NFC-140 Fix auth and cert error messages in NFCViewModel logger.
1 parent da093c2 commit 82b2a2b

3 files changed

Lines changed: 50 additions & 46 deletions

File tree

‎RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,41 @@ struct NFCView: View {
249249
}
250250
},
251251
content: {
252+
if webEidViewModel.authRequest != nil {
253+
if !isWebEidAuthenticating {
254+
let origin: String = {
255+
if let authRequest = webEidViewModel.authRequest {
256+
return authRequest.origin
257+
} else {
258+
return ""
259+
}
260+
}()
261+
WebEidAuthInfo(origin: origin)
262+
}
263+
}
264+
if webEidViewModel.certRequest != nil || webEidViewModel.signRequest != nil {
265+
if !isWebEidAuthenticating {
266+
let origin: String = {
267+
if let certRequest = webEidViewModel.certRequest {
268+
return certRequest.origin
269+
} else if let signRequest = webEidViewModel.signRequest {
270+
return signRequest.origin
271+
} else {
272+
return ""
273+
}
274+
}()
275+
276+
let signingPersonInfo: String? = webEidViewModel.signRequest?.personalData.map {
277+
"\($0.givenNames) \($0.surname), \($0.personalCode)"
278+
}
279+
280+
WebEidSignOrCertificateInfo(
281+
origin: origin,
282+
isCertificateFlow: webEidViewModel.certRequest != nil,
283+
signingPersonInfo: signingPersonInfo,
284+
)
285+
}
286+
}
252287
if isInProgress {
253288
NFCActionView(
254289
leftIcon: "ic_m3_phonelink_ring_48pt_wght400",

‎RIADigiDoc/UI/Component/WebEid/WebEidView.swift‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,6 @@ struct WebEidView: View {
6363
var body: some View {
6464
ZStack {
6565
if viewModel.authRequest != nil {
66-
if !isWebEidAuthenticating {
67-
let origin: String = {
68-
if let authRequest = viewModel.authRequest {
69-
return authRequest.origin
70-
} else {
71-
return ""
72-
}
73-
}()
74-
WebEidAuthInfo(origin: origin)
75-
}
7666
NFCView(
7767
actionType: .auth,
7868
actionMethods: [
@@ -90,27 +80,6 @@ struct WebEidView: View {
9080
)
9181
}
9282
if viewModel.certRequest != nil || viewModel.signRequest != nil {
93-
if !isWebEidAuthenticating {
94-
let origin: String = {
95-
if let certRequest = viewModel.certRequest {
96-
return certRequest.origin
97-
} else if let signRequest = viewModel.signRequest {
98-
return signRequest.origin
99-
} else {
100-
return ""
101-
}
102-
}()
103-
104-
let signingPersonInfo: String? = viewModel.signRequest?.personalData.map {
105-
"\($0.givenNames) \($0.surname), \($0.personalCode)"
106-
}
107-
108-
WebEidSignOrCertificateInfo(
109-
origin: origin,
110-
isCertificateFlow: viewModel.certRequest != nil,
111-
signingPersonInfo: signingPersonInfo,
112-
)
113-
}
11483
if viewModel.certRequest != nil {
11584
NFCView(
11685
actionType: .certificate,

‎RIADigiDoc/ViewModel/Signing/NFC/NFCViewModel.swift‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ class NFCViewModel: NFCViewModelProtocol, Loggable {
368368
challenge: String,
369369
strings: NFCSessionStrings
370370
) async -> WebEidAuthReturnData? {
371-
NFCViewModel.logger().info("NFC: Starting NFC Web eID signing")
371+
NFCViewModel.logger().info("NFC: Starting NFC Web eID auth")
372372
let pin1Data = pin1.data(using: .utf8)
373373
guard let pin1Data else {
374374
NFCViewModel.logger().error("NFC: Failed to convert PIN1 to Data")
@@ -382,7 +382,7 @@ class NFCViewModel: NFCViewModelProtocol, Loggable {
382382
let userAgent = userAgentUtil.userAgent(diagnostics: .nfc, language: appLanguage)
383383

384384
do {
385-
NFCViewModel.logger().info("NFC: Starting Web eID signing operation")
385+
NFCViewModel.logger().info("NFC: Starting Web eID auth operation")
386386
let result = try await operationWebEidAuth.startOperation(
387387
canNumber: canNumber,
388388
pin1Number: SecureData(pin1Data),
@@ -391,21 +391,21 @@ class NFCViewModel: NFCViewModelProtocol, Loggable {
391391
userAgent: userAgent,
392392
strings: strings
393393
)
394-
NFCViewModel.logger().info("NFC: Web eID signature added successfully")
394+
NFCViewModel.logger().info("NFC: Web eID authenticated successfully")
395395
return result
396396
} catch {
397-
NFCViewModel.logger().error("NFC: Web eID signing operation failed")
397+
NFCViewModel.logger().error("NFC: Web eID auth operation failed")
398398

399399
if let idCardInternalError = error as? IdCardInternalError {
400400
let idCardError = idCardInternalError.getIdCardError()
401401
NFCViewModel.logger().error("NFC: IdCardError: \(idCardError)")
402-
handleIdCardError(idCardError, pinType: .pin2)
402+
handleIdCardError(idCardError, pinType: .pin1)
403403
return nil
404404
}
405405

406-
if let readCertSignError = error as? ReadCertAndSignError {
407-
NFCViewModel.logger().error("NFC: ReadCertAndSignError: \(readCertSignError.localizedDescription)")
408-
handleReadCertAndSignError(error: readCertSignError)
406+
if let webEidAuthError = error as? ReadCertAndSignError {
407+
NFCViewModel.logger().error("NFC: WebEidAuthError: \(webEidAuthError.localizedDescription)")
408+
handleReadCertAndSignError(error: webEidAuthError)
409409
return nil
410410
}
411411

@@ -426,18 +426,18 @@ class NFCViewModel: NFCViewModelProtocol, Loggable {
426426
canNumber: String,
427427
strings: NFCSessionStrings
428428
) async -> String? {
429-
NFCViewModel.logger().info("NFC: Starting NFC Web eID signing")
429+
NFCViewModel.logger().info("NFC: Starting NFC Web eID certificate")
430430

431431
do {
432-
NFCViewModel.logger().info("NFC: Starting Web eID signing operation")
432+
NFCViewModel.logger().info("NFC: Starting Web eID certificate operation")
433433
let result = try await operationReadCert.startReading(
434434
canNumber: canNumber,
435435
strings: strings
436436
)
437-
NFCViewModel.logger().info("NFC: Web eID signature added successfully")
437+
NFCViewModel.logger().info("NFC: Web eID certificate operation success")
438438
return result
439439
} catch {
440-
NFCViewModel.logger().error("NFC: Web eID signing operation failed")
440+
NFCViewModel.logger().error("NFC: Web eID certificate operation failed")
441441

442442
if let idCardInternalError = error as? IdCardInternalError {
443443
let idCardError = idCardInternalError.getIdCardError()
@@ -446,9 +446,9 @@ class NFCViewModel: NFCViewModelProtocol, Loggable {
446446
return nil
447447
}
448448

449-
if let readCertSignError = error as? ReadCertAndSignError {
450-
NFCViewModel.logger().error("NFC: ReadCertAndSignError: \(readCertSignError.localizedDescription)")
451-
handleReadCertAndSignError(error: readCertSignError)
449+
if let readCertError = error as? ReadCertAndSignError {
450+
NFCViewModel.logger().error("NFC: ReadCertError: \(readCertError.localizedDescription)")
451+
handleReadCertAndSignError(error: readCertError)
452452
return nil
453453
}
454454

0 commit comments

Comments
 (0)