Merge branch 'hotfix/18.1.6'

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+18.1.6 (2019-06-06)
+===================
+
+- Add branded login support for indiarxiv
+
 18.1.5 (2019-04-25)
 ===================
 

cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp

@@ -64,7 +64,7 @@
             <c:if test="${not empty registeredService.id && (
                 registeredService.id == 203948234207230 || registeredService.id == 203948234207231 ||
                 registeredService.id == 203948234207232 || registeredService.id == 203948234207340 ||
-                (registeredService.id >= 203948234207240 && registeredService.id <= 203948234207270)
+                (registeredService.id >= 203948234207240 && registeredService.id <= 203948234207271)
             )}">
                 <section class="row">
                     <a id="alt-login-orcid" class="btn-alt-login" href="${OrcidClientUrl}">

etc/services/preprints-indiarxiv.json

@@ -0,0 +1,44 @@
+{
+  "@class" : "org.jasig.cas.services.RegexRegisteredService",
+  "id" : 203948234207271,
+  "name" : "IndiaRxiv Preprints",
+  "description" : "",
+  "serviceId" : "^https?://(localhost|127\\.0\\.0\\.1):5000/(login|logout)/?\\?next=https?(%3A|:)(%2F|/)(%2F|/)((local\\.indiarxiv\\.(org|com)(%3A|:)4200)|((localhost|127\\.0\\.0\\.1)(%3A|:)5000(%2F|/)preprints(%2F|/)indiarxiv))($|%2F|/).*",
+  "evaluationOrder" : "1000",
+  "logo": "http://localhost:8080/images/preprints-indiarxiv-logo.png",
+  "attributeReleasePolicy" : {
+    "@class" : "org.jasig.cas.services.ReturnAllowedAttributeReleasePolicy",
+    "allowedAttributes" : [
+      "java.util.ArrayList", [
+        "given-names", "family-name"
+      ]
+    ]
+  },
+  "properties" : {
+    "@class" : "java.util.HashMap",
+    "title" : {
+      "@class" : "org.jasig.cas.services.DefaultRegisteredServiceProperty",
+      "values" : [
+        "java.util.HashSet", [
+          "Open Science Framework"
+        ]
+      ]
+    },
+    "titleAbbr" : {
+      "@class" : "org.jasig.cas.services.DefaultRegisteredServiceProperty",
+      "values" : [
+        "java.util.HashSet", [
+          "OSF"
+        ]
+      ]
+    },
+    "registerUrl" : {
+      "@class" : "org.jasig.cas.services.DefaultRegisteredServiceProperty",
+      "values" : [
+        "java.util.HashSet", [
+          "?campaign=indiarxiv-preprints"
+        ]
+      ]
+    }
+  }
+}