#2396 Fix: choose correct keys for message encryption

FlowCrypt/Functionality/Services/Compose Message Helper/ComposeMessageHelper.swift

@@ -210,8 +210,15 @@ final class ComposeMessageHelper {
                 shouldUpdateLastUsed: true
             ).map(\.armored).joined(separator: "\n")
             let parsed = try await core.parseKeys(armoredOrBinary: armoredPubkeys.data())
+            // Fetch public keys which are usableForEncryption
+            // https://github.com/FlowCrypt/flowcrypt-ios/issues/2396
+            // Also fetch revoked or expired keys so that we can display correct error message
+            // UI Test title: sending message to user with expired/revoked public key produces modal
+            let keyDetails = parsed.keyDetails.filter {
+                $0.usableForEncryption || $0.revoked || !$0.isNotExpired
+            }
             recipientsWithKeys.append(
-                try RecipientWithSortedPubKeys(recipient, keyDetails: parsed.keyDetails)
+                try RecipientWithSortedPubKeys(recipient, keyDetails: keyDetails)
             )
         }
         return recipientsWithKeys

appium/api-mocks/mock-data.ts

@@ -26,7 +26,8 @@ export type MockUserName =
   | 'expired'
   | 'revoked'
   | 'sunit'
-  | 'ioan';
+  | 'ioan'
+  | 'signOnlyKey';
 
 export const MockUserList: Record<MockUserName, MockUser> = {
   e2e: {
@@ -549,6 +550,40 @@ AASLCQgHBZUKCQgLAAoJEJs5ASDX+41RueYA/ixPnWLYX6tP0oR81hOWS6dH
 r9FLVFOGo9cLLDfqwMR5AP9A4dgF5OprbpTvNJDeuTwfKOWREm/HNYyiBuUb
 yBWYAw==
 =n23p
+-----END PGP PUBLIC KEY BLOCK-----`,
+  },
+  signOnlyKey: {
+    email: '[email protected]',
+    name: 'Test Sign Only Key',
+    pub: `-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mI0EZTfdTwEEAL2nnK6jibqcA45SQBR1G5VyQFidaBys9J6iQCCzM4pqixQBNhtn
+sB+vpM9lOU3OJpAw0L9TvAD6NX1408sd/sKyB0BxijFo7wzRmHqABpODjrg5Xo0S
+wQvbnW+S8Fo45RBpMcLDp4YiKZNNUF0wZidoQ0f5ZSkdXtzqycFITo8LABEBAAG0
+NVRlc3QgU2lnbiBPbmx5IEtleSA8dGVzdC1zaWduLW9ubHkta2V5QGZsb3djcnlw
+dC5jb20+iM4EEwEIADgWIQQbxlud/OL0tdmLaT1HUD6omrufHwUCZTfdTwIbAwUL
+CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBHUD6omrufH37nA/99VutWzhuMgQZI
+sGWsFKktiyM4C3e1Bun1pkLDHDsMFNe2Dgqxg4As7UbecLIoRGuMu7tpatCJWJI3
+gnVWglFtdEV8DwQMVWWie4Agj8W2i0xL1YwkXWN+UPFlgzUsj0F2BcuHCP/E0Wxd
+GBJ5Ynsk+dT2iSJMBnNCscOIHU5AubiNBGU33U8BBADJEYOw9mFxrSuxMySSZHQi
+XPfB3n8PtIBs61whd34Ws/Zp856bDL/XKr6NFCK5TE5D1oKjoUUoCVaGmgWvsAcY
+Q+6f8SqpxhjGP/9JCpSdkjp36mdCBUmCD6LahFFP7eZV1gdb/gH/N1DCUSN4zw4R
+vcteRIfuX4jqa4aI8zNoGQARAQABiLYEGAEIACAWIQQbxlud/OL0tdmLaT1HUD6o
+mrufHwUCZTfdTwIbDAAKCRBHUD6omrufH2kTA/93cA+xeI/YL9Kn9c7HtX7+gOgB
+2q22qJTyJEZbsapT7dOZY3wZLKoJNzHoQuzUCo5DNw4HLBxEabzdTA0HET5LbR8o
+zeN/V3JnQLO+HXTINX6+zwuHS/qfkbHW+w97c6aPxpoOeKxWMUDu4MEPH6DymQCD
+HHLC5xYgwMXymmULQriNBGU33jABBADgAxaYK6SZ4CqLMUnv2WPTQROJzzUKiJHy
+Ox+Bb6DUHdPoLVhKLP1LMqw4Ce5IvcfUlJk8vHSgIK0Jse2arxvQtDsl3KoDf3Pf
+WZedE2jl2zpWrfc+DGjhXdrnerfE4g5j1Za66RKOUNVr0F5TQnomAWdd6gyT7TH1
+sKQKQapiLQARAQABiQFrBBgBCAAgFiEEG8Zbnfzi9LXZi2k9R1A+qJq7nx8FAmU3
+3jACGwIAvwkQR1A+qJq7nx+0IAQZAQgAHRYhBHVCtr4Cby6uRGad0iLL+T9HG2pN
+BQJlN94wAAoJECLL+T9HG2pNCH0EAK1k1NNRgk9swfNTs2dzEz+PSd+xcCSUmVDy
+sHZB3gi0EVK5nHScCRhJb6gjsusKf+vQaMbnY1d6VKaE533t3Pn+4FIaed337qY7
+z3G0E2OtD3djJupkEi1xhQSojdiVxhE4vx33/y9XooLzAnGZJ8xvuEmyNJBkw48f
+nFH1hYAkY+MD/14dFwAYZKJb8YvhUaO61zWGF9RrYQmPj+KPfDSPbFyJrBUce5NB
+4OYU5j/A0Z2CqFzsQusQiPU9eHyFYuMZ3wqqqj5Ctr4yuGRGk/JsXWJcXAPzcu6l
+kcfPHIAvBrNPxnOUb9tXHD/YSCO9c0G4H+Eay6diHo6AbNAoEdz1/hoN
+=BZfa
 -----END PGP PUBLIC KEY BLOCK-----`,
   },
 };

appium/tests/specs/mock/composeEmail/CheckSignOnlyKey.spec.ts

@@ -0,0 +1,52 @@
+import { MockApi } from 'api-mocks/mock';
+import { MockApiConfig } from 'api-mocks/mock-config';
+import { MockUserList } from 'api-mocks/mock-data';
+import {
+  MailFolderScreen,
+  MenuBarScreen,
+  NewMessageScreen,
+  SetupKeyScreen,
+  SplashScreen,
+} from '../../../screenobjects/all-screens';
+
+describe('COMPOSE EMAIL: ', () => {
+  it('check encrypting message for user which contains sign only key', async () => {
+    const mockApi = new MockApi();
+
+    const recipient = MockUserList.signOnlyKey;
+    const subject = 'sign only key subject';
+    const message = 'sign only key message';
+
+    mockApi.fesConfig = MockApiConfig.defaultEnterpriseFesConfiguration;
+    mockApi.ekmConfig = MockApiConfig.defaultEnterpriseEkmConfiguration;
+    mockApi.addGoogleAccount('[email protected]');
+    mockApi.attesterConfig = {
+      servedPubkeys: {
+        [MockUserList.signOnlyKey.email]: MockUserList.signOnlyKey.pub!,
+      },
+    };
+
+    await mockApi.withMockedApis(async () => {
+      await SplashScreen.mockLogin();
+      await SetupKeyScreen.setPassPhrase();
+      await MailFolderScreen.checkInboxScreen();
+      await MailFolderScreen.clickCreateEmail();
+
+      // Compose draft
+      await NewMessageScreen.composeEmail(recipient.email, subject, message);
+      await NewMessageScreen.clickBackButton();
+
+      // Go to draft folder
+      await MenuBarScreen.clickMenuBtn();
+      await MenuBarScreen.clickDraftsButton();
+
+      // Open draft and see if draft is saved correctly
+      await MailFolderScreen.clickOnEmailBySubject(subject);
+      await NewMessageScreen.checkFilledComposeEmailInfo({
+        recipients: [recipient.name],
+        subject: subject,
+        message: message,
+      });
+    });
+  });
+});