Finish pulling out unison-credentials as a separate package

Author: ChrisPenner

lib/unison-credentials/package.yaml

@@ -8,16 +8,19 @@ dependencies:
   - base
   - aeson
   - containers
+  - filepath
   - jose
   - text
   - base64-bytestring
   - lens
+  - lock-file
   - memory
   - network-uri
   - time
+  - transformers
   - unison-core1
   - unison-prelude
-  - lock-file
+  - unliftio
 
 library:
   source-dirs: src
@@ -44,6 +47,7 @@ default-extensions:
   - LambdaCase
   - MultiParamTypeClasses
   - NamedFieldPuns
+  - OverloadedRecordDot
   - OverloadedStrings
   - PatternSynonyms
   - RankNTypes

lib/unison-credentials/unison-credentials.cabal

@@ -42,6 +42,7 @@ library
       LambdaCase
       MultiParamTypeClasses
       NamedFieldPuns
+      OverloadedRecordDot
       OverloadedStrings
       PatternSynonyms
       RankNTypes
@@ -57,13 +58,16 @@ library
     , base
     , base64-bytestring
     , containers
+    , filepath
     , jose
     , lens
     , lock-file
     , memory
     , network-uri
     , text
     , time
+    , transformers
     , unison-core1
     , unison-prelude
+    , unliftio
   default-language: Haskell2010

parser-typechecker/package.yaml

@@ -36,12 +36,10 @@ library:
     - mtl
     - murmur-hash
     - mutable-containers
-    - network-uri
     - nonempty-containers
     - pretty-simple
     - regex-tdfa
     - semialign
-    - servant-client
     - stm
     - text
     - these

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

@@ -14,7 +14,6 @@ import Text.Printf (printf)
 import U.Codebase.Reference qualified as C.Reference
 import U.Codebase.Sqlite.DbId (HashVersion (..), SchemaVersion (..))
 import U.Codebase.Sqlite.Queries qualified as Q
-import Unison.Auth.CredentialManager (getOrCreatePersonalKey)
 import Unison.Codebase (CodebasePath)
 import Unison.Codebase.Init (BackupStrategy (..), VacuumStrategy (..))
 import Unison.Codebase.Init.OpenCodebaseError (OpenCodebaseError (OpenCodebaseUnknownSchemaVersion))
@@ -42,6 +41,8 @@ import Unison.Sqlite.Connection qualified as Sqlite.Connection
 import Unison.Util.Monoid (foldMapM)
 import Unison.Util.Pretty qualified as Pretty
 import UnliftIO qualified
+import Unison.Auth.CredentialManager qualified as CredMan
+import Unison.Auth.PersonalKey qualified as PK
 
 -- | Mapping from schema version to the migration required to get there.
 -- E.g. The migration at index 2 must be run on a codebase at version 1.
@@ -161,7 +162,8 @@ ensureCodebaseIsUpToDate localOrRemote root getDeclType termBuffer declBuffer sh
 
     Region.displayConsoleRegions do
       (`UnliftIO.finally` finalizeRegion) do
-        getOrCreatePersonalKey
+        credMan <- CredMan.newCredentialManager
+        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.
         let highestKnownSchemaVersion = fst . head $ Map.toDescList migs

parser-typechecker/unison-parser-typechecker.cabal

@@ -220,12 +220,10 @@ library
     , mtl
     , murmur-hash
     , mutable-containers
-    , network-uri
     , nonempty-containers
     , pretty-simple
     , regex-tdfa
     , semialign
-    , servant-client
     , stm
     , text
     , these

unison-cli/package.yaml

@@ -21,7 +21,6 @@ library:
     - ansi-terminal
     - attoparsec
     - base
-    - base64-bytestring
     - bytestring
     - cmark
     - co-log-core
@@ -47,10 +46,8 @@ library:
     - http-client >= 0.7.6
     - http-client-tls
     - http-types
-    - jose
     - ki
     - lens
-    - lock-file
     - lsp >= 2.2.0.0
     - lsp-types >= 2.0.2.0
     - megaparsec
@@ -87,6 +84,7 @@ library:
     - unison-codebase-sqlite-hashing-v2
     - unison-core
     - unison-core1
+    - unison-credentials
     - unison-hash
     - unison-merge
     - unison-parser-typechecker

unison-cli/unison-cli.cabal

@@ -218,7 +218,6 @@ library
     , ansi-terminal
     , attoparsec
     , base
-    , base64-bytestring
     , bytestring
     , cmark
     , co-log-core
@@ -244,10 +243,8 @@ library
     , http-client >=0.7.6
     , http-client-tls
     , http-types
-    , jose
     , ki
     , lens
-    , lock-file
     , lsp >=2.2.0.0
     , lsp-types >=2.0.2.0
     , megaparsec
@@ -284,6 +281,7 @@ library
     , unison-codebase-sqlite-hashing-v2
     , unison-core
     , unison-core1
+    , unison-credentials
     , unison-hash
     , unison-merge
     , unison-parser-typechecker