RubyGems - omniauth-mpassid - Versions diffs - 0.4.0 → 0.5.0 - Mend

omniauth-mpassid 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

checksums.yaml +4 -4
data/lib/omniauth/strategies/mpassid.rb +58 -39
data/lib/omniauth-mpassid/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568537fcfc8b851bce49732d5f2ce6dac99cf0b3e8bcd55998f3e852dc7e0039
-  data.tar.gz: 53e4061a25662610162a00fad3589422457477b6404620d60b02f28340de1f7b
+  metadata.gz: 3ff6ff316ec561eadb8093c30bcbe1097823cf11796a81386b11d40228c4cdc6
+  data.tar.gz: dd16b5f03d5e8b7814e9b210fe981b15a10521e841f9560cd40a86af67c54ce0
 SHA512:
-  metadata.gz: 32d0f6a89ef0c21992bd1c2da5ea6e2dff25cb756dfad491c18892c8770e5fc279ac53ce12b94623f0e28addc218abe6b98ff2a32209cacfc14d19b48636aa22
-  data.tar.gz: 5a45f519cdf497d900a9df55dda573e4221c33be1df2e2f624240d10952cde76bf4bfb137c32142a0d35c24ae18d727cec0f738b9f32b86bfe8dec9a293aacff
+  metadata.gz: 2bcf7c78c1072b8c52db7e9381321fa2a9bcef19c7e5e2d62d98e161808419484c1ecb5ff7472a4fa2bd90e32ebbd735e6a6b7e8150e8a0673a4e7f46d303c6e
+  data.tar.gz: 6c4d56294369192b594a2b6afc9c0ea371d21d44b46e49078c31af3d78794c255d3000ebae7cb8dc318f5a8f36ee8c2416bbcf27086528ca389a8a4203fdf4c8

data/lib/omniauth/strategies/mpassid.rb CHANGED Viewed

@@ -39,13 +39,15 @@ module OmniAuth
         # (single value)
         {
           name: 'urn:mpass.id:uid',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassUsername'
         },
         # Funet EDU person learner ID
         # (single value)
         {
           name: 'urn:oid:1.3.6.1.4.1.16161.1.1.27',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'learnerId'
         },
         # The first/given name of the user.
         # (single value)
@@ -68,26 +70,6 @@ module OmniAuth
           name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
           friendly_name: 'sn'
         },
-        # The municipality code of the authenticated user. See
-        # http://tilastokeskus.fi/meta/luokitukset/kunta/001-2017/index.html
-        # for mappings in Finland.
-        # (multi value)
-        {
-          name: 'urn:mpass.id:municipalityCode',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
-          friendly_name: 'municipalityCode'
-        },
-        # The human-readable name of the municipality of the authenticated user.
-        # (multi value)
-        {
-          name: 'urn:mpass.id:municipality',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
-        },
-        {
-          name: 'urn:educloudalliance.org:municipality',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
-          friendly_name: 'ecaMunicipality'
-        },
         # The school code of the authenticated user. See
         # https://virkailija.opintopolku.fi/koodisto-service/rest/json/oppilaitosnumero/koodi
         # (JSON format)
@@ -99,7 +81,8 @@ module OmniAuth
         # (multi value)
         {
           name: 'urn:mpass.id:schoolCode',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassSchoolCode'
         },
         # The human-readable name of the school of the authenticated user.
         # (multi value)
@@ -108,12 +91,21 @@ module OmniAuth
           name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
           friendly_name: 'school'
         },
+        # Combination of the school code and official name of the educational
+        # institution separated with semicolon.
+        # For instance: 00000;Tuntematon
+        {
+          name: 'urn:mpass.id:schoolInfo',
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassSchoolInfo'
+        },
         # The class/group-information of the authenticated user.
         # For instance: 8A or 3B.
         # (multi value)
         {
           name: 'urn:mpass.id:class',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassClass'
         },
         {
           name: 'urn:educloudalliance.org:group',
@@ -125,7 +117,8 @@ module OmniAuth
         # (multi value)
         {
           name: 'urn:mpass.id:classLevel',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassClassLevel'
         },
         # The role name of the user.
         # For instance Oppilas.
@@ -136,18 +129,43 @@ module OmniAuth
           friendly_name: 'ecaRole'
         },
         # The role of the user in four parts, divided with a semicolon (;)
-        # character. First municipality, followed by school code, group and role
-        # in the group.
-        # For instance Helsinki;32132;9A;Oppilas.
+        # character. First educational provider's organization OID, followed by
+        # school code, group and role in the group.
+        # For instance 1.2.246.562.10.12345678907;99900;7B;Oppilas.
         # (multi value)
+        #
+        # The educational providers' organization OIDs can be found from:
+        # https://github.com/Opetushallitus/aitu/blob/master/ttk-db/resources/db/migration/V11_2__koulutustoimijat.sql
         {
           name: 'urn:mpass.id:role',
-          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassRole'
+        },
+        # The educational provider's permanent organization OID.
+        # (multi value)
+        #
+        # The educational providers' organization OIDs can be found from:
+        # https://github.com/Opetushallitus/aitu/blob/master/ttk-db/resources/db/migration/V11_2__koulutustoimijat.sql
+        {
+          name: 'urn:mpass.id:educationProviderId',
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassEducationProviderOid'
         },
+        # The educational provider's human-readable name.
+        # (multi value)
+        {
+          name: 'urn:mpass.id:educationProvider',
+          name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
+          friendly_name: 'mpassEducationProviderName'
+        },
+        # Combination of the education provider's organisation-OID and official
+        # name. Separated by semicolon.
+        # For instance: 1.2.246.562.10.494695390410;Virallinen nimi
+        # (multi value)
         {
-          name: 'urn:educloudalliance.org:structuredRole',
+          name: 'urn:mpass.id:educationProviderInfo',
           name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri',
-          friendly_name: 'ecaStructuredRole'
+          friendly_name: 'mpassEducationProviderInfo'
         }
       ]
@@ -158,8 +176,8 @@ module OmniAuth
         # Given name or all first names (in case given name is not found)
         first_name: ['urn:oid:2.5.4.42', 'http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName'],
         last_name: ['urn:oid:2.5.4.4'],
-        # The municipality of the person (literal format in Finnish)
-        location: ['urn:mpass.id:municipality', 'urn:educloudalliance.org:municipality']
+        # The education provider (e.g. municipality) of the person (literal format in Finnish)
+        location: ['urn:mpass.id:educationProvider']
       )
       info do
@@ -197,14 +215,14 @@ module OmniAuth
       option(
         :saml_attributes_map,
         given_name: ['urn:oid:2.5.4.42'],
-        first_names: ['http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName'],
+        first_names: ['urn:oid:2.5.4.42'],
         last_name: ['urn:oid:2.5.4.4'],
-        municipality_code: {
-          name: ['urn:mpass.id:municipalityCode'],
+        provider_id: {
+          name: ['urn:mpass.id:educationProviderId'],
           type: :multi
         },
-        municipality_name: {
-          name: ['urn:mpass.id:municipality', 'urn:educloudalliance.org:municipality'],
+        provider_name: {
+          name: ['urn:mpass.id:educationProvider'],
           type: :multi
         },
         school_code: {
@@ -231,7 +249,8 @@ module OmniAuth
           name: ['urn:educloudalliance.org:role'],
           type: :multi
         },
-        # Extra (undocumented)
+        # Extra
+        # Unique learner ID
         funet_person_learner_id: ['urn:oid:1.3.6.1.4.1.16161.1.1.27']
       )

data/lib/omniauth-mpassid/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module OmniAuth
   module MPASSid
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mpassid
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-saml