Revert "Revert "Made changes based on omniauth#17 which was not merge…

…d yet into master""

This reverts commit ef9e5eb.

lib/omniauth/strategies/okta.rb

@@ -40,10 +40,10 @@ class Okta < OmniAuth::Strategies::OAuth2
           h[:raw_info] = raw_info unless skip_info?
 
           if access_token
-            h[:id_token] = access_token.token
+            h[:id_token] = oauth2_access_token['id_token']
 
-            if !options[:skip_jwt] && !access_token.token.nil?
-              h[:id_info] = validated_token(access_token.token)
+            if !options[:skip_jwt] && !h[:id_token].nil?
+              h[:id_info] = validated_token(h[:id_token])
             end
           end
         end