huginn_strava_agent 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2806334223a93f535eec627c84537b3d30affacf91ade6df381380d3c33eda2
-  data.tar.gz: 55cb8e7042f5661eaf3b5f98b4f4f69e2a757973f12c031a608abb4e21c4042b
+  metadata.gz: e58dd075a0272e7e2db4245f15f604b13d300362d2b639a07de53406c9e6bc6d
+  data.tar.gz: 838eaaf3790536a3af4961f47622bfa4676d75cd06e5cdf120ceef6812b481d5
 SHA512:
-  metadata.gz: 6fb6f5d192013b1e4732c1ac02ed0a210cf727c4d60dd283ab9abbf25d546135fa75629fb142aad6dc78e4386ba07c36883a10d8aef81ac06204c51f7e7d02a8
-  data.tar.gz: feb7d03492de0d0be57a8ab675b302b6ea70088e5861b9ee847b05614666191bc4bad8fe6ca7ef6f7fa4b4cb9c0ff0187490d1ae158eb807e2ddfe7570828eb6
+  metadata.gz: cb4cb08fe89928ab9dba767ac2508c410d1f106f0cbba4b7d12b865697f76441fe003b977cd00cdeac8043870a10686e4b7ede302b5b3d2a7a802fd4402e6cd7
+  data.tar.gz: ff1508ad1a3ed12c1c8710ae738b591641d7f8eddd56ad76f14f818471893f7be30843df3bb205181fba3a281e612b1ef95f01f8f4ae135a4330921254555a23

data/lib/huginn_strava_agent/strava_agent.rb

@@ -13,9 +13,11 @@ 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.
 
       `client_id` is mandatory for authentication.
 
@@ -99,8 +101,9 @@ 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',
       }
@@ -111,11 +114,16 @@ module Agents
     form_configurable :client_secret, type: :string
     form_configurable :refresh_token, type: :string
     form_configurable :bearer_token, type: :string
+    form_configurable :per_page, type: :string
     form_configurable :debug, type: :boolean
     form_configurable :expected_receive_period_in_days, type: :string
     def validate_options
       errors.add(:base, "type has invalid value: should be 'token_refresh' 'get_activities'") if interpolated['type'].present? && !%w(token_refresh get_activities).include?(interpolated['type'])
 
+      unless options['per_page'].present? || !['get_activities'].include?(options['type'])
+        errors.add(:base, "per_page is a required field")
+      end
+
       unless options['client_id'].present?
         errors.add(:base, "client_id is a required field")
       end
@@ -160,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}"
@@ -194,6 +208,18 @@ module Agents
       log_curl_output(response.code,response.body)
 
       payload = JSON.parse(response.body)
+      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
@@ -212,13 +238,12 @@ module Agents
           log "refresh not needed"
         end
       end
-
     end
     
     def get_activities()
 
       check_token_validity()
-      uri = URI.parse("https://www.strava.com/api/v3/athlete/activities")
+      uri = URI.parse("https://www.strava.com/api/v3/athlete/activities?per_page=#{interpolated['per_page']}")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{interpolated['bearer_token']}"
       
@@ -237,7 +262,7 @@ module Agents
       if payload != memory['last_status']
         payload.each do |activity|        
           found = false
-          if !memory['last_status'].nil? and memory['last_status']['activity'].present?
+          if !memory['last_status'].nil? and memory['last_status'].present?
             last_status = memory['last_status']
             if interpolated['debug'] == 'true'
               log "last_status"

metadata

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