From 16e51b8542e053ded53d96e6c03214a35a8a4b11 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 30 Jul 2018 15:32:10 -0400
Subject: [PATCH] Fixup CDS auth properties.

---
 .../src/Network/API/Requests/TSRequest.m      | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/src/Network/API/Requests/TSRequest.m b/SignalServiceKit/src/Network/API/Requests/TSRequest.m
index 159b20b6a..452790c24 100644
--- a/SignalServiceKit/src/Network/API/Requests/TSRequest.m
+++ b/SignalServiceKit/src/Network/API/Requests/TSRequest.m
@@ -8,6 +8,9 @@
 
 @implementation TSRequest
 
+@synthesize authUsername = _authUsername;
+@synthesize authPassword = _authPassword;
+
 - (id)initWithURL:(NSURL *)URL {
     OWSAssert(URL);
     self = [super initWithURL:URL
@@ -71,17 +74,40 @@
 
 #pragma mark - Authorization
 
+- (void)setAuthUsername:(nullable NSString *)authUsername
+{
+    OWSAssert(self.shouldHaveAuthorizationHeaders);
+
+    @synchronized(self) {
+        _authUsername = authUsername;
+    }
+}
+
+- (void)setAuthPassword:(nullable NSString *)authPassword
+{
+    OWSAssert(self.shouldHaveAuthorizationHeaders);
+
+    @synchronized(self) {
+        _authPassword = authPassword;
+    }
+}
+
 - (NSString *)authUsername
 {
     OWSAssert(self.shouldHaveAuthorizationHeaders);
-    return (_authUsername ?: [TSAccountManager localNumber]);
+
+    @synchronized(self) {
+        return (_authUsername ?: [TSAccountManager localNumber]);
+    }
 }
 
 - (NSString *)authPassword
 {
     OWSAssert(self.shouldHaveAuthorizationHeaders);
-    return (_authPassword ?: [TSAccountManager serverAuthToken]);
-}
 
+    @synchronized(self) {
+        return (_authPassword ?: [TSAccountManager serverAuthToken]);
+    }
+}
 
 @end