diff --git a/src/Internal/Api/LoginWithUsernameAndPassword/Main.elm b/src/Internal/Api/LoginWithUsernameAndPassword/Main.elm index e2797e6..4489cb3 100644 --- a/src/Internal/Api/LoginWithUsernameAndPassword/Main.elm +++ b/src/Internal/Api/LoginWithUsernameAndPassword/Main.elm @@ -1,13 +1,13 @@ module Internal.Api.LoginWithUsernameAndPassword.Main exposing (..) import Internal.Api.LoginWithUsernameAndPassword.Api as Api -import Internal.Tools.Context as Context exposing (Context, VBA) +import Internal.Tools.Context as Context exposing (Context, VB) import Internal.Tools.Exceptions as X import Internal.Tools.VersionControl as VC import Task exposing (Task) -loginWithUsernameAndPassword : Context (VBA a) -> LoginWithUsernameAndPasswordInput -> Task X.Error LoginWithUsernameAndPasswordOutput +loginWithUsernameAndPassword : Context (VB a) -> LoginWithUsernameAndPasswordInput -> Task X.Error LoginWithUsernameAndPasswordOutput loginWithUsernameAndPassword context input = VC.withBottomLayer { current = Api.loginWithUsernameAndPasswordV1 diff --git a/src/Internal/Api/Request.elm b/src/Internal/Api/Request.elm index 5c7cbc4..a110ab8 100644 --- a/src/Internal/Api/Request.elm +++ b/src/Internal/Api/Request.elm @@ -119,11 +119,11 @@ getUrl : ApiCall a -> String getUrl (ApiCall { baseUrl, attributes }) = UrlBuilder.crossOrigin baseUrl - (getPath attributes |> List.singleton) + (getPath attributes) (getQueryParams attributes) -getPath : List ContextAttr -> String +getPath : List ContextAttr -> List String getPath = List.foldl (\attr prior -> @@ -138,6 +138,19 @@ getPath = prior ) "" + >> removeStartingSlashes + >> String.split "/" + + +removeStartingSlashes : String -> String +removeStartingSlashes url = + if String.startsWith "/" url then + url + |> String.dropLeft 1 + |> removeStartingSlashes + + else + url getQueryParams : List ContextAttr -> List UrlBuilder.QueryParameter @@ -177,6 +190,7 @@ withAttributes attrs (ApiCall data) = accessToken : Attribute { a | accessToken : () } accessToken = Context.getAccessToken + >> (++) "Bearer " >> Http.header "Authorization" >> Header