huginn_strava_agent 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc6684033edfcf1fa8b4b600fc5eac5d6f217bccb063c45972a5d4295d6d23d1
-  data.tar.gz: f9549083e22ad194108b71a30eb99f261807cbb60a4fa0c4d90302bc91f0b902
+  metadata.gz: e58dd075a0272e7e2db4245f15f604b13d300362d2b639a07de53406c9e6bc6d
+  data.tar.gz: 838eaaf3790536a3af4961f47622bfa4676d75cd06e5cdf120ceef6812b481d5
 SHA512:
-  metadata.gz: f4d13b291a2220746b6c6a9244502301806ded70cafcaa5e4c9d686b18da69de85b4e13ccb7d1b06f2409ce961ac6edf03103ffc42295e03e9e0b988412b546e
-  data.tar.gz: 49901394e2ed814d70742704ca17986de380123a70c68545a3679d337c744027293df23e2c0a71ce332c2e95860d8da93120b503619c107001321291d0f91406
+  metadata.gz: cb4cb08fe89928ab9dba767ac2508c410d1f106f0cbba4b7d12b865697f76441fe003b977cd00cdeac8043870a10686e4b7ede302b5b3d2a7a802fd4402e6cd7
+  data.tar.gz: ff1508ad1a3ed12c1c8710ae738b591641d7f8eddd56ad76f14f818471893f7be30843df3bb205181fba3a281e612b1ef95f01f8f4ae135a4330921254555a23

data/lib/huginn_strava_agent/strava_agent.rb

@@ -13,9 +13,9 @@ module Agents
 
       `debug` is used for verbose mode.
 
-      `bearer_token` is mandatory for authentication.
+      `bearer_token` is mandatory for authentication (to avoid issue when refresh is needed, continue to use the default value for this field).
 
-      `refresh_token` is needed to refresh your token.
+      `refresh_token` is needed to refresh your token (to avoid issue when refresh is needed, continue to use the default value for this field).
 
       `per_page` is the number of result per page when possible.
 
@@ -101,8 +101,8 @@ module Agents
         'type' => 'get_activities',
         'client_id' => '',
         'client_secret' => '',
-        'refresh_token' => '',
-        'bearer_token' => '',
+        'refresh_token' => '{% credential strava_refresh_token %}',
+        'bearer_token' => '{% credential strava_bearer_token %}',
         'per_page' => '5',
         'debug' => 'false',
         'expected_receive_period_in_days' => '2',
@@ -168,6 +168,12 @@ module Agents
 
     private
 
+    def set_credential(name, value)
+      c = user.user_credentials.find_or_initialize_by(credential_name: name)
+      c.credential_value = value
+      c.save!
+    end
+
     def log_curl_output(code,body)
 
       log "request status : #{code}"
@@ -202,16 +208,28 @@ module Agents
       log_curl_output(response.code,response.body)
 
       payload = JSON.parse(response.body)
-      memory['credentials'] = payload
+      if interpolated['refresh_token'] != payload['refresh_token']
+        set_credential("strava_refresh_token", payload['refresh_token'])
+        if interpolated['debug'] == 'true'
+          log "strava_refresh_token credential updated"
+        end
+      end
+      if interpolated['bearer_token'] != payload['access_token']
+        set_credential("strava_bearer_token", payload['access_token'])
+        if interpolated['debug'] == 'true'
+          log "strava_bearer_token credential updated"
+        end
+      end
+      memory['expires_at'] = payload['expires_at']
 
     end
     
     def check_token_validity()
 
-      if memory['credentials'].nil?
+      if memory['expires_at'].nil?
         token_refresh()
       else
-        timestamp_to_compare = memory['credentials']['expires_at']
+        timestamp_to_compare = memory['expires_at']
         current_timestamp = Time.now.to_i
         difference_in_hours = (timestamp_to_compare - current_timestamp) / 3600.0
         if difference_in_hours < 2
@@ -220,7 +238,6 @@ module Agents
           log "refresh not needed"
         end
       end
-
     end
     
     def get_activities()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_strava_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Nicolas Germain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler