unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-04 21:57:25 +03:00
Code Issues Projects Releases Wiki Activity

Use production share server (#3138)

Browse Source 
* Use production share server

* Don't use port in default share server

It won't recognize the codeserver in auth checks if the port is implied
later, since https://host:443 /= https://host
This commit is contained in:
Chris Penner 2022-06-21 10:17:58 -06:00 committed by GitHub
parent 8677aef155
commit 021b9965f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parser-typechecker/src/Unison/Share/Types.hs
View File

@ -116,9 +116,9 @@ newtype CodeserverId = CodeserverId {codeserverId :: Text}
--
-- >>> import Data.Maybe (fromJust)
-- >>> import Network.URI (parseURI)
-- >>> codeserverIdFromURI (CodeserverURI . fromJust $ parseURI "http://localhost:5424/api")
-- >>> codeserverIdFromURI (CodeserverURI . fromJust $ parseURI "https://share.unison-lang.org/api")
-- Right "localhost"
-- >>> codeserverIdFromURI (fromJust $ parseURI "http://localhost:5424/api")
-- >>> codeserverIdFromURI (fromJust $ parseURI "https://share.unison-lang.org/api")
-- Right "localhost:5424"
-- Right "share.unison-lang.org"
codeserverIdFromURI :: URI -> Either Text CodeserverId
codeserverIdFromURI uri =
@ -129,7 +129,7 @@ codeserverIdFromURI uri =
-- | Builds a CodeserverId from a URIAuth
codeserverIdFromURIAuth :: URIAuth -> CodeserverId
codeserverIdFromURIAuth ua =
(CodeserverId (Text.pack $ uriUserInfo ua <> uriRegName ua <> uriPort ua))
(CodeserverId (Text.pack $ uriRegName ua <> uriPort ua))
-- | Gets the CodeserverId for a given CodeserverURI
codeserverIdFromCodeserverURI :: CodeserverURI -> CodeserverId

7
unison-cli/src/Unison/Share/Codeserver.hs
View File

@ -12,14 +12,13 @@ import UnliftIO.Environment (lookupEnv)
defaultCodeserver :: CodeserverURI
defaultCodeserver = unsafePerformIO $ do
lookupEnv "UNISON_SHARE_HOST" <&> \case
-- TODO: swap to production share before release.
Nothing ->
CodeserverURI
{ codeserverScheme = Share.Https,
codeserverUserInfo = "",
codeserverRegName = "share-next.us-west-2.unison-lang.org",
codeserverPort = Just 443,
codeserverPath = ["api"]
codeserverRegName = "api.unison-lang.org",
codeserverPort = Nothing,
codeserverPath = []
}
Just shareHost ->
fromMaybe (error $ "Share Host is not a valid URI: " <> shareHost) $ do