Merge branch '4.0.1'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.0.1 (2018-10-06)
+
+- (15e4e82) Bug Fix: make token\_type parsing case-insensitive.
+
+
 ## v4.0.0 (2018-09-07)
 
 

deploy.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 function untag () {
+  git tag -d $1
   git push origin --delete $1
 }
 

elm.json

@@ -1,7 +1,7 @@
 {
     "type": "package",
     "name": "truqu/elm-oauth2",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "license": "MIT",
     "summary": "OAuth 2.0 client-side utils",
     "exposed-modules": [

src/OAuth.elm

@@ -93,12 +93,8 @@ or Query parsers. Returns 'Nothing' when the token type is Nothing
 , different from Just "Bearer" or when there's no token at all.
 -}
 makeToken : Maybe TokenType -> Maybe TokenString -> Maybe Token
-makeToken mTokenType mToken =
-    let
-        construct a b =
-            tokenFromString (a ++ " " ++ b)
-    in
-    maybeAndThen2 construct mTokenType mToken
+makeToken =
+    maybeAndThen2 tryMakeToken
 
 
 {-| See 'makeToken', with the subtle difference that a token value may or
@@ -108,11 +104,7 @@ present or not.
 -}
 makeRefreshToken : TokenType -> Maybe TokenString -> Maybe (Maybe Token)
 makeRefreshToken tokenType mToken =
-    let
-        construct a b =
-            tokenFromString (a ++ " " ++ b)
-    in
-    case ( mToken, maybeAndThen2 construct (Just tokenType) mToken ) of
+    case ( mToken, maybeAndThen2 tryMakeToken (Just tokenType) mToken ) of
         ( Nothing, _ ) ->
             Just Nothing
 
@@ -123,6 +115,20 @@ makeRefreshToken tokenType mToken =
             Nothing
 
 
+
+{- | Internal, attempt to make a Bearer token from a type and a token string -}
+
+
+tryMakeToken : TokenType -> TokenString -> Maybe Token
+tryMakeToken tokenType token =
+    case String.toLower tokenType of
+        "bearer" ->
+            Just (Bearer token)
+
+        _ ->
+            Nothing
+
+
 {-| Gets the `String` representation of a `Token` to be used in an 'Authorization' header
 -}
 tokenToString : Token -> String