teems 0.3.0 → 0.3.2

data/lib/teems/services/safari_oauth.rb

@@ -116,12 +116,28 @@ module Teems
 
     # Polls Safari's URL bar via AppleScript and manages Safari tab navigation
     module SafariOAuthPolling
+      # Sign-in can require an account picker, MFA or a PIV/CAC certificate prompt, so the
+      # redirect is polled in chunks for several minutes rather than a single short burst.
+      POLL_TICK_SECONDS = 0.1
+      POLL_CHUNK_SECONDS = 15
+      POLL_CHUNKS = 12
+
       private
 
       def poll_safari_query_redirect
-        raw = run_applescript(poll_query_redirect_script).to_s
-        if raw.empty? || raw == 'timeout'
-          log('Safari OAuth: fast capture missed, falling back')
+        POLL_CHUNKS.times do |chunk|
+          raw = run_applescript(poll_query_redirect_script).to_s
+          return handle_poll_result(raw) unless raw == 'timeout'
+
+          announce_sign_in_wait(chunk)
+        end
+        log('Safari OAuth: timed out waiting for the sign-in redirect')
+        nil
+      end
+
+      def handle_poll_result(raw)
+        if raw.empty?
+          log('Safari OAuth: unable to read Safari tab URLs')
           return nil
         end
 
@@ -129,19 +145,30 @@ module Teems
         parse_oauth_params(raw)
       end
 
-      # Poll for ?code= in the URL — Safari's URL property includes query strings
+      def announce_sign_in_wait(chunk)
+        return notify('Waiting for you to finish signing in to Safari...') if chunk.zero?
+
+        log("Safari OAuth: still waiting for sign-in (#{(chunk + 1) * POLL_CHUNK_SECONDS}s)")
+      end
+
+      # Poll every tab for ?code= — Safari's URL property includes query strings, and the
+      # redirect can land in a tab other than the one we opened.
       def poll_query_redirect_script
         <<~APPLESCRIPT
           tell application "Safari"
-            repeat 600 times
-              try
-                set pageURL to URL of current tab of front window
-                if pageURL contains "teams.microsoft.com/go?" then
-                  set codeStart to offset of "?" in pageURL
-                  return text (codeStart + 1) thru -1 of pageURL
-                end if
-              end try
-              delay 0.02
+            repeat #{(POLL_CHUNK_SECONDS / POLL_TICK_SECONDS).to_i} times
+              repeat with w in windows
+                repeat with t in tabs of w
+                  try
+                    set pageURL to (URL of t) as text
+                    if pageURL contains "teams.microsoft.com/go?" then
+                      set codeStart to offset of "?" in pageURL
+                      return text (codeStart + 1) thru -1 of pageURL
+                    end if
+                  end try
+                end repeat
+              end repeat
+              delay #{POLL_TICK_SECONDS}
             end repeat
             return "timeout"
           end tell
@@ -192,20 +219,20 @@ module Teems
       include SafariOAuthPolling
 
       SKYPE_RESOURCE = 'https://api.spaces.skype.com'
+      # Used when no previous login is on disk; Entra ID resolves the tenant from the account.
+      DEFAULT_TENANT = 'common'
 
       private
 
       def try_safari_oauth
         hint, tenant = stored_login_hint
-        return nil unless tenant
-
-        log('Trying fast Safari OAuth flow...')
-        safari_code_flow({ tenant: tenant, hint: hint })
+        log('Trying Safari OAuth flow...')
+        safari_code_flow({ tenant: tenant || DEFAULT_TENANT, hint: hint })
       rescue StandardError => e
         log("Safari OAuth error: #{e.class}: #{e.message}")
         nil
       ensure
-        close_teams_tab if tenant
+        close_teams_tab
       end
 
       def safari_code_flow(context)
@@ -273,12 +300,19 @@ module Teems
       # :reek:FeatureEnvy
       def assemble_safari_result(context, graph, skype)
         spaces_token = skype[:spaces_token]
-        { auth_token: graph['access_token'],
+        auth_token = graph['access_token']
+        { auth_token: auth_token,
           skype_token: exchange_skype_via_http(spaces_token),
           skype_spaces_token: spaces_token, chatsvc_token: nil,
           refresh_token: skype[:refresh_token],
           client_id: OAuthUrlBuilder::TEAMS_APP_ID,
-          tenant_id: context[:tenant] }
+          tenant_id: resolved_tenant(auth_token, context[:tenant]) }
+      end
+
+      # Prefer the tenant the token was actually issued for over the placeholder used to
+      # start the flow, so refreshes hit the tenant-specific endpoint.
+      def resolved_tenant(auth_token, requested)
+        decode_jwt(auth_token.to_s)&.fetch('tid', nil) || requested
       end
     end
   end

data/lib/teems/services/token_extractor.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'open3'
 require_relative 'token_extractor_scripts'
 require_relative 'token_exchange_scripts'
 require_relative 'headless_extract'
@@ -58,7 +57,7 @@ module Teems
       end
 
       def run_applescript(script)
-        output, _stderr, status = Open3.capture3('osascript', '-e', script)
+        output, _stderr, status = Support::Subprocess.capture3('osascript', '-e', script)
         return applescript_failure(status) unless status.success?
 
         output.strip
@@ -396,6 +395,7 @@ module Teems
       end
 
       def log(message) = @output&.debug(message)
+      def notify(message) = @output&.info(message)
     end
   end
 end

data/lib/teems/support/subprocess.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+module Teems
+  module Support
+    # Wrapper around Open3.capture3 for long-running child processes.
+    #
+    # Open3 reads stdout and stderr on background threads. When the process is signalled
+    # while those reads are in flight, the pipes close underneath them and each thread
+    # raises IOError, which Ruby prints as a backtrace before the main thread can exit
+    # cleanly. Waiting on Safari sign-in or the headless helper keeps us inside capture3
+    # for minutes at a time, so Ctrl-C there is routine rather than exceptional.
+    #
+    # Reader threads inherit Thread.report_on_exception when they are created, so muting
+    # it for the duration of the call silences exactly those threads and nothing else.
+    module Subprocess
+      module_function
+
+      def capture3(*command)
+        previous = Thread.report_on_exception
+        Thread.report_on_exception = false
+        Open3.capture3(*command)
+      ensure
+        Thread.report_on_exception = previous
+      end
+    end
+  end
+end

data/lib/teems/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Teems
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/teems.rb

@@ -78,6 +78,7 @@ module Teems
     autoload :MessageFormatter, 'teems/formatters/message_formatter'
     autoload :MarkdownFormatter, 'teems/formatters/markdown_formatter'
     autoload :CalendarFormatter, 'teems/formatters/calendar_formatter'
+    autoload :TranscriptMarkdown, 'teems/formatters/transcript_markdown'
   end
 
   # CLI commands implementing user-facing functionality
@@ -95,6 +96,7 @@ module Teems
     autoload :Ooo, 'teems/commands/ooo'
     autoload :Org, 'teems/commands/org'
     autoload :Meeting, 'teems/commands/meeting'
+    autoload :Transcripts, 'teems/commands/transcripts'
     autoload :Status, 'teems/commands/status'
   end
 
@@ -117,5 +119,6 @@ module Teems
     autoload :ErrorLogger, 'teems/support/error_logger'
     autoload :Timezone, 'teems/support/timezone'
     autoload :TimeParsing, 'teems/support/time_parsing'
+    autoload :Subprocess, 'teems/support/subprocess'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teems
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Boehs
@@ -49,12 +49,14 @@ files:
 - lib/teems/commands/org.rb
 - lib/teems/commands/status.rb
 - lib/teems/commands/sync.rb
+- lib/teems/commands/transcripts.rb
 - lib/teems/commands/who.rb
 - lib/teems/formatters/calendar_formatter.rb
 - lib/teems/formatters/format_utils.rb
 - lib/teems/formatters/markdown_formatter.rb
 - lib/teems/formatters/message_formatter.rb
 - lib/teems/formatters/output.rb
+- lib/teems/formatters/transcript_markdown.rb
 - lib/teems/models/account.rb
 - lib/teems/models/channel.rb
 - lib/teems/models/chat.rb
@@ -83,6 +85,7 @@ files:
 - lib/teems/services/token_store.rb
 - lib/teems/support/error_logger.rb
 - lib/teems/support/help_formatter.rb
+- lib/teems/support/subprocess.rb
 - lib/teems/support/time_parsing.rb
 - lib/teems/support/timezone.rb
 - lib/teems/support/xdg_paths.rb