@@ -605,9 +605,17 @@ public class RustLogins: LoginsProtocol, KeyManager {
605605 public func addLogin( login: LoginEntry ) -> Deferred < Maybe < String > > {
606606 let deferred = Deferred < Maybe < String > > ( )
607607
608+ self . logger. log ( " [issam] 0 Adding login " ,
609+ level: . warning,
610+ category: . storage,
611+ description: " xxxx " )
608612 queue. async {
609613 guard self . isOpen else {
610614 let error = LoginsStoreError . UnexpectedLoginsApiError ( reason: " Database is closed " )
615+ self . logger. log ( " [issam] 1 Adding login " ,
616+ level: . warning,
617+ category: . storage,
618+ description: error. descriptionValue)
611619
612620 deferred. fill ( Maybe ( failure: error as MaybeErrorType ) )
613621 return
@@ -620,9 +628,17 @@ public class RustLogins: LoginsProtocol, KeyManager {
620628 let id = try self . storage? . add ( login: login) . id
621629 deferred. fill ( Maybe ( success: id!) )
622630 } catch let err as NSError {
631+ self . logger. log ( " [issam] 2 Error adding login " ,
632+ level: . warning,
633+ category: . storage,
634+ description: err. localizedDescription)
623635 deferred. fill ( Maybe ( failure: err) )
624636 }
625637 case . failure( let err) :
638+ self . logger. log ( " [issam] 3 Error adding login " ,
639+ level: . warning,
640+ category: . storage,
641+ description: err. localizedDescription)
626642 deferred. fill ( Maybe ( failure: err) )
627643 }
628644 }
@@ -937,27 +953,52 @@ public class RustLogins: LoginsProtocol, KeyManager {
937953 // call or the key data has been cleared from the keychain.
938954
939955 self . hasSyncedLogins ( ) . upon { result in
956+ self . logger. log ( " [issam] 0 getStoredKey " ,
957+ level: . warning,
958+ category: . storage,
959+ description: " " )
940960 guard result. failureValue == nil else {
941961 completion ( . failure( result. failureValue! as NSError ) )
942962 return
943963 }
964+ self . logger. log ( " [issam] 1 getStoredKey " ,
965+ level: . warning,
966+ category: . storage,
967+ description: " " )
944968
945969 guard let hasLogins = result. successValue else {
946970 let msg = " Failed to verify logins count before attempting to reset key "
947971 completion ( . failure( LoginEncryptionKeyError . dbRecordCountVerificationError ( msg) as NSError ) )
948972 return
949973 }
950974
975+ self . logger. log ( " [issam] 2 getStoredKey " ,
976+ level: . warning,
977+ category: . storage,
978+ description: " " )
979+
951980 if hasLogins {
952981 // Since the key data isn't present and we have login records in
953982 // the database, we both clear the database and reset the key.
954983 GleanMetrics . LoginsStoreKeyRegeneration. keychainDataLost. record ( )
984+ self . logger. log ( " [issam] 3 getStoredKey " ,
985+ level: . warning,
986+ category: . storage,
987+ description: " " )
955988 self . resetLoginsAndKey ( rustKeys: rustKeys, completion: completion)
956989 } else {
957990 // There are no records in the database so we don't need to wipe any
958991 // existing login records. We just need to create a new key.
959992 do {
993+ self . logger. log ( " [issam] 4 getStoredKey " ,
994+ level: . warning,
995+ category: . storage,
996+ description: " " )
960997 let key = try rustKeys. createAndStoreKey ( )
998+ self . logger. log ( " [issam] 5 getStoredKey " ,
999+ level: . warning,
1000+ category: . storage,
1001+ description: " \( key) " )
9611002 completion ( . success( key) )
9621003 } catch let error as NSError {
9631004 completion ( . failure( error) )
@@ -999,7 +1040,10 @@ public class RustLogins: LoginsProtocol, KeyManager {
9991040 public func getKey( ) throws -> Data {
10001041 let rustKeys = RustLoginEncryptionKeys ( )
10011042 let ( key, _) = getKeychainData ( rustKeys: rustKeys)
1002-
1043+ self . logger. log ( " [issam] 0 getKey " ,
1044+ level: . warning,
1045+ category: . storage,
1046+ description: " \( key ?? " empty " ) " )
10031047 guard let keyData = key? . data ( using: . utf8) else {
10041048 throw LoginsStoreError . MissingKey
10051049 }
0 commit comments