Fixes build and lint error

freizl · Jun 27, 2023 · adc9df1 · adc9df1
1 parent 9a78826
commit adc9df1
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 4 deletions.
diff --git a/hoauth2-demo/hoauth2-demo.cabal b/hoauth2-demo/hoauth2-demo.cabal
@@ -41,13 +41,12 @@ executable hoauth2-demo
     Views
 
   default-extensions:
+    DeriveGeneric
     ImportQualifiedPost
+    InstanceSigs
     OverloadedStrings
     RecordWildCards
     TypeApplications
-    DeriveGeneric
-    QuasiQuotes
-    InstanceSigs
 
   hs-source-dirs:     src
   default-language:   Haskell2010

diff --git a/hoauth2-demo/src/Idp.hs b/hoauth2-demo/src/Idp.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 module Idp where
 
 import Control.Monad.IO.Class

diff --git a/hoauth2-providers/hoauth2-providers.cabal b/hoauth2-providers/hoauth2-providers.cabal
@@ -29,7 +29,6 @@ library
     RecordWildCards
     TypeApplications
     TypeFamilies
-    QuasiQuotes
 
   exposed-modules:
     Data.ByteString.Contrib

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Auth0.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Auth0.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Auth0](https://auth0.com)
 --
 --   * [Auth0 Authorize Application](https://auth0.com/docs/api/authentication#authorize-application)

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/AzureAD.hs b/hoauth2-providers/src/Network/OAuth2/Provider/AzureAD.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [AzureAD oauth2 flow](https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow)
 module Network.OAuth2.Provider.AzureAD where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Dropbox.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Dropbox.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [DropBox oauth guide](https://developers.dropbox.com/oauth-guide)
 module Network.OAuth2.Provider.Dropbox where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Facebook.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Facebook.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Facebook Login](http://developers.facebook.com/docs/facebook-login/)
 module Network.OAuth2.Provider.Facebook where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Fitbit.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Fitbit.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Fitbit Authorization developer guide](https://dev.fitbit.com/build/reference/web-api/developer-guide/authorization/)
 module Network.OAuth2.Provider.Fitbit where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Github.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Github.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Github build oauth applications guide](https://docs.github.com/en/developers/apps/building-oauth-apps)
 module Network.OAuth2.Provider.Github where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Google.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Google.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Google build oauth2 web server application](https://developers.google.com/identity/protocols/oauth2/web-server)
 module Network.OAuth2.Provider.Google where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Linkedin.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Linkedin.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [LinkedIn Authenticating with OAuth 2.0 Overview](https://learn.microsoft.com/en-us/linkedin/shared/authentication/authentication?context=linkedin%2Fcontext)
 module Network.OAuth2.Provider.Linkedin where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Okta.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Okta.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Okta OIDC & OAuth2 API](https://developer.okta.com/docs/reference/api/oidc/)
 module Network.OAuth2.Provider.Okta where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Slack.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Slack.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Sign in with Slack](https://api.slack.com/authentication/sign-in-with-slack)
 --
 --   * [Using OAuth 2.0](https://api.slack.com/legacy/oauth)

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/StackExchange.hs b/hoauth2-providers/src/Network/OAuth2/Provider/StackExchange.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [StackExchange authentication guide](https://api.stackexchange.com/docs/authentication)
 --
 --    * [StackExchange Apps page](https://stackapps.com/apps/oauth)

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Twitter.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Twitter.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [Twitter OAuth2 guide](https://developer.twitter.com/en/docs/authentication/oauth-2-0/authorization-code)
 module Network.OAuth2.Provider.Twitter where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/Weibo.hs b/hoauth2-providers/src/Network/OAuth2/Provider/Weibo.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [微博授权机制](https://open.weibo.com/wiki/%E6%8E%88%E6%9D%83%E6%9C%BA%E5%88%B6)
 module Network.OAuth2.Provider.Weibo where
 

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider/ZOHO.hs b/hoauth2-providers/src/Network/OAuth2/Provider/ZOHO.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE QuasiQuotes #-}
+
 -- | [ZOHO oauth overview](https://www.zoho.com/crm/developer/docs/api/v2/oauth-overview.html)
 module Network.OAuth2.Provider.ZOHO where
 

diff --git a/hoauth2-providers/src/Network/OIDC/WellKnown.hs b/hoauth2-providers/src/Network/OIDC/WellKnown.hs
@@ -1,8 +1,12 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 
 module Network.OIDC.WellKnown where
 
 import Control.Monad.Except
+#if MIN_VERSION_base(4,18,0)
+import Control.Monad.IO.Class
+#endif
 import Data.Aeson
 import Data.Bifunctor
 import Data.ByteString.Lazy (ByteString)