git-fit 0.10.11 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ad8e07b35c5dc5be5cd8e9067fdaa21dc1684a6d5d5bb14ed873243c926de5
-  data.tar.gz: 1b4057796536c438ce997cccf15268fa121f5ad28f19f7ba0af30922c374d2c5
+  metadata.gz: 49c616974f43c0eef2a07460e664450cffb887629d63b0e7d9f64e9da73dec09
+  data.tar.gz: 8924a27a358440f1f1a2bd1b233d6a11589d5aca0eb9c68be63bd31679e5e9af
 SHA512:
-  metadata.gz: c835f47ca63aebfb8e7493fc522dca3f77768469d8b1b73d5293d882c1ccada07e03db64fae6063c5d2628ee579563e4842e75c6c5d1d2a4163a20801c337ec4
-  data.tar.gz: d0858df7943c64dd1ca22089be6eb8bfb09194fe3a2b8124c4b95051315edc095518388e6d76fe9a8d3f5c75b357a0f02cf0a7a9e075b6c9d68bf83a1bf27650
+  metadata.gz: 42ea6e2aaef24cfb9f3aecf136ac365542bca0ce9824ee0bbba2b1e970c28a1f7a3db201be81cd3717a3bc85283c89274051e6ecef7d83df89105599e83a588b
+  data.tar.gz: 30f1c4f88ac926e4581159e7a76ed92e0fc88ef764e9145d5901efacbab53baf387bbe7aad2864afdd46ecaa5d548043b1cd9e61ed2ed8009bf169d9d70145f8

data/lib/git_fit/config_template.rb

@@ -48,6 +48,8 @@ module GitFit
           # xingzhe:                                     # env: GIT_FIT_XINGZHE_EMAIL
           #   email: ""                                  # env: GIT_FIT_XINGZHE_PASSWORD
           #   password: ""
+          #   session_path: ""                           # env: GIT_FIT_XINGZHE_SESSION_PATH
+          #                                              # default data/cache/xingzhe_session.json
 
         export:
           json:

data/lib/git_fit/sync/xingzhe.rb

@@ -22,14 +22,17 @@ module GitFit
 
       RAW_EXT = 'json'
 
+      SESSION_TTL = 30 * 24 * 60 * 60
+
       register_adapter
       config_key 'xingzhe'
-      register_config :email, :password
+      register_config :email, :password, :session_path
 
       def initialize(...)
         super
         @email = @config['email']
         @password = @config['password']
+        @session_path = @config['session_path'] || File.join('data', 'cache', 'xingzhe_session.json')
       end
 
       def before_call
@@ -38,9 +41,15 @@ module GitFit
       end
 
       def authenticate
-        result = login
-        @auth_method = 'login' if result
-        result
+        if load_session && session_valid?
+          @auth_method = 'cached'
+          return true
+        end
+        if login
+          @auth_method = 'login'
+          return true
+        end
+        false
       end
 
       def pending_ids
@@ -67,6 +76,14 @@ module GitFit
         process_activity(pending[:summary], pending[:type])
       end
 
+      def auth_error?
+        [302, 401, 403].include?(@last_http_code)
+      end
+
+      def last_auth_code
+        @last_http_code
+      end
+
       private
 
       def http_request(method, path, body: nil, params: nil, headers: {})
@@ -85,7 +102,26 @@ module GitFit
         http.use_ssl = true
         http.open_timeout = 30
         http.read_timeout = 60
-        http.start { |h| h.request(req) }
+        resp = http.start { |h| h.request(req) }
+        @last_http_code = resp.code.to_i
+        resp
+      end
+
+      def authed_get(path, params: nil)
+        resp = http_request(:get, path, params: params, headers: @headers || {})
+        return resp unless auth_failure?(resp)
+
+        remove_stale_session
+        return resp unless login
+
+        http_request(:get, path, params: params, headers: @headers)
+      end
+
+      def auth_failure?(resp)
+        return false unless resp
+        c = resp.code.to_i
+        (c == 400 && resp.body.to_s.include?('not allowed')) ||
+          [302, 401, 403].include?(c)
       end
 
       def login
@@ -102,10 +138,57 @@ module GitFit
         cookie = extract_cookie(resp)
         return false unless cookie
 
+        @session_expires_at = parse_max_age(resp)
+        @headers = { 'Cookie' => cookie, 'Accept' => 'application/json' }
+        save_session(cookie)
+        true
+      end
+
+      def load_session
+        return false unless File.exist?(@session_path)
+
+        data = JSON.parse(File.read(@session_path))
+        cookie = data['cookie']
+        @session_expires_at = data['expires_at']
+        return false unless cookie
+
         @headers = { 'Cookie' => cookie, 'Accept' => 'application/json' }
         true
+      rescue StandardError => e
+        warn "XingZhe: failed to load cached session: #{e.message}"
+        remove_stale_session
+        false
+      end
+
+      def session_valid?
+        return false unless @session_expires_at
+        Time.now.to_i < @session_expires_at - 60
+      end
+
+      def save_session(cookie)
+        FileUtils.mkdir_p(File.dirname(@session_path))
+        File.write(@session_path, JSON.generate({
+          cookie: cookie,
+          expires_at: @session_expires_at,
+        }))
+      rescue StandardError => e
+        warn "XingZhe: failed to save session: #{e.message}"
+      end
+
+      def remove_stale_session
+        File.delete(@session_path) if File.exist?(@session_path)
+      rescue StandardError => e
+        warn "XingZhe: failed to remove stale session: #{e.message}"
+      end
+
+      def parse_max_age(resp)
+        set_cookie = resp['set-cookie'].to_s
+        ma = set_cookie[/Max-Age=(\d+)/, 1]
+        ma ? Time.now.to_i + ma.to_i : Time.now.to_i + SESSION_TTL
       end
 
+      attr_reader :session_path
+
       def rsa_encrypt(password)
         pem = "-----BEGIN PUBLIC KEY-----\n#{RSA_PUBKEY}\n-----END PUBLIC KEY-----"
         key = OpenSSL::PKey::RSA.new(pem)
@@ -124,9 +207,8 @@ module GitFit
       end
 
       def fetch_page(offset, limit)
-        resp = http_request(:get, WORKOUTS_PATH,
+        resp = authed_get(WORKOUTS_PATH,
           params: { offset: offset, limit: limit },
-          headers: @headers
         )
         return nil unless resp.code.to_i == 200
 
@@ -202,7 +284,7 @@ module GitFit
       end
 
       def fetch_stream(id)
-        resp = http_request(:get, "#{STREAM_PATH}#{id}/stream/", headers: @headers || {})
+        resp = authed_get("#{STREAM_PATH}#{id}/stream/")
         return nil unless resp.code.to_i == 200
 
         JSON.parse(resp.body).dig('data')

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.10.11'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.11.1
 platform: ruby
 authors:
 - Lax