git-fit 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990b506f035333d622b5112652251ecfb100fe152493439b2573fe002dcf2420
-  data.tar.gz: 8935f8b3f86d62926666ff6fbd37401b230f4182260421c40b7a2e5ecc9e0d03
+  metadata.gz: c4cd7d43e318f96dcab83874635c24e7ead0ec772f550f2fdcd9ea7c81a6a44b
+  data.tar.gz: e106683db19d232870990bcbc59bcb35f59be4fec8c33d1141ec858632446522
 SHA512:
-  metadata.gz: 8c5306f042f21e18a8f5761342fd70a8ae13a5660fc03e02496b8dd0288e87d8711cb4bf826fa33d3509ac5497da70730708f40bb24d8cf13157ba93e94f52e6
-  data.tar.gz: d5cabbcad852447fc7b0c50489de64f83d8c732f849f0c483704f6565244759b841864d09c72bba840cb2cc265192c1b1f3b364b01c306539dd55d31fc3977e9
+  metadata.gz: da0ac336bbe16839be618bb0ddbcc6db7513630231b89cd690249568908d0fbe0f20110ec2904d589e18b3bb2ff14431e7138b846b9c3dd0ed65b4018f033e29
+  data.tar.gz: 101b8bc30d222858e2b61a592027ae701fb4563fdfeb832688929ba01cd7c87588411023cec5057b8af8fe7f81a15c18de62a3b25a2b97577a3f11496de3b672

data/lib/git_fit/auth/garmin/strategy_a.rb

@@ -36,6 +36,7 @@ module GitFit
         MOBILE_FINGERPRINT = 'safari18_0'
         TLS_FINGERPRINTS = %w[safari18_0 safari17_0 chrome120 edge101 chrome124].freeze
         CURL_BINARY = 'curl-impersonate'
+        AUTH_FLAG = '-A'
 
         module_function
 
@@ -129,7 +130,7 @@ module GitFit
           if resp_type == 'MFA_REQUIRED'
             method = res.dig('customerMfaInfo', 'mfaLastMethodUsed') || 'email'
             res = handle_mfa(sso, method, login_params, post_headers, mfa_code,
-                             impersonate: MOBILE_FINGERPRINT, jar: jar, output: body)
+                             impersonate: MOBILE_FINGERPRINT, jar: jar, output: body, email: email)
             resp_type = res.dig('responseStatus', 'type')
           end
 
@@ -215,7 +216,7 @@ module GitFit
           if resp_type == 'MFA_REQUIRED'
             method = res.dig('customerMfaInfo', 'mfaLastMethodUsed') || 'email'
             res = handle_mfa(sso, method, login_params, post_headers, mfa_code,
-                             impersonate: imp, jar: jar, output: body)
+                             impersonate: imp, jar: jar, output: body, email: email)
             resp_type = res.dig('responseStatus', 'type')
           end
 
@@ -230,8 +231,8 @@ module GitFit
           nil
         end
 
-        def handle_mfa(sso, method, login_params, post_headers, mfa_code, impersonate:, jar:, output:)
-          code = resolve_mfa_code(mfa_code)
+        def handle_mfa(sso, method, login_params, post_headers, mfa_code, impersonate:, jar:, output:, email:)
+          code = resolve_mfa_code(mfa_code, email)
           mfa_data = {
             'mfaMethod' => method,
             'mfaVerificationCode' => code,
@@ -266,22 +267,22 @@ module GitFit
           raise GitFit::Sync::AuthError, 'MFA verification failed on all endpoints'
         end
 
-        def resolve_mfa_code(mfa_code)
-          code = mfa_code
-          code = ENV['SYNC__GARMIN__MFA_CODE'] if code.nil? || code.to_s.empty?
-          if (code.nil? || code.to_s.empty?) && $stdin.tty?
-            $stderr.write('Enter MFA code: ')
-            $stderr.flush
-            code = $stdin.gets
+        def resolve_mfa_code(mfa_code, email)
+          code = mfa_code.to_s.strip
+          if code.empty?
+            warn "[garmin_auth] Garmin sent a verification code to #{email}"
+            $stderr.write('Enter the 6-digit code: ') if $stdin.tty?
+            code = $stdin.gets.to_s.strip
           end
-          if code.nil? || code.to_s.empty?
-            raise GitFit::Sync::AuthError,
-                  'MFA required but SYNC__GARMIN__MFA_CODE env var not set and stdin unavailable'
-          end
-          code = code.strip
-          raise GitFit::Sync::AuthError, 'SYNC__GARMIN__MFA_CODE is empty' if code.empty?
-
-          code
+          return code unless code.empty?
+
+          raise GitFit::Sync::AuthError,
+                "MFA required — check your email (#{email}) for the code.\n" \
+                "  This code is valid for a few minutes.\n\n" \
+                "  To continue, choose one:\n" \
+                "    echo \"<CODE>\" | git fit auth garmin #{AUTH_FLAG}\n" \
+                "    git fit auth garmin #{AUTH_FLAG} --mfa-code <CODE>\n\n" \
+                "  If the code has expired, request a new one: git fit auth garmin #{AUTH_FLAG}"
         end
 
         def check_curl_available!

data/lib/git_fit/auth/garmin/strategy_b.rb

@@ -19,12 +19,12 @@ module GitFit
         LOGIN_DELAY_MAX = 45.0
         SESSION_CACHE_DIR = 'data/cache'
         REDIRECT_STATUSES = [301, 302, 303, 307, 308].freeze
+        AUTH_FLAG = '-B'
 
         module_function
 
         def call(email:, password:, domain: 'garmin.com', mfa_code: nil)
           mfa_code = mfa_code.to_s.strip
-          mfa_code = ENV['SYNC__GARMIN__MFA_CODE'].to_s.strip if mfa_code.empty?
           sso = "https://sso.#{domain}"
           session_path = _session_file_path(domain)
           chrome_path = _find_chrome
@@ -102,16 +102,7 @@ module GitFit
           raise GitFit::Sync::AuthError, "Unexpected login response: #{resp_type}" unless resp_type == 'MFA_REQUIRED'
 
           mfa_method = data.dig('customerMfaInfo', 'mfaLastMethodUsed') || 'email'
-          warn "MFA required (method: #{mfa_method})"
-
-          code = mfa_code.to_s.strip
-          if code.empty? && $stdin.tty?
-            warn 'Enter MFA code: '
-            code = $stdin.gets.to_s.strip
-          end
-          if code.empty?
-            raise GitFit::Sync::AuthError, 'MFA required but no code provided (set SYNC__GARMIN__MFA_CODE or use stdin)'
-          end
+          code = resolve_mfa_code(email, mfa_code)
 
           warn 'verifying MFA code...'
           mfa_data = {
@@ -145,6 +136,24 @@ module GitFit
           url[/[?&]ticket=(ST-[^&\s]+)/, 1]
         end
 
+        def resolve_mfa_code(email, mfa_code)
+          code = mfa_code.to_s.strip
+          if code.empty?
+            warn "[garmin_auth_pw] Garmin sent a verification code to #{email}"
+            $stderr.write('Enter the 6-digit code: ') if $stdin.tty?
+            code = $stdin.gets.to_s.strip
+          end
+          return code unless code.empty?
+
+          raise GitFit::Sync::AuthError,
+                "MFA required — check your email (#{email}) for the code.\n" \
+                "  This code is valid for a few minutes.\n\n" \
+                "  To continue, choose one:\n" \
+                "    echo \"<CODE>\" | git fit auth garmin #{AUTH_FLAG}\n" \
+                "    git fit auth garmin #{AUTH_FLAG} --mfa-code <CODE>\n\n" \
+                "  If the code has expired, request a new one: git fit auth garmin #{AUTH_FLAG}"
+        end
+
         def _random_delay(label)
           delay = rand(LOGIN_DELAY_MIN..LOGIN_DELAY_MAX)
           warn "[garmin_auth_pw] #{label}: waiting #{delay.round}s for Cloudflare..."

data/lib/git_fit/auth/garmin.rb

@@ -61,6 +61,7 @@ module GitFit
         def sso_token(mode)
           email, password = sso_credentials
           creds = { email: email, password: password, domain: domain }
+          creds[:mfa_code] = @options[:mfa_code] if mfa_code_provided?
           case mode
           when :A then single_strategy(:A, creds)
           when :B then single_strategy(:B, creds)
@@ -68,6 +69,11 @@ module GitFit
           end
         end
 
+        def mfa_code_provided?
+          code = @options[:mfa_code]
+          !code.nil? && !code.to_s.strip.empty?
+        end
+
         def sso_credentials
           cfg = @config.sync_config('garmin')
           email = cfg['email'].to_s

data/lib/git_fit/cli.rb

@@ -77,6 +77,7 @@ module GitFit
     option :B, type: :boolean, desc: 'Garmin Strategy B: Playwright (default)'
     option :auto, type: :boolean, desc: 'Garmin auto: B first, fallback to A'
     option :sync, type: :boolean, desc: 'Garmin: promote cached token to auth_seed'
+    option :mfa_code, type: :string, desc: 'Garmin MFA code (from email), re-run to continue'
     def auth(source)
       if source == 'garmin'
         GitFit::Auth::Garmin.new(options, git_fit_config).call

data/lib/git_fit/version.rb

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

metadata

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