go_to_webinar 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030fc9f7cfb6d2822a0f5b5a256d6d331fcac1ddfdf8b58638e6955f19136f4a
-  data.tar.gz: 3f412135c3e04ad4b05933428bcbb66c50a52514ae8dddc6f01114f2b4299309
+  metadata.gz: 5382c5f098cb5115ef8b73097a267e7ad0525ca74426fb7b3dce8913ae3a5f13
+  data.tar.gz: 486d53cc45226b5870009bbab44176a0dfbdcbda1f106772c7a8713a6ef4745e
 SHA512:
-  metadata.gz: 93997131e929a036bf5d3da5d9b87cbfbbea7927c067504637a76747cc03735096def75cab82aeaf3c53f2ac27c63a4299ea05b6a65e3e636157cdf8b2cc279e
-  data.tar.gz: d9bb3ae9dc2ee6128d06eddd1c1bea5446108e3be17674bfb4f36aa1db3033bc077a55a150f1adc4e41f41db0623130305a404bf36dd4913f06e38a486bef634
+  metadata.gz: 4d5524d982a537735b73ea4f6d71c7a60c4430ec6556417b4fa6ad60bdd52091bbde468ef6bccb8e3adb9f767147e221daeee8a87f471a9a269b88b120cd3148
+  data.tar.gz: 542eba8c96367c9fb30531e54928eb26f75f4b9ce97f8657c33cfb5e127108d478ff078fed300896b20dc4cb83bb8ce1e554a56ff8ae7383cf933f1c817d44ea

data/lib/go_to_webinar/auth/client.rb

@@ -9,19 +9,20 @@ module GoToWebinar
       def initialize(basic_auth_username: nil, basic_auth_password: nil, consumer_key: nil, secret_key: nil)
         config = GoToWebinar::Auth.configuration
         @redis = Redis.new(url: config.redis_url)
-        @basic_auth_username = basic_auth_username || config.basic_auth_username
-        @basic_auth_password = basic_auth_password || config.basic_auth_password
+        @basic_auth_username = config.basic_auth_username
+        @basic_auth_password = config.basic_auth_password
         @consumer_key = consumer_key || config.consumer_key
         @secret_key = secret_key || config.secret_key
         @site = config.site
         @authorize_url = config.authorize_url
+        @authorize_optional_params = config.authorize_optional_params
         @token_url = config.token_url
         @auth_scheme = config.auth_scheme
         @oauth2_client = new_oauth2_client
       end
 
       def new_oauth2_client
-        oauth2_client = OAuth2::Client.new(
+        OAuth2::Client.new(
           consumer_key,
           secret_key,
           site: site,
@@ -47,7 +48,7 @@ module GoToWebinar
 
       private
 
-      attr_accessor :redis, :site, :authorize_url, :authorize_url_optional_params
+      attr_accessor :redis, :site, :authorize_url, :authorize_optional_params
       attr_accessor :token_url, :auth_scheme, :oauth2_client
 
       def get_access_token_from_redis(redis_key: 'g2w_access_token')
@@ -56,7 +57,10 @@ module GoToWebinar
         token_hash = JSON.parse(token_json)&.[]("token") if token_json
         @access_token = OAuth2::AccessToken.from_hash(oauth2_client, token_hash) if token_hash
 
-        # if we found it redis, let's return it
+        # if we found it in redis, and it's expired, let's just refresh it
+        @access_token = refresh_access_token if @access_token&.expired?
+
+        # let's return it if we got it =)
         return @access_token if @access_token
 
         # if it doesn't currently exist in redis, return nil
@@ -72,18 +76,18 @@ module GoToWebinar
           consumer_key,
           secret_key,
           site: site,
-          authorize_url: authorize_url,
+          authorize_url: authorize_url_with_params,
           token_url: token_url,
           auth_scheme: auth_scheme
         )
       end
 
-      def authorize_url
+      def authorize_url_with_params
         authorize_url + '?' + authorize_url_params
       end
 
       def authorize_url_params
-        URI.encode_www_form({client_id: consumer_key}.merge(authorize_url_optional_params))
+        URI.encode_www_form({client_id: consumer_key}.merge(authorize_optional_params))
       end
     end
   end

data/lib/go_to_webinar/client.rb

@@ -45,7 +45,7 @@ module GoToWebinar
         retries ||= 0
         yield
       rescue RestClient::Forbidden => exception
-        raise unless (retires += 1) < 2
+        raise unless (retries += 1) < 2
         raise unless int_error_code(exception) == "InvalidToken"
         raise unless @access_token&.expired?
 

data/lib/go_to_webinar/version.rb

@@ -1,3 +1,3 @@
 module GoToWebinar
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_to_webinar
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Danilo Jeremias da Silva