Show courier delivered cards warning when card is not activated

WE2-1182

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

lib/libelectronic-id

@@ -55,7 +55,8 @@ struct EidCertificateAndPinInfo
     QSslCertificate certificate {};
     CertificateInfo certInfo;
     PinInfo pinInfo;
-    bool cardActive = true;
+    bool pin1Active = true;
+    bool pin2Active = true;
 };
 
 Q_DECLARE_METATYPE(EidCertificateAndPinInfo)

src/controller/certandpininfo.hpp

@@ -31,7 +31,7 @@ using namespace electronic_id;
 namespace
 {
 
-EidCertificateAndPinInfo getCertificateWithStatusAndInfo(const ElectronicID::ptr& eid,
+EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid,
                                                          const CertificateType certificateType)
 {
     const auto certificateBytes = eid->getCertificate(certificateType);
@@ -70,19 +70,23 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(const ElectronicID::ptr
                          info.maxRetry,
                      },
                      .readerHasPinPad = eid->smartcard().readerHasPinPad()};
-    bool cardActivated = info.pinActive;
-    if (certificateType == CertificateType::AUTHENTICATION && eid->type() == ElectronicID::EstEID
-        && eid->name() == "EstEIDThales") {
-        cardActivated = eid->signingPinInfo().pinActive;
+    bool pin1Active = true;
+    bool pin2Active = true;
+    if (eid->type() == ElectronicID::EstEID && eid->name() == "EstEIDThales") {
+        auto infoOther =
+            certificateType.isAuthentication() ? eid->signingPinInfo() : eid->authPinInfo();
+        pin1Active = certificateType.isAuthentication() ? info.pinActive : infoOther.pinActive;
+        pin2Active = certificateType.isAuthentication() ? infoOther.pinActive : info.pinActive;
     }
 
     return {
-        .eid = eid,
+        .eid = std::move(eid),
         .certificateBytesInDer = std::move(certificateDer),
         .certificate = certificate,
         .certInfo = std::move(certInfo),
         .pinInfo = std::move(pinInfo),
-        .cardActive = cardActivated,
+        .pin1Active = pin1Active,
+        .pin2Active = pin2Active,
     };
 }
 
@@ -96,7 +100,7 @@ CertificateReader::CertificateReader(const CommandWithArguments& cmd) : CommandH
     }
 }
 
-void CertificateReader::run(const std::vector<ElectronicID::ptr>& eids)
+void CertificateReader::run(std::vector<ElectronicID::ptr>&& eids)
 {
     REQUIRE_NOT_EMPTY_CONTAINS_NON_NULL_PTRS(eids)
 
@@ -105,9 +109,10 @@ void CertificateReader::run(const std::vector<ElectronicID::ptr>& eids)
 
     std::vector<EidCertificateAndPinInfo> certAndPinInfos;
     certAndPinInfos.reserve(eids.size());
-    for (const auto& eid : eids) {
+    for (auto& eid : eids) {
         try {
-            certAndPinInfos.push_back(getCertificateWithStatusAndInfo(eid, certificateType));
+            certAndPinInfos.push_back(
+                getCertificateWithStatusAndInfo(std::move(eid), certificateType));
         } catch (const WrongCertificateTypeError&) {
             // Ignore eIDs that don't support the given ceritifcate type.
         }

src/controller/command-handlers/certificatereader.cpp

@@ -33,7 +33,7 @@ class CertificateReader : public CommandHandler
 public:
     explicit CertificateReader(const CommandWithArguments& cmd);
 
-    void run(const std::vector<electronic_id::ElectronicID::ptr>& eids) override;
+    void run(std::vector<electronic_id::ElectronicID::ptr>&& eids) override;
     void connectSignals(const WebEidUI* window) override;
 
 protected:

src/controller/command-handlers/certificatereader.hpp

@@ -33,7 +33,7 @@ class CommandHandler : public QObject
 public:
     using ptr = std::unique_ptr<CommandHandler>;
 
-    virtual void run(const std::vector<electronic_id::ElectronicID::ptr>& eids) = 0;
+    virtual void run(std::vector<electronic_id::ElectronicID::ptr>&& eids) = 0;
     virtual void connectSignals(const WebEidUI* window) = 0;
     virtual QVariantMap onConfirm(WebEidUI* window,
                                   const EidCertificateAndPinInfo& certAndPinInfo) = 0;

src/controller/commandhandler.hpp

@@ -28,5 +28,4 @@
 
 Q_DECLARE_METATYPE(electronic_id::AutoSelectFailed::Reason)
 Q_DECLARE_METATYPE(electronic_id::ElectronicID::ptr)
-Q_DECLARE_METATYPE(std::vector<electronic_id::ElectronicID::ptr>)
 Q_DECLARE_METATYPE(electronic_id::VerifyPinFailed::Status)

src/controller/qeid.hpp

@@ -39,7 +39,7 @@ class CommandHandlerRunThread : public ControllerChildThread
     }
 
 private:
-    void doRun() override { commandHandler.run(eids); }
+    void doRun() override { commandHandler.run(std::move(eids)); }
 
     CommandHandler& commandHandler;
     std::vector<electronic_id::ElectronicID::ptr> eids;

src/controller/threads/commandhandlerrunthread.hpp

@@ -23,7 +23,7 @@
    <string notr="true">QWidget {
 background-color: white;
 font-size: 14px;
-font-family: &quot;Roboto&quot;;
+font-family: Roboto, Helvetica;
 color: black;
 }
 QPushButton {
@@ -46,14 +46,19 @@ color: white;
 border-color: #2F70B6;
 background-color: #2F70B6;
 }
-QPushButton::default:hover, #helpButton:hover {
+QPushButton::default:hover, QPushButton::default:focus,
+#helpButton:hover, #helpButton:focus {
 border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton::default:pressed, #helpButton:pressed {
 border-color: #215081;
 background-color: #215081;
 }
+QPushButton:default:disabled {
+border-color: #82A9D3;
+background-color: #82A9D3;
+}
 #langButton {
 color: #003168;
 border: 0px;
@@ -182,7 +187,7 @@ border: none;
 border-radius: 4px;</string>
      </property>
      <property name="text">
-      <string>Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</string>
+      <string notr="true">Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/ui/dialog.ui

@@ -184,9 +184,13 @@
         <translation>Operace se nezdařila</translation>
     </message>
     <message>
-        <source>PIN entry disabled</source>
+        <source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. &lt;a href=&quot;https://www.politsei.ee/en/self-service-portal&quot;&gt;Activate ID-card&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>PIN entry disabled</source>
+        <translation>Zadávání PINu je zakázáno</translation>
+    </message>
     <message>
         <source>Card driver error. Please try again.</source>
         <translation>Chyba ovladače karty. Zkuste to prosím znovu.</translation>
@@ -308,10 +312,6 @@
         <comment>Active language</comment>
         <translation>CS</translation>
     </message>
-    <message>
-        <source>PIN entry disabled</source>
-        <translation>Zadávání PINu je zakázáno.</translation>
-    </message>
     <message>
         <source>English</source>
         <comment>Active language accessible</comment>

src/ui/translations/cs.ts

@@ -182,9 +182,13 @@
         <translation>Der Vorgang ist fehlgeschlagen</translation>
     </message>
     <message>
-        <source>PIN entry disabled</source>
+        <source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. &lt;a href=&quot;https://www.politsei.ee/en/self-service-portal&quot;&gt;Activate ID-card&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>PIN entry disabled</source>
+        <translation>PIN-Eingabe deaktiviert</translation>
+    </message>
     <message>
         <source>Card driver error. Please try again.</source>
         <translation>Kartentreiberfehler. Bitte versuche es erneut.</translation>
@@ -306,10 +310,6 @@
         <comment>Active language</comment>
         <translation>DE</translation>
     </message>
-    <message>
-        <source>PIN entry disabled</source>
-        <translation>PIN-Eingabe deaktiviert.</translation>
-    </message>
     <message>
         <source>English</source>
         <comment>Active language accessible</comment>