From 437f98c2d37f280adda890cfb4a4914dbdec0b73 Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Mon, 3 Oct 2022 13:17:51 -0700
Subject: [PATCH] Don't use UD for story prekey requests

---
 SignalServiceKit/src/Messages/MessageSender.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Messages/MessageSender.swift b/SignalServiceKit/src/Messages/MessageSender.swift
index 41eaa43fef..e07d024779 100644
--- a/SignalServiceKit/src/Messages/MessageSender.swift
+++ b/SignalServiceKit/src/Messages/MessageSender.swift
@@ -209,6 +209,9 @@ public extension MessageSender {
             return failure(MessageSenderNoSessionForTransientMessageError())
         }
 
+        // Don't use UD for story preKey fetches, we don't have a valid UD auth key
+        let udAccess = messageSend.message.isStorySend ? nil : messageSend.udSendingAccess?.udAccess
+
         let requestMaker = RequestMaker(label: "Prekey Fetch",
                                         requestFactoryBlock: { (udAccessKeyForRequest: SMKUDAccessKey?) -> TSRequest? in
                                             Logger.verbose("Building prekey request for recipientAddress: \(recipientAddress), deviceId: \(deviceId)")
@@ -224,7 +227,7 @@ public extension MessageSender {
                                             // to this recipient also use REST.
                                             messageSend.hasWebsocketSendFailed = true
                                         }, address: recipientAddress,
-                                        udAccess: messageSend.udSendingAccess?.udAccess,
+                                        udAccess: udAccess,
                                         canFailoverUDAuth: true)
 
         firstly(on: .global()) { () -> Promise<RequestMakerResult> in