Upgrade http library to elm-http/2.0.0

@github: Fixed #15.

elm.json

@@ -1,9 +1,9 @@
 {
     "type": "package",
     "name": "truqu/elm-oauth2",
-    "version": "4.0.1",
-    "license": "MIT",
     "summary": "OAuth 2.0 client-side utils",
+    "license": "MIT",
+    "version": "5.0.0",
     "exposed-modules": [
         "OAuth",
         "OAuth.AuthorizationCode",
@@ -12,16 +12,15 @@
         "OAuth.Password",
         "OAuth.Refresh"
     ],
+    "elm-version": "0.19.0 <= v < 0.20.0",
     "dependencies": {
-        "elm/core": "1.0.0 <= v < 2.0.0",
-        "elm/url": "1.0.0 <= v < 2.0.0",
-        "elm/http": "1.0.0 <= v < 2.0.0",
-        "elm/json": "1.0.0 <= v < 2.0.0",
-        "truqu/elm-base64": "2.0.0 <= v < 3.0.0",
-
+        "elm/browser": "1.0.1 <= v < 2.0.0",
+        "elm/core": "1.0.2 <= v < 2.0.0",
         "elm/html": "1.0.0 <= v < 2.0.0",
-        "elm/browser": "1.0.0 <= v < 2.0.0"
+        "elm/http": "2.0.0 <= v < 3.0.0",
+        "elm/json": "1.1.2 <= v < 2.0.0",
+        "elm/url": "1.0.0 <= v < 2.0.0",
+        "truqu/elm-base64": "2.0.4 <= v < 3.0.0"
     },
-    "test-dependencies": {},
-    "elm-version": "0.19.0 <= v < 0.20.0"
-}
+    "test-dependencies": {}
+}

examples/authorization-code/Main.elm

@@ -55,31 +55,30 @@ type
 
 getUserInfo : OAuthConfiguration -> OAuth.Token -> Cmd Msg
 getUserInfo { profileEndpoint, profileDecoder } token =
-    Http.send GotUserInfo <|
-        Http.request
-            { method = "GET"
-            , body = Http.emptyBody
-            , headers = OAuth.useToken token []
-            , withCredentials = False
-            , url = Url.toString profileEndpoint
-            , expect = Http.expectJson profileDecoder
-            , timeout = Nothing
-            }
+    Http.request
+        { method = "GET"
+        , body = Http.emptyBody
+        , headers = OAuth.useToken token []
+        , url = Url.toString profileEndpoint
+        , expect = Http.expectJson GotUserInfo profileDecoder
+        , timeout = Nothing
+        , tracker = Nothing
+        }
 
 
 getAccessToken : OAuthConfiguration -> Url -> String -> Cmd Msg
 getAccessToken ({ clientId, secret, tokenEndpoint } as config) redirectUri code =
-    Http.send (GotAccessToken config) <|
-        Http.request <|
-            OAuth.AuthorizationCode.makeTokenRequest
-                { credentials =
-                    { clientId = clientId
-                    , secret = Just secret
-                    }
-                , code = code
-                , url = tokenEndpoint
-                , redirectUri = redirectUri
+    Http.request <|
+        OAuth.AuthorizationCode.makeTokenRequest
+            { credentials =
+                { clientId = clientId
+                , secret = Just secret
                 }
+            , code = code
+            , url = tokenEndpoint
+            , redirectUri = redirectUri
+            }
+            (GotAccessToken config)
 
 
 
@@ -155,7 +154,7 @@ update msg model =
 
         GotAccessToken config res ->
             case res of
-                Err (Http.BadStatus { body }) ->
+                Err (Http.BadBody body) ->
                     case Json.decodeString OAuth.AuthorizationCode.defaultAuthenticationErrorDecoder body of
                         Ok { error, errorDescription } ->
                             let

examples/implicit/Main.elm

@@ -53,16 +53,15 @@ type
 
 getUserInfo : OAuthConfiguration -> OAuth.Token -> Cmd Msg
 getUserInfo { profileEndpoint, profileDecoder } token =
-    Http.send GotUserInfo <|
-        Http.request
-            { method = "GET"
-            , body = Http.emptyBody
-            , headers = OAuth.useToken token []
-            , withCredentials = False
-            , url = Url.toString profileEndpoint
-            , expect = Http.expectJson profileDecoder
-            , timeout = Nothing
-            }
+    Http.request
+        { method = "GET"
+        , body = Http.emptyBody
+        , headers = OAuth.useToken token []
+        , tracker = Nothing
+        , url = Url.toString profileEndpoint
+        , expect = Http.expectJson GotUserInfo profileDecoder
+        , timeout = Nothing
+        }
 
 
 

src/Internal.elm

@@ -233,15 +233,15 @@ makeAuthUrl responseType { clientId, url, redirectUri, scope, state } =
             { url | query = Just (baseQuery ++ "&" ++ query) }
 
 
-makeRequest : Url -> List Http.Header -> String -> RequestParts AuthenticationSuccess
-makeRequest url headers body =
+makeRequest : Url -> List Http.Header -> String -> (Result Http.Error AuthenticationSuccess -> msg) -> RequestParts msg
+makeRequest url headers body funcResultToMsg =
     { method = "POST"
     , headers = headers
     , url = Url.toString url
     , body = Http.stringBody "application/x-www-form-urlencoded" body
-    , expect = Http.expectJson authenticationSuccessDecoder
+    , expect = Http.expectJson funcResultToMsg authenticationSuccessDecoder
     , timeout = Nothing
-    , withCredentials = False
+    , tracker = Nothing
     }
 
 
@@ -336,7 +336,7 @@ type alias RequestParts a =
     , body : Http.Body
     , expect : Http.Expect a
     , timeout : Maybe Float
-    , withCredentials : Bool
+    , tracker : Maybe String
     }
 
 

src/OAuth/AuthorizationCode.elm

@@ -337,7 +337,7 @@ type alias RequestParts a =
     , body : Http.Body
     , expect : Http.Expect a
     , timeout : Maybe Float
-    , withCredentials : Bool
+    , tracker : Maybe String
     }
 
 
@@ -360,11 +360,11 @@ type alias Credentials =
 {-| Builds a the request components required to get a token from an authorization code
 
     let req : Http.Request AuthenticationSuccess
-        req = makeTokenRequest authentication |> Http.request
+        req = makeTokenRequest authentication funcResultToMsg |> Http.request
 
 -}
-makeTokenRequest : Authentication -> RequestParts AuthenticationSuccess
-makeTokenRequest { credentials, code, url, redirectUri } =
+makeTokenRequest : Authentication -> (Result Http.Error AuthenticationSuccess -> msg) -> RequestParts msg
+makeTokenRequest { credentials, code, url, redirectUri } funcResultToMsg =
     let
         body =
             [ Builder.string "grant_type" "authorization_code"
@@ -384,7 +384,7 @@ makeTokenRequest { credentials, code, url, redirectUri } =
                     Just secret ->
                         Just { clientId = credentials.clientId, secret = secret }
     in
-    makeRequest url headers body
+    makeRequest url headers body funcResultToMsg
 
 
 

src/OAuth/ClientCredentials.elm

@@ -140,11 +140,11 @@ type alias RequestParts a =
 {-| Builds a the request components required to get a token from client credentials
 
     let req : Http.Request TokenResponse
-        req = makeTokenRequest authentication |> Http.request
+        req = makeTokenRequest authentication funcResultToMsg |> Http.request
 
 -}
-makeTokenRequest : Authentication -> RequestParts AuthenticationSuccess
-makeTokenRequest { credentials, scope, url } =
+makeTokenRequest : Authentication -> (Result Http.Error AuthenticationSuccess -> msg) -> RequestParts msg
+makeTokenRequest { credentials, scope, url } funcResultToMsg =
     let
         body =
             [ Builder.string "grant_type" "client_credentials" ]
@@ -159,7 +159,7 @@ makeTokenRequest { credentials, scope, url } =
                     , secret = credentials.secret
                     }
     in
-    makeRequest url headers body
+    makeRequest url headers body funcResultToMsg
 
 
 

src/OAuth/Password.elm

@@ -143,11 +143,11 @@ type alias RequestParts a =
 {-| Builds a the request components required to get a token from the resource owner (user) credentials
 
     let req : Http.Request TokenResponse
-        req = makeTokenRequest authentication |> Http.request
+        req = makeTokenRequest authentication funcResultToMsg |> Http.request
 
 -}
-makeTokenRequest : Authentication -> RequestParts AuthenticationSuccess
-makeTokenRequest { credentials, password, scope, url, username } =
+makeTokenRequest : Authentication -> (Result Http.Error AuthenticationSuccess -> msg) -> RequestParts msg
+makeTokenRequest { credentials, password, scope, url, username } funcResultToMsg =
     let
         body =
             [ Builder.string "grant_type" "password"
@@ -161,7 +161,7 @@ makeTokenRequest { credentials, password, scope, url, username } =
         headers =
             makeHeaders credentials
     in
-    makeRequest url headers body
+    makeRequest url headers body funcResultToMsg
 
 
 

src/OAuth/Refresh.elm

@@ -135,11 +135,11 @@ type alias RequestParts a =
 {-| Builds a the request components required to refresh a token
 
     let req : Http.Request TokenResponse
-        req = makeTokenRequest reqParts |> Http.request
+        req = makeTokenRequest reqParts funcResultToMsg |> Http.request
 
 -}
-makeTokenRequest : Authentication -> RequestParts AuthenticationSuccess
-makeTokenRequest { credentials, scope, token, url } =
+makeTokenRequest : Authentication -> (Result Http.Error AuthenticationSuccess -> msg) -> RequestParts msg
+makeTokenRequest { credentials, scope, token, url } funcResultToMsg =
     let
         body =
             [ Builder.string "grant_type" "refresh_token"
@@ -152,7 +152,7 @@ makeTokenRequest { credentials, scope, token, url } =
         headers =
             makeHeaders credentials
     in
-    makeRequest url headers body
+    makeRequest url headers body funcResultToMsg