Merge remote-tracking branch 'upstream/develop' into feature/osf4i-in-progress-sso

Closes #109

Author: cslzchen

etc/cas/config/attribute-map-prod.xml

@@ -201,6 +201,9 @@
     <!-- Princeton University (PU) -->
     <Attribute name="urn:oid:1.2.840.113556.1.2.141" id="department"/>
 
+    <!-- Washington State University (wsu) -->
+    <Attribute name="urn:oid:2.5.4.11" id="department"/>
+
     <!-- Selective SSO Filter Attribute -->
     <!-- University of Manchester (UOM) -->
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="selectiveSsoFilter"/>

etc/cas/config/instn-authn-prod.xsl

@@ -250,7 +250,7 @@
                         </user>
                     </xsl:when>
                     <!-- Harvard University (HARVARD) -->
-                    <xsl:when test="$idp='http://www.okta.com/exk1xrjz6q65XDb2J1d8 '">
+                    <xsl:when test="$idp='http://www.okta.com/exk1xrjz6q65XDb2J1d8'">
                         <id>harvard</id>
                         <user>
                             <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
@@ -457,6 +457,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Texas A&M University (TAMU) -->
+                    <xsl:when test="$idp='urn:mace:incommon:tamu.edu'">
+                        <id>tamu</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Towson University (TU) -->
                     <xsl:when test="$idp='https://shib.towson.edu/idp/shibboleth'">
                         <id>tu</id>
@@ -895,6 +907,20 @@
                             <eduPerson>false</eduPerson>
                         </user>
                     </xsl:when>
+                    <!-- Washington State University (WSU) -->
+                    <xsl:when test="$idp='http://www.okta.com/exk196cuygihbtIwD2p8'">
+                        <id>wsu</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
+                        </user>
+                    </xsl:when>
                     <!-- Washington University in St. Louis (WUSTL) -->
                     <xsl:when test="$idp='https://login.wustl.edu/idp/shibboleth'">
                         <id>wustl</id>

etc/cas/config/instn-authn-test.xsl

@@ -309,6 +309,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Texas A&M University (TAMU) -->
+                    <xsl:when test="$idp='urn:mace:incommon:tamu.edu'">
+                        <id>tamu</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- University of Arizona (UA) -->
                     <xsl:when test="$idp='urn:mace:incommon:arizona.edu'">
                         <id>ua</id>

etc/cas/config/shibboleth2-prod.xml

@@ -98,6 +98,12 @@
                           backingFilePath="vua-prod-idp-metadata.xml"
                           reloadInterval="180000" />
 
+        <!-- Washington State University (WSU) -->
+        <MetadataProvider type="XML"
+                          uri="https://login.wsu.edu/app/exk196cuygihbtIwD2p8/sso/saml/metadata"
+                          backingFilePath="wsu-prod-idp-metadata.xml"
+                          reloadInterval="86400" />
+
         <!-- Here is the end of non-InCommon/eduGAIN IdPs. Current total: 9 unique provider and 9 institutions. -->
 
         <!-- Here goes all InCommon/eduGAIN IdPs, all of which are production IdP server using the MDQ service -->
@@ -121,6 +127,7 @@
         <!-- Princeton University -->
         <!-- Purdue University -->
         <!-- Temple University -->
+        <!-- Texas A&M University -->
         <!-- The University of Oklahoma -->
         <!-- The University of Texas at Dallas -->
         <!-- Tufts University -->

etc/cas/config/shibboleth2-test.xml

@@ -118,6 +118,7 @@
         <!-- Princeton University -->
         <!-- Purdue University -->
         <!-- Temple University -->
+        <!-- Texas A&M University -->
         <!-- The University of Oklahoma -->
         <!-- The University of Texas at Dallas -->
         <!-- Tufts University -->