https://qcif.zendesk.com/agent/tickets/588: Updated full citation to …

…include resourceType. Removed changes to request params as appId still needs to be in the url even if used in the auth.
redbox-mint · Mar 5, 2019 · 1ccaf3e · 1ccaf3e
1 parent 0e0cce6
commit 1ccaf3e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/config/src/main/config/portal/default/redbox/scripts/actions/andsDoi.py b/config/src/main/config/portal/default/redbox/scripts/actions/andsDoi.py
@@ -166,6 +166,13 @@ def urlPost(self, url, postBody):
             #post.setRequestBody(postBody)
             post.addParameter("xml", postBody)
             #######
+            sharedSecret = self.doiConfig("sharedSecret")
+            if (sharedSecret):
+                apiKey = self.doiConfig("apiKey")
+                if (apiKey is not None):
+                    client.authenticate(apiKey, sharedSecret)
+                else:
+                    raise EnvironmentError("Cannot have shared secret without an api key")
             code = client.executeMethod(post)
             if str(code) == "302":
                 locationHeader = post.getResponseHeader("location")

diff --git a/config/src/main/config/portal/default/redbox/workflows/forms/sections/citations.vm b/config/src/main/config/portal/default/redbox/workflows/forms/sections/citations.vm
@@ -745,7 +745,7 @@
     }
 
     // Time to put the complete String together
-    return creators.join("; ") + " (" + pubYear + "): " + title + ". " + publisher + ". {ID_WILL_BE_HERE}";
+    return creators.join("; ") + " (" + pubYear + "): " + title + ". " + publisher + ". (" + resourceType.toLowerCase() + "). " + "{ID_WILL_BE_HERE}";
   }
 
   renderBtn.live("click", function () {