check for a clientId match before using the regex

okta · Feb 7, 2024 · 3bd2fbe · 3bd2fbe
1 parent f1895cc
commit 3bd2fbe
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Sources/AuthFoundation/Migration/Migrators/OIDCLegacyMigrator.swift b/Sources/AuthFoundation/Migration/Migrators/OIDCLegacyMigrator.swift
@@ -95,7 +95,8 @@ extension SDKVersion.Migration {
             let results = items.filter({ searchResult in
                 // swiftlint:disable empty_string
                 guard searchResult.service == "",
-                      regex.matches(in: searchResult.account, range: NSRange(location: 0, length: searchResult.account.count)).count == 1
+                      clientId == searchResult.account ||
+                          regex.matches(in: searchResult.account, range: NSRange(location: 0, length: searchResult.account.count)).count == 1
                 else {
                     return false
                 }
@@ -115,8 +116,9 @@ extension SDKVersion.Migration {
                 .Search(service: "")
                 .list()
                 .filter({ searchResult in
-                    regex.matches(in: searchResult.account,
-                                  range: NSRange(location: 0, length: searchResult.account.count)).count == 1
+                    clientId == searchResult.account ||
+                        regex.matches(in: searchResult.account,
+                                      range: NSRange(location: 0, length: searchResult.account.count)).count == 1
                 }).map({ searchResult in
                     let item = try searchResult.get()
                     return (searchResult, try decode(item.value))