Merge branch 'release/v4.0.3'

TwoFAS/CodeSupport/Code+GoogleAuth.swift

@@ -34,7 +34,7 @@ extension Code {
         else { return nil }
 
         return unpacked.otpParameters.compactMap { param -> Code? in
-            guard let secret = param.secretValue else { return nil }
+            guard let secret = param.secretValue?.sanitazeSecret(), secret.isValidSecret() else { return nil }
             let digits: Digits = {
                 if let value = param.digitsValue {
                     return value

TwoFAS/CodeSupport/CodeParser.swift

@@ -44,8 +44,7 @@ final class CodeParser {
 
         guard let secret = items.find(forType: .secret(""))?
             .value
-            .trimmingCharacters(in: .init(charactersIn: "="))
-            .uppercased(),
+            .sanitazeSecret(),
               secret.isValidSecret()
         else { return nil }
 

TwoFAS/Common/Config.swift

@@ -32,4 +32,6 @@ public enum Config {
     public enum TokenConsts {
         public static let formatTimerWhenSecondsOrLess: Int = 5
     }
+
+    public static let maxIdentifierLength: Int = 128
 }

TwoFAS/Common/IconDescriptionDatabaseImpl+Database.swift

@@ -53,6 +53,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "890AD18D-FF18-4AAC-BEB4-9311D9941019")!,
                 name: "Upwork"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "5247C96D-2383-4016-AA5D-119B251F94C3")!,
+                name: "Dmarket"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "AE357171-6E23-456C-950A-E792B0EA53B3")!,
                 name: "Jamf"
@@ -85,6 +89,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "C1478A28-C2A3-4993-BE6E-1F826BE2D5C9")!,
                 name: "TikTok"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "687CB980-6C6F-4E16-94DF-6CA45CD71E33")!,
+                name: "Masterworks"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "7E238B3C-9833-4D0B-ACC2-36396ECCB0FE")!,
                 name: "Bethesda.net"
@@ -93,6 +101,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "114D2106-4E3D-4AE4-B559-DC598F2FDA3C")!,
                 name: "Proton"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "FC4833DD-7151-4AB4-A9CE-AA45DE5B710A")!,
+                name: "Short.io"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "CB646018-2B9C-471C-B033-CC932A767520")!,
                 name: "UptimeRobot"
@@ -137,6 +149,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "D4FEF7D5-65CF-4156-BC04-98F9767B78BF")!,
                 name: "Activision"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "D3262B45-4011-46CE-9A3D-FCE9FCCF3D79")!,
+                name: "Private Internet Access"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "8D3B0A32-4A3E-445C-B1C3-0529BDE24AA5")!,
                 name: "Docker"
@@ -173,6 +189,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "DF531F5B-5488-4AA9-87F6-D950B3CA04EB")!,
                 name: "Zoho"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "03641FA7-F680-4F99-AC15-4954061E237C")!,
+                name: "Advcash"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "4D15F4F2-0C7E-41B1-A9AF-BE07644246C1")!,
                 name: "Fastmail"
@@ -189,6 +209,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "B887CA8F-06DC-4D85-9990-03C1DEA2060F")!,
                 name: "Karatbit"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "F68A6DD7-04AF-4BB4-861E-BFECC996FA0F")!,
+                name: "Newegg"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "CC6D4C9D-7AB8-4CDA-BA17-7289D6A1261B")!,
                 name: "Braintree"
@@ -273,6 +297,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "A659E300-C8B3-4DB3-8D11-2DDB1C46CEB8")!,
                 name: "Norton"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "CE141608-0221-422F-8A07-33D6BCA77F1F")!,
+                name: "Atera"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "F391FCEB-2FF9-4F12-984D-EE59E91E157C")!,
                 name: "Unraid"
@@ -337,6 +365,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "8E3326A2-13C9-49BB-B28D-C4465B0CE62D")!,
                 name: "Zoom"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "69123308-C433-4ACB-A876-D5045D25CC83")!,
+                name: "Mathworks"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "ECCAFCDF-9E15-47D8-84C9-7DA00D236135")!,
                 name: "PyPI"
@@ -517,6 +549,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "A2533A1D-3F07-4F86-AAE6-5555A35CCE0B")!,
                 name: "Hover"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "5D6912B0-60C3-4794-848C-A15EED8BAA65")!,
+                name: "Neeva"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "C343B6B4-3626-48F5-81C2-84033B5B48B5")!,
                 name: "Basecamp"
@@ -581,6 +617,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "D4933CE4-1942-416A-AEA0-97E802B741CC")!,
                 name: "Ubiquiti"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "16A18DA2-F83A-4AF4-989D-BEF141971C43")!,
+                name: "CoinTracker"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "EC2DF1EC-7B6E-4BB7-A220-37DCCA841030")!,
                 name: "HS Fulda"
@@ -601,6 +641,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "2C9EE610-C4D6-4457-8834-F7C538A7F163")!,
                 name: "Buffer"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "028279C4-92E4-47D1-AC5D-66E1618BD244")!,
+                name: "SeaTable"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "B541B6BB-1921-418B-91C8-AD911062B736")!,
                 name: "RoboForm"
@@ -617,6 +661,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "708DF726-FB8B-4C01-8990-F2DA0CD33839")!,
                 name: "WordPress"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "4436B171-7E38-4AD8-9E5F-D0D5CE411EB4")!,
+                name: "Termius"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "3B34F154-62DB-45D5-A668-1FC7524FC06A")!,
                 name: "Evernote"
@@ -633,6 +681,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "FBC8DA17-9128-430F-B86B-8AA5E735A299")!,
                 name: "HEY"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "394AA3FC-2818-45F2-8F0F-612856B2AB82")!,
+                name: "Bitdefender"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "6F8B55B6-D7BB-4691-BDA2-2B1DE39FB448")!,
                 name: "Skrill"
@@ -657,6 +709,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "233AF9EA-D8CB-4586-863E-819CA7C46EAE")!,
                 name: "Wyze"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "DBCCF2F4-2073-479C-A655-FE19DAF4AC2C")!,
+                name: "Quickbooks Online"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "3DB5E1E5-6DCC-427C-91A7-08B31ED3D3BE")!,
                 name: "Atlantiss"
@@ -717,6 +773,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "DB619E49-9393-4CF5-808E-354157D98325")!,
                 name: "Linode"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "1CF1197B-940E-4AB3-8FBB-261B6CB1D464")!,
+                name: "TurboTax"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "75595AD0-66C7-4BFC-A47D-99C001A4DF12")!,
                 name: "Skiff"
@@ -809,6 +869,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "910890DB-0DA8-4D54-B0A0-D7BABF811ADE")!,
                 name: "Oracle Cloud"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "B413E65A-CEF9-404D-B1DC-B3BD8E1AE7C3")!,
+                name: "Auth0"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "AD3E5352-FBDA-400D-B891-E21DDEC8295E")!,
                 name: "Paxful"
@@ -853,6 +917,18 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "5336CD6B-2971-4A3F-BDD9-7D32EA2ABE27")!,
                 name: "Microsoft"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "A3B6DB73-ED50-4061-BC72-735A0B06F147")!,
+                name: "Glasswire"
+            ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "928647E4-14DE-434A-8210-817202D36D73")!,
+                name: "AnonAddy"
+            ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "5430258C-8064-46BB-9ADF-9A36E276407B")!,
+                name: "Stake"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "699D4DD1-5144-49E6-9C77-BF065E7BCD14")!,
                 name: "Wealthsimple"
@@ -1093,6 +1169,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "758F71EB-25E7-49E3-8A83-F39A7C24DCD7")!,
                 name: "F-Secure"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "7D7C381B-7FEB-4155-991F-074AE53E6BD9")!,
+                name: "Oculus"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "EF5B7DF4-55D3-49CA-9EC0-93D380302884")!,
                 name: "MyHeritage"
@@ -1141,6 +1221,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "93D4F71F-05E8-4442-885B-24B742BE8459")!,
                 name: "Crypto.com"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "C8B94125-E8EB-4661-A6C3-D9BD064EDE8A")!,
+                name: "Skinport"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "27A27849-AC36-4374-A156-32CC4E58D464")!,
                 name: "arena.net"
@@ -1153,6 +1237,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "5F6B8637-D24D-4245-B360-005046E55C70")!,
                 name: "Blockchains, LLC"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "816E759C-2C73-45B7-AD93-702C184CFF77")!,
+                name: "CoinStats"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "C4E2D69C-F532-4795-990D-FE380BD517BA")!,
                 name: "Razer"

TwoFAS/Common/Icons.xcassets/028279C4-92E4-47D1-AC5D-66E1618BD244.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "028279C4-92E4-47D1-AC5D-66E1618BD244@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "028279C4-92E4-47D1-AC5D-66E1618BD244@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "028279C4-92E4-47D1-AC5D-66E1618BD244@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/03641FA7-F680-4F99-AC15-4954061E237C.imageset/Contents.json

@@ -0,0 +1,51 @@
+{
+  "images": [  {
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  },
+  {    "appearances": [
+        {
+            "appearance": "luminosity",
+            "value": "dark"
+        }
+    ],
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C_dark@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {    "appearances": [
+        {
+            "appearance": "luminosity",
+            "value": "dark"
+        }
+    ],
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C_dark@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {    "appearances": [
+        {
+            "appearance": "luminosity",
+            "value": "dark"
+        }
+    ],
+    "filename": "03641FA7-F680-4F99-AC15-4954061E237C_dark@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/16A18DA2-F83A-4AF4-989D-BEF141971C43.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "16A18DA2-F83A-4AF4-989D-BEF141971C43@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "16A18DA2-F83A-4AF4-989D-BEF141971C43@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "16A18DA2-F83A-4AF4-989D-BEF141971C43@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/1CF1197B-940E-4AB3-8FBB-261B6CB1D464.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "1CF1197B-940E-4AB3-8FBB-261B6CB1D464@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "1CF1197B-940E-4AB3-8FBB-261B6CB1D464@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "1CF1197B-940E-4AB3-8FBB-261B6CB1D464@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/394AA3FC-2818-45F2-8F0F-612856B2AB82.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "394AA3FC-2818-45F2-8F0F-612856B2AB82@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "394AA3FC-2818-45F2-8F0F-612856B2AB82@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "394AA3FC-2818-45F2-8F0F-612856B2AB82@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}