Merge branch 'hotfix/0.125.12' into develop

Author: sloria

scripts/populate_institutions.py

@@ -289,6 +289,30 @@ def main(env):
                 'email_domains': ['dc.gov'],
                 'delegation_protocol': '',
             },
+            {
+                '_id': 'tufts',
+                'name': 'Tufts University',
+                'description': '<a href="http://researchguides.library.tufts.edu/RDM">Research Data Management &#64; Tufts</a>',
+                'banner_name': 'tufts-banner.png',
+                'logo_name': 'tufts-shield.png',
+                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://shib-idp.tufts.edu/idp/shibboleth')),
+                'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
+                'domains': [],
+                'email_domains': [],
+                'delegation_protocol': 'saml-shib',
+            },
+            {
+                '_id': 'ua',
+                'name': 'University of Arizona',
+                'description': 'A service supported by the <a href="http://www.library.arizona.edu/">University of Arizona Libraries</a>. For more information, please refer to the <a href="http://data.library.arizona.edu/osf">A Data Management page</a>.',
+                'banner_name': 'ua-banner.png',
+                'logo_name': 'ua-shield.png',
+                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('urn:mace:incommon:arizona.edu')),
+                'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
+                'domains': ['osf.arizona.edu'],
+                'email_domains': [],
+                'delegation_protocol': 'saml-shib',
+            },
             {
                 '_id': 'uc',
                 'name': 'University of Cincinnati',
@@ -591,7 +615,7 @@ def main(env):
                 'description': 'Related resources are in the institutional intranet web site only.',
                 'banner_name': 'csic-banner.png',
                 'logo_name': 'csic-shield.png',
-                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://www.rediris.es/sir/csicidp')),
+                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://www.rediris.es/sir/shibtestidp')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
                 'domains': [],
                 'email_domains': [],
@@ -753,6 +777,30 @@ def main(env):
                 'email_domains': ['dc.gov'],
                 'delegation_protocol': '',
             },
+            {
+                '_id': 'tufts',
+                'name': 'Tufts University [Test]',
+                'description': '<a href="http://researchguides.library.tufts.edu/RDM">Research Data Management &#64; Tufts</a>',
+                'banner_name': 'tufts-banner.png',
+                'logo_name': 'tufts-shield.png',
+                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://shib-idp.tufts.edu/idp/shibboleth')),
+                'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
+                'domains': ['test-osf-tufts.cos.io'],
+                'email_domains': [],
+                'delegation_protocol': 'saml-shib',
+            },
+            {
+                '_id': 'ua',
+                'name': 'University of Arizona [Test]',
+                'description': 'A service supported by the <a href="http://www.library.arizona.edu/">University of Arizona Libraries</a>. For more information, please refer to the <a href="http://data.library.arizona.edu/osf">A Data Management page</a>.',
+                'banner_name': 'ua-banner.png',
+                'logo_name': 'ua-shield.png',
+                'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('urn:mace:incommon:arizona.edu')),
+                'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
+                'domains': ['test-osf-ua.cos.io'],
+                'email_domains': [],
+                'delegation_protocol': 'saml-shib',
+            },
             {
                 '_id': 'uc',
                 'name': 'University of Cincinnati [Test]',