From cb0393868ed5f86cbae05bcccc0e1d7862179f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Wed, 13 Mar 2019 15:09:24 +0100
Subject: [PATCH] Flamenco: get JWT token from Flamenco Server when sending
 files to Shaman

---
 blender_cloud/flamenco/__init__.py      |  1 +
 blender_cloud/flamenco/bat_interface.py | 32 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py
index e34ec1f..0db96bf 100644
--- a/blender_cloud/flamenco/__init__.py
+++ b/blender_cloud/flamenco/__init__.py
@@ -567,6 +567,7 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
                     relative_only=relative_only,
                     endpoint=endpoint,
                     checkout_id=job_id,
+                    manager_id=prefs.flamenco_manager.manager,
                 )
             except bat_interface.FileTransferError as ex:
                 self.log.error('Could not transfer %d files, starting with %s',
diff --git a/blender_cloud/flamenco/bat_interface.py b/blender_cloud/flamenco/bat_interface.py
index a7b3f13..3b0154e 100644
--- a/blender_cloud/flamenco/bat_interface.py
+++ b/blender_cloud/flamenco/bat_interface.py
@@ -6,6 +6,7 @@ import pathlib
 import re
 import threading
 import typing
+import urllib.parse
 
 import bpy
 from blender_asset_tracer import pack
@@ -19,7 +20,6 @@ _packer_lock = threading.RLock()
 # For using in other parts of the add-on, so only this file imports BAT.
 Aborted = pack.Aborted
 FileTransferError = transfer.FileTransferError
-ShamanPacker = shaman.ShamanPacker
 parse_shaman_endpoint = shaman.parse_endpoint
 
 
@@ -95,6 +95,36 @@ class BatProgress(progress.Callback):
         pass
 
 
+class ShamanPacker(shaman.ShamanPacker):
+    """Packer with support for getting an auth token from Flamenco Server."""
+
+    def __init__(self,
+                 bfile: pathlib.Path,
+                 project: pathlib.Path,
+                 target: str,
+                 endpoint: str,
+                 checkout_id: str,
+                 *,
+                 manager_id: str,
+                 **kwargs) -> None:
+        self.manager_id = manager_id
+        super().__init__(bfile, project, target, endpoint, checkout_id, **kwargs)
+
+    def _get_auth_token(self) -> str:
+        """get a token from Flamenco Server"""
+
+        from ..blender import PILLAR_SERVER_URL
+        from ..pillar import blender_id_subclient, uncached_session, SUBCLIENT_ID
+
+        url = urllib.parse.urljoin(PILLAR_SERVER_URL,
+                                   'flamenco/jwt/generate-token/%s' % self.manager_id)
+        auth_token = blender_id_subclient()['token']
+
+        resp = uncached_session.get(url, auth=(auth_token, SUBCLIENT_ID))
+        resp.raise_for_status()
+        return resp.text
+
+
 async def copy(context,
                base_blendfile: pathlib.Path,
                project: pathlib.Path,