Propagate Credential File changes

Author: ChrisPenner

lib/unison-credentials/src/Unison/Auth/CredentialManager.hs

@@ -3,7 +3,7 @@
 module Unison.Auth.CredentialManager
   ( saveCredentials,
     CredentialManager,
-    newCredentialManager,
+    globalCredentialManager,
     getCodeserverCredentials,
     getOrCreatePersonalKey,
     isExpired,
@@ -30,10 +30,10 @@ import UnliftIO qualified
 newtype CredentialManager = CredentialManager (UnliftIO.MVar (Maybe Credentials {- Credentials may or may not be initialized -}))
 
 -- | A global CredentialManager instance/singleton.
-globalCredentialsManager :: CredentialManager
-globalCredentialsManager = unsafePerformIO do
+globalCredentialManager :: CredentialManager
+globalCredentialManager = unsafePerformIO do
   CredentialManager <$> UnliftIO.newMVar Nothing
-{-# NOINLINE globalCredentialsManager #-}
+{-# NOINLINE globalCredentialManager #-}
 
 -- | Fetches the user's personal key from the active profile, if it exists.
 -- Otherwise it creates a new personal key, saves it to the active profile, and returns it.
@@ -74,9 +74,6 @@ getCodeserverCredentials credMan aud = runExceptT do
     True -> throwE (ReauthRequired aud)
     False -> pure codeserverCreds
 
-newCredentialManager :: CredentialManager
-newCredentialManager = globalCredentialsManager
-
 -- | Checks whether CodeserverCredentials are expired.
 isExpired :: (MonadIO m) => CodeserverCredentials -> m Bool
 isExpired CodeserverCredentials {fetchTime, tokens = Tokens {expiresIn}} = liftIO do

parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations.hs

@@ -162,7 +162,7 @@ ensureCodebaseIsUpToDate localOrRemote root getDeclType termBuffer declBuffer sh
 
     Region.displayConsoleRegions do
       (`UnliftIO.finally` finalizeRegion) do
-        credMan <- CredMan.newCredentialManager
+        let credMan = CredMan.globalCredentialManager
         keyThumbprint <- PK.personalKeyThumbprint <$> CredMan.getOrCreatePersonalKey credMan
         let migs = migrations keyThumbprint regionVar getDeclType termBuffer declBuffer root
         -- The highest schema that this ucm knows how to migrate to.

unison-cli/src/Unison/Auth/Tokens.hs

@@ -10,6 +10,7 @@ import Network.HTTP.Client.TLS qualified as HTTP
 import Network.HTTP.Types qualified as Network
 import System.Environment (lookupEnv)
 import Unison.Auth.CredentialManager
+import Unison.Auth.CredentialManager qualified as CredMan
 import Unison.Auth.Discovery (fetchDiscoveryDoc)
 import Unison.Auth.Types
 import Unison.Auth.UserInfo (getUserInfo)
@@ -37,7 +38,7 @@ newTokenProvider manager host = UnliftIO.try @_ @CredentialFailure $ do
       -- If the access token is provided via environment variable, we don't need to refresh it.
       pure accessToken
     Nothing -> do
-      creds@CodeserverCredentials {tokens, discoveryURI} <- throwEitherM $ getCodeserverCredentials manager host
+      creds@CodeserverCredentials {tokens, discoveryURI} <- throwEitherM $ CredMan.getCodeserverCredentials manager host
       let Tokens {accessToken = currentAccessToken} = tokens
       expired <- isExpired creds
       if expired

unison-cli/src/Unison/Codebase/Transcript/Runner.hs

@@ -96,7 +96,7 @@ withRunner ::
   (Runner -> m r) ->
   m r
 withRunner isTest verbosity ucmVersion action = do
-  credMan <- AuthN.newCredentialManager
+  let credMan = AuthN.globalCredentialManager
   authenticatedHTTPClient <- initTranscriptAuthenticatedHTTPClient credMan
 
   -- If we're in a transcript test, configure the environment to use a non-existent fzf binary

unison-cli/src/Unison/MCP/Cli.hs

@@ -107,7 +107,7 @@ cliToMCP projCtx onError cli = do
   MCP.Env {ucmVersion, codebase, runtime, workDir} <- ask
   initialPP <- ExceptT . liftIO $ Codebase.runTransactionExceptT codebase $ do
     ppForProjectContext projCtx
-  credMan <- AuthN.newCredentialManager
+  let credMan = AuthN.globalCredentialManager
   let tokenProvider :: AuthN.TokenProvider
       tokenProvider = AuthN.newTokenProvider credMan
   authenticatedHTTPClient <- AuthN.newAuthenticatedHTTPClient tokenProvider ucmVersion

unison-cli/src/Unison/Main.hs

@@ -147,7 +147,7 @@ main version = do
           Text.putStrLn $ Text.pack progName <> " version: " <> Version.gitDescribeWithDate version
         MCPServer -> do
           let ucmVersion = Version.gitDescribeWithDate version
-          credMan <- AuthN.newCredentialManager
+          let credMan = AuthN.globalCredentialManager
           authenticatedHTTPClient <- initTranscriptAuthenticatedHTTPClient ucmVersion credMan
           getCodebaseOrExit mCodePathOption SC.DontLock (SC.MigrateAfterPrompt SC.Backup SC.Vacuum) \(_initRes, _, theCodebase) -> do
             withRuntimes RTI.Persistent \(runtime, sbRuntime) -> do
@@ -183,7 +183,7 @@ main version = do
                       let noOpCheckForChanges _ = pure ()
                       let serverUrl = Nothing
                       let ucmVersion = Version.gitDescribeWithDate version
-                      credMan <- liftIO $ AuthN.newCredentialManager
+                      let credMan = AuthN.globalCredentialManager
                       authenticatedHTTPClient <- initTranscriptAuthenticatedHTTPClient ucmVersion credMan
                       startProjectPath <- Codebase.runTransaction theCodebase Codebase.expectCurrentProjectPath
                       launch
@@ -211,7 +211,7 @@ main version = do
                   let noOpCheckForChanges _ = pure ()
                   let serverUrl = Nothing
                   let ucmVersion = Version.gitDescribeWithDate version
-                  credMan <- liftIO $ AuthN.newCredentialManager
+                  let credMan = AuthN.globalCredentialManager
                   authenticatedHTTPClient <- initTranscriptAuthenticatedHTTPClient ucmVersion credMan
                   startProjectPath <- Codebase.runTransaction theCodebase Codebase.expectCurrentProjectPath
                   launch
@@ -328,7 +328,7 @@ main version = do
               void . Ki.fork scope $ LSP.spawnLsp lspFormattingConfig theCodebase runtime changeSignal
               let isTest = False
               let ucmVersion = Version.gitDescribeWithDate version
-              credMan <- liftIO $ AuthN.newCredentialManager
+              let credMan = AuthN.globalCredentialManager
               authenticatedHTTPClient <- initTranscriptAuthenticatedHTTPClient ucmVersion credMan
               mcpServerConfig <- MCP.initServer theCodebase runtime sbRuntime (Just currentDir) ucmVersion authenticatedHTTPClient
               Server.startServer