Fix UD auth edge cases.

SignalMessaging/profiles/ProfileFetcherJob.swift

@@ -157,6 +157,9 @@ public class ProfileFetcherJob: NSObject {
                     // If UD auth fails, try again with non-UD auth.
                     if unidentifiedAccess != nil && (statusCode == 401 || statusCode == 403) {
                         Logger.info("Profile request failing over to non-UD auth.")
+
+                        self.udManager.setUnidentifiedAccessMode(.disabled, recipientId: recipientId)
+
                         let nonUDRequest = OWSRequestFactory.getProfileRequest(recipientId: recipientId, unidentifiedAccess: nil)
                         self.socketManager.make(nonUDRequest,
                                                 webSocketType: .default,

SignalServiceKit/src/Network/SignalServiceClient.swift

@@ -30,6 +30,10 @@ public class SignalServiceRestClient: NSObject, SignalServiceClient {
         return TSNetworkManager.shared()
     }
 
+    private var udManager: OWSUDManager {
+        return SSKEnvironment.shared.udManager
+    }
+
     func unexpectedServerResponseError() -> Error {
         return OWSErrorMakeUnableToProcessServerResponseError()
     }
@@ -101,6 +105,9 @@ public class SignalServiceRestClient: NSObject, SignalServiceClient {
                             let statusCode = task.statusCode()
                             if unidentifiedAccess != nil && (statusCode == 401 || statusCode == 403) {
                                 Logger.verbose("REST profile request failing over to non-UD auth.")
+
+                                self.udManager.setUnidentifiedAccessMode(.disabled, recipientId: recipientId)
+
                                 let nonUDRequest = OWSRequestFactory.getProfileRequest(recipientId: recipientId, unidentifiedAccess: nil)
                                 self.networkManager.makeRequest(nonUDRequest,
                                                            success: { task, responseObject in