Pending utc changes

Author: pitbulk

lib/onelogin/ruby-saml/idp_metadata_parser.rb

@@ -116,7 +116,7 @@ def parse(idp_metadata, options = {})
         unless parsed_metadata[:cache_duration].nil?
           cache_valid_until_timestamp = OneLogin::RubySaml::Utils.parse_duration(parsed_metadata[:cache_duration])
           if parsed_metadata[:valid_until].nil? || cache_valid_until_timestamp < Time.parse(parsed_metadata[:valid_until], Time.now.utc).to_i
-            parsed_metadata[:valid_until] = Time.at(cache_valid_until_timestamp).strftime("%Y-%m-%dT%H:%M:%SZ")
+            parsed_metadata[:valid_until] = Time.at(cache_valid_until_timestamp).utc.strftime("%Y-%m-%dT%H:%M:%SZ")
           end
         end
         # Remove the cache_duration because on the settings

test/idp_metadata_parser_test.rb

@@ -338,19 +338,19 @@ def initialize; end
     it "if no ValidUntil but CacheDuration return CacheDuration converted in ValidUntil" do
       Timecop.freeze(Time.parse("2020-01-02T10:02:33Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor5)
-        assert_equal '2020-01-03T11:02:33Z', settings.valid_until
+        assert_equal '2020-01-03T10:02:33Z', settings.valid_until
       end
     end
 
     it "if ValidUntil and CacheDuration return the sooner timestamp" do
       Timecop.freeze(Time.parse("2020-01-01T10:12:55Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor6)
-        assert_equal '2020-01-03T11:12:55Z', settings.valid_until
+        assert_equal '2020-01-03T10:12:55Z', settings.valid_until
       end
 
       Timecop.freeze(Time.parse("2020-01-01T10:12:55Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor6)
-        assert_equal '2020-01-03T11:12:55Z', settings.valid_until
+        assert_equal '2020-01-03T10:12:55Z', settings.valid_until
       end
 
       Timecop.freeze(Time.parse("2020-01-03T10:12:55Z", Time.now.utc)) do