From 100ac659758ef05a914498bef023f8b1f6de1c59 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 15 Aug 2017 15:27:44 -0700
Subject: [PATCH] store relative path URL in resource request on redirect

---
 libraries/networking/src/AssetRequest.h                 | 2 ++
 libraries/networking/src/AssetResourceRequest.cpp       | 5 +++++
 libraries/networking/src/ResourceRequest.h              | 1 +
 libraries/script-engine/src/AssetScriptingInterface.cpp | 1 -
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/AssetRequest.h b/libraries/networking/src/AssetRequest.h
index df5cf80ecd..a7213a90d7 100644
--- a/libraries/networking/src/AssetRequest.h
+++ b/libraries/networking/src/AssetRequest.h
@@ -21,6 +21,8 @@
 
 #include "ByteRange.h"
 
+const QString ATP_SCHEME { "atp:" };
+
 class AssetRequest : public QObject {
    Q_OBJECT
 public:
diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp
index a41283cc0d..ecaa6efc1e 100644
--- a/libraries/networking/src/AssetResourceRequest.cpp
+++ b/libraries/networking/src/AssetResourceRequest.cpp
@@ -91,6 +91,11 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) {
 
                 statTracker->incrementStat(STAT_ATP_MAPPING_REQUEST_SUCCESS);
 
+                // if we got a redirected path we need to store that with the resource request as relative path URL
+                if (request->wasRedirected()) {
+                    _relativePathURL = ATP_SCHEME + request->getRedirectedPath();
+                }
+
                 break;
             default: {
                 switch (request->getError()) {
diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h
index 3ee86025a2..bae0882e97 100644
--- a/libraries/networking/src/ResourceRequest.h
+++ b/libraries/networking/src/ResourceRequest.h
@@ -84,6 +84,7 @@ protected:
     virtual void doSend() = 0;
 
     QUrl _url;
+    QUrl _relativePathURL;
     State _state { NotStarted };
     Result _result;
     QByteArray _data;
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 65259987c4..51b3d7ffbe 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -55,7 +55,6 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
 
 
 void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {
-    const QString ATP_SCHEME { "atp:" };
 
     if (!urlString.startsWith(ATP_SCHEME)) {
         return;