From 9c0bcda47c2d45831e4855e7f00fbb3ce22a3e99 Mon Sep 17 00:00:00 2001
From: Max Goedjen <max.goedjen@gmail.com>
Date: Mon, 16 Mar 2020 23:20:36 -0700
Subject: [PATCH] Extract key selection.

---
 SecretAgent/Agent.swift | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/SecretAgent/Agent.swift b/SecretAgent/Agent.swift
index a21e559..dbd7e11 100644
--- a/SecretAgent/Agent.swift
+++ b/SecretAgent/Agent.swift
@@ -8,6 +8,7 @@ class Agent {
 
     fileprivate let storeList: SecretStoreList
     fileprivate let notifier: Notifier
+    fileprivate let writer = OpenSSHKeyWriter()
 
     public init(storeList: SecretStoreList, notifier: Notifier) {
         os_log(.debug, "Agent is running")
@@ -76,18 +77,8 @@ extension Agent {
 
     func sign(data: Data) throws -> Data {
         let reader = OpenSSHReader(data: data)
-        let writer = OpenSSHKeyWriter()
         let hash = try reader.readNextChunk()
-        let matching = storeList.stores.compactMap { store -> (AnySecretStore, AnySecret)? in
-            let allMatching = store.secrets.filter { secret in
-                hash == writer.data(secret: secret)
-            }
-            if let matching = allMatching.first {
-                return (store, matching)
-            }
-            return nil
-        }
-        guard let (store, secret) = matching.first else {
+        guard let (store, secret) = secret(matching: hash) else {
             throw AgentError.noMatchingKey
         }
         let dataToSign = try reader.readNextChunk()
@@ -130,6 +121,22 @@ extension Agent {
 
 }
 
+extension Agent {
+
+    func secret(matching hash: Data) -> (AnySecretStore, AnySecret)? {
+        storeList.stores.compactMap { store -> (AnySecretStore, AnySecret)? in
+            let allMatching = store.secrets.filter { secret in
+                hash == writer.data(secret: secret)
+            }
+            if let matching = allMatching.first {
+                return (store, matching)
+            }
+            return nil
+        }.first
+    }
+
+}
+
 
 extension Agent {