variant with either

Holmusk · Aug 18, 2024 · d88eeda · d88eeda
1 parent 1c3c423
commit d88eeda
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/azure-blob-storage/src/Azure/Blob.hs b/azure-blob-storage/src/Azure/Blob.hs
@@ -13,6 +13,7 @@ module Azure.Blob
 
       -- ** Generating a Shared Access Signature URI
     , generateSas
+    , generateSasEither
 
       -- ** Types for dealing with Blob storage functions
     , AccountName (..)

diff --git a/azure-blob-storage/src/Azure/Blob/SharedAccessSignature.hs b/azure-blob-storage/src/Azure/Blob/SharedAccessSignature.hs
@@ -3,6 +3,7 @@
 
 module Azure.Blob.SharedAccessSignature
     ( generateSas
+    , generateSasEither
     ) where
 
 import Azure.Auth (defaultAzureCredential)
@@ -27,23 +28,39 @@ import Data.Text.Encoding (decodeUtf8, encodeUtf8)
 import Data.Time (UTCTime (..), addUTCTime, formatTime, getCurrentTime)
 import Data.Time.Format (defaultTimeLocale)
 import Network.HTTP.Types.URI (urlEncode)
-import UnliftIO (MonadIO (..))
+import UnliftIO (MonadIO (..), throwString)
 
 import qualified Azure.Types as Auth
 import qualified Data.ByteString.Base64 as B64
 import qualified Data.ByteString.Char8 as C8
 import qualified Data.Text as Text
 
--- TODO: We need to add support for empty fields here. Eg: signedAuthorizedUserObjectId
 generateSas ::
+    MonadIO m =>
+    AccountName ->
+    ContainerName ->
+    BlobName ->
+    SasTokenExpiry ->
+    Auth.Token ->
+    m Url
+generateSas accountName containerName blobName expiry tokenStore = do
+    eUrl <- liftIO $ generateSasEither accountName containerName blobName expiry tokenStore
+    case eUrl of
+        Left err ->
+            throwString $ show err
+        Right url ->
+            pure url
+
+-- TODO: We need to add support for empty fields here. Eg: signedAuthorizedUserObjectId
+generateSasEither ::
     MonadIO m =>
     AccountName ->
     ContainerName ->
     BlobName ->
     SasTokenExpiry ->
     Auth.Token ->
     m (Either Text Url)
-generateSas accountName containerName blobName (SasTokenExpiry expiry) tokenStore = do
+generateSasEither accountName containerName blobName (SasTokenExpiry expiry) tokenStore = do
     accessToken <- liftIO $ defaultAzureCredential Nothing blobStorageResourceUrl tokenStore
     now <- liftIO getCurrentTime
     let isoStartTime = formatToAzureTime now