fix merge

spinnman/spalloc/spalloc_client.py

@@ -477,14 +477,14 @@ def get_session_credentials_for_db(self):
         config["SPALLOC", "service uri"] = self._service_url
         config["SPALLOC", "job uri"] = self._url
         cookies, headers = self._session_credentials
-        for k, v in cookies.items():
-            config["COOKIE", k] = v
-        for k, v in headers.items():
-            config["HEADER", k] = v
         if "Authorization" in headers:
             # We never write the auth headers themselves; we just extend the
             # session
             del headers["Authorization"]
+        for k, v in cookies.items():
+            config["COOKIE", k] = v
+        for k, v in headers.items():
+            config["HEADER", k] = v
         return config
 
     @overrides(SpallocJob.get_state)

spinnman/spalloc/spalloc_job.py

@@ -209,7 +209,7 @@ def where_is_machine(self, x: int, y: int) -> Optional[
         raise NotImplementedError()
 
     @abstractmethod
-    def get_session_credentials_for_db(self) -> Mapping[str, str]:
+    def get_session_credentials_for_db(self) -> Mapping[Tuple[str, str], str]:
         """
         Get the session credentials for the job to be written into a database