omniauth-mpassid 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee0bd0d81ad7593a430bdb8ee94ab733d7b396231ac284b7b99b1914d28ff84
-  data.tar.gz: 6e1ef387f6e6f96e8557ced45f60817f8bb6536f7b2e53d5a1da471b82041829
+  metadata.gz: d20db7b39bbaa982cf5e05417c903cc08f3b543d7eac10ba621e8c5868aa1c45
+  data.tar.gz: 2c54ae01ece53cccc2d3f323c46e0d876a87443b38d306ce6ee9656fda8c1a3b
 SHA512:
-  metadata.gz: e4c92ca00791f451b3a86cd8415abd1b45876e3c1515e0d4b6c038a4b293da544ffebef5b43e2c068af8991d3d22384454453b1e3b2f596f2cf129fc41148634
-  data.tar.gz: cf982a1632ee51213463d30ac7d4c1d8f6c06d6e7a499004840b84f85ae731eac46add9d13280953009f1a7294af7659a2b136e8a7bb0975c19d04d6f1f9388b
+  metadata.gz: acd40c82d1dd81d7e4a9184c014dd0797930a2743327e61ab54319b9bebf2dc0726990386670ff94c4f216a27f910635daed878513dcd87fcbfc3a74180e5369
+  data.tar.gz: c1b6d98478a1c39c1aabb7cafd2d1631f92613897936ac497661271da0b848fa3a2740a9910d091dcae4e6c470490bc5571d9f3310b81743bc88e347a9d7b5fb

data/lib/omniauth/strategies/mpassid.rb

@@ -10,6 +10,27 @@ module OmniAuth
       # :test - MPASSid test environment
       option :mode, :production
 
+      # Defines the lang parameters to check from the request phase request
+      # parameters. A valid language will be added to the IdP sign in redirect
+      # URL as the last parameter (with the name `lang` as expected by
+      # MPASSid).
+      #
+      # MPASSid generally accepts `fi` or `sv` in this parameter but it can
+      # depend on the underlying service. The language can be parsed from the
+      # following kind of strings:
+      # - fi
+      # - sv-SE
+      # - fi_FI
+      #
+      # In case a valid language cannot be parsed from the parameter, the lang
+      # parameter will default to `:idp_sso_target_url_default_lang`.
+      option :idp_sso_target_url_lang_params, %w[locale language lang]
+
+      # This is the default language to be passed to IdP sign in redirect URL as
+      # defined above. In case a valid language is not found from the request
+      # parameters, this will be used instead.
+      option :idp_sso_target_url_default_lang, 'fi'
+
       # The request attributes for MPASSid
       option :request_attributes, [
         # The unique identifier of the authenticated user. Currently recommended
@@ -236,6 +257,20 @@ module OmniAuth
         )
       end
 
+      # Override the request phase to be able to pass the lang parameter to
+      # the redirect URL. Note that this needs to be the last parameter to
+      # be passed to the redirect URL.
+      def request_phase
+        authn_request = OneLogin::RubySaml::Authrequest.new
+        lang = lang_for_authn_request
+
+        with_settings do |settings|
+          url = authn_request.create(settings, additional_params_for_authn_request)
+          url += "&lang=#{CGI.escape(lang)}" unless lang.nil?
+          redirect(url)
+        end
+      end
+
       # This method can be used externally to fetch information about the
       # response, e.g. in case of failures.
       def response_object
@@ -251,6 +286,13 @@ module OmniAuth
         end
       end
 
+      # Override the callback URL so that it always matches the one expected by
+      # MPASSid. No additional query string parameters can be included in the
+      # string.
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
     private
 
       def idp_metadata_url
@@ -302,6 +344,25 @@ module OmniAuth
           end
         end
       end
+
+      def lang_for_authn_request
+        if options.idp_sso_target_url_lang_params.is_a?(Array)
+          options.idp_sso_target_url_lang_params.each do |param|
+            next unless request.params.key?(param.to_s)
+
+            lang = parse_language_value(request.params[param.to_s])
+            return lang unless lang.nil?
+          end
+        end
+
+        options.idp_sso_target_url_default_lang
+      end
+
+      def parse_language_value(string)
+        language = string.sub('_', '-').split('-').first
+
+        language if language =~ /^(fi|sv)$/
+      end
     end
   end
 end

data/lib/omniauth-mpassid/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module MPASSid
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mpassid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-saml