added conformances for equatable and hashable

tgymnich · Aug 23, 2020 · e094f75 · e094f75
1 parent 22634f6
commit e094f75
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/Sources/OTPKit/Account.swift b/Sources/OTPKit/Account.swift
@@ -8,7 +8,7 @@
 import Foundation
 import KeychainAccess
 
-public struct Account<OTPType: OTP>: Codable, Equatable, Identifiable {
+public struct Account<OTPType: OTP>: Codable, Hashable, Identifiable {
     private let keychainKey: String
     /// The label is used to identify which account a key is associated with
     public let id = UUID()

diff --git a/Sources/OTPKit/HOTP.swift b/Sources/OTPKit/HOTP.swift
@@ -63,5 +63,19 @@ public final class HOTP: OTP {
         defer { counter += 1 }
         return code(for: counter)
     }
+
+    // MARK: Equatable
+
+    public static func ==(lhs: HOTP, rhs: HOTP) -> Bool {
+        return lhs.secret == rhs.secret && lhs.algorithm == rhs.algorithm && lhs.digits == rhs.digits
+    }
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(secret)
+        hasher.combine(algorithm)
+        hasher.combine(digits)
+    }
 
 }
diff --git a/Sources/OTPKit/OTP.swift b/Sources/OTPKit/OTP.swift
@@ -8,7 +8,7 @@
 import Foundation
 import CommonCrypto
 
-public protocol OTP: Codable {
+public protocol OTP: Codable, Hashable {
     /// Algorithm used to calculate the hash
     var algorithm: Algorithm { get }
     /// The secret is an arbitrary key value

diff --git a/Sources/OTPKit/TOTP.swift b/Sources/OTPKit/TOTP.swift
@@ -76,7 +76,7 @@ public final class TOTP: OTP {
 
         self.init(algorithm: algorithm, secret: secret, digits: digits, period: period)
     }
-    
+
     public func code() -> String {
         return code(for: Date())
     }
@@ -91,6 +91,21 @@ public final class TOTP: OTP {
             timer.invalidate()
         }
     }
+
+    // MARK: Equatable
+
+    public static func ==(lhs: TOTP, rhs: TOTP) -> Bool {
+        return lhs.secret == rhs.secret && lhs.algorithm == rhs.algorithm && lhs.digits == rhs.digits && lhs.period == rhs.period
+    }
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(secret)
+        hasher.combine(algorithm)
+        hasher.combine(digits)
+        hasher.combine(period)
+    }
 
 }