From 704e2dc6b57120c3b14ead8e62d228a31d5e7ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Membr=C3=A9?= Date: Tue, 13 Jun 2023 17:08:15 +0200 Subject: [PATCH] Fixes #22883: Update elm dependencies --- auth-backends/src/main/elm/elm.json | 4 +- .../src/main/elm/sources/AuthBackends.elm | 19 ++-- branding/src/main/elm/elm.json | 2 +- branding/src/main/elm/sources/ApiCall.elm | 15 ++- branding/src/main/elm/sources/View.elm | 13 +-- ci/plugins.Dockerfile | 4 +- user-management/src/main/elm/elm.json | 4 +- .../src/main/elm/sources/ApiCalls.elm | 100 +++++++----------- user-management/src/main/elm/sources/Init.elm | 13 +-- 9 files changed, 64 insertions(+), 110 deletions(-) diff --git a/auth-backends/src/main/elm/elm.json b/auth-backends/src/main/elm/elm.json index 26b6fba8d..36bbea12f 100644 --- a/auth-backends/src/main/elm/elm.json +++ b/auth-backends/src/main/elm/elm.json @@ -11,13 +11,15 @@ "elm/browser": "1.0.2", "elm/core": "1.0.5", "elm/html": "1.0.0", - "elm/http": "1.0.0", + "elm/http": "2.0.0", "elm/json": "1.1.3", "elm/url": "1.0.0", "elm-community/list-extra": "8.7.0", "pablen/toasty": "1.2.0" }, "indirect": { + "elm/bytes": "1.0.8", + "elm/file": "1.0.5", "elm/random": "1.0.0", "elm/regex": "1.0.0", "elm/time": "1.0.0", diff --git a/auth-backends/src/main/elm/sources/AuthBackends.elm b/auth-backends/src/main/elm/sources/AuthBackends.elm index f5cf14568..d31d87b83 100644 --- a/auth-backends/src/main/elm/sources/AuthBackends.elm +++ b/auth-backends/src/main/elm/sources/AuthBackends.elm @@ -144,12 +144,12 @@ getTargets model = , headers = [] , url = url , body = emptyBody - , expect = expectJson decodeApiCurrentAuthConf + , expect = expectJson GetCurrentAuthConfig decodeApiCurrentAuthConf , timeout = Nothing - , withCredentials = False + , tracker = Nothing } in - send GetCurrentAuthConfig req + req @@ -428,15 +428,8 @@ getErrorMessage e = let errMessage = case e of - Http.BadStatus b -> - let - status = - b.status - - message = - status.message - in - "Code " ++ String.fromInt status.code ++ " : " ++ message + Http.BadStatus status -> + "Code " ++ String.fromInt status Http.BadUrl str -> "Invalid API url" @@ -447,7 +440,7 @@ getErrorMessage e = Http.NetworkError -> "Network error" - Http.BadPayload str rstr -> + Http.BadBody str -> str in errMessage diff --git a/branding/src/main/elm/elm.json b/branding/src/main/elm/elm.json index e4430b044..5e104c58d 100644 --- a/branding/src/main/elm/elm.json +++ b/branding/src/main/elm/elm.json @@ -12,7 +12,7 @@ "elm/core": "1.0.5", "elm/file": "1.0.5", "elm/html": "1.0.0", - "elm/http": "1.0.0", + "elm/http": "2.0.0", "elm/json": "1.1.3", "elm/url": "1.0.0", "pablen/toasty": "1.2.0", diff --git a/branding/src/main/elm/sources/ApiCall.elm b/branding/src/main/elm/sources/ApiCall.elm index a95c8fc9a..48a8b6dba 100644 --- a/branding/src/main/elm/sources/ApiCall.elm +++ b/branding/src/main/elm/sources/ApiCall.elm @@ -12,21 +12,18 @@ getSettings model = url = model.contextPath ++ "/secure/api/branding" - headers = - [] - req = request { method = "GET" , headers = [] , url = url , body = emptyBody - , expect = expectJson decodeApiSettings + , expect = expectJson GetSettings decodeApiSettings , timeout = Nothing - , withCredentials = False + , tracker = Nothing } in - send GetSettings req + req saveSettings : Model -> Cmd Msg @@ -38,9 +35,9 @@ saveSettings model = , headers = [] , url = model.contextPath ++ "/secure/api/branding" , body = jsonBody (encodeSettings model.settings) - , expect = expectJson decodeApiSettings + , expect = expectJson SaveSettings decodeApiSettings , timeout = Nothing - , withCredentials = False + , tracker = Nothing } in - send SaveSettings req + req diff --git a/branding/src/main/elm/sources/View.elm b/branding/src/main/elm/sources/View.elm index 44c09f42d..9cf271f32 100644 --- a/branding/src/main/elm/sources/View.elm +++ b/branding/src/main/elm/sources/View.elm @@ -297,15 +297,8 @@ getErrorMessage e = let errMessage = case e of - Http.BadStatus b -> - let - status = - b.status - - message = - status.message - in - "Code " ++ String.fromInt status.code ++ " : " ++ message + Http.BadStatus status -> + "Code " ++ String.fromInt status Http.BadUrl str -> "Invalid API url" @@ -316,7 +309,7 @@ getErrorMessage e = Http.NetworkError -> "Network error" - Http.BadPayload str rstr -> + Http.BadBody str -> str in errMessage diff --git a/ci/plugins.Dockerfile b/ci/plugins.Dockerfile index 01af5ce79..eea1e924e 100644 --- a/ci/plugins.Dockerfile +++ b/ci/plugins.Dockerfile @@ -1,9 +1,9 @@ ARG JDK_VERSION=17 -FROM maven:3-openjdk-${JDK_VERSION} +FROM maven:3-amazoncorretto-${JDK_VERSION}-debian ARG USER_ID=1000 COPY ci/user.sh . RUN ./user.sh $USER_ID # For building js and python plugins -RUN apt-get update && apt-get install -y npm python3-docopt poppler-utils +RUN apt-get update && apt-get install -y npm python3-docopt poppler-utils curl wget unzip diff --git a/user-management/src/main/elm/elm.json b/user-management/src/main/elm/elm.json index 596728751..a6c0e1d97 100644 --- a/user-management/src/main/elm/elm.json +++ b/user-management/src/main/elm/elm.json @@ -11,12 +11,14 @@ "elm/browser": "1.0.2", "elm/core": "1.0.5", "elm/html": "1.0.0", - "elm/http": "1.0.0", + "elm/http": "2.0.0", "elm/json": "1.1.3", "elm-community/list-extra": "8.7.0", "pablen/toasty": "1.2.0" }, "indirect": { + "elm/bytes": "1.0.8", + "elm/file": "1.0.5", "elm/random": "1.0.0", "elm/regex": "1.0.0", "elm/time": "1.0.0", diff --git a/user-management/src/main/elm/sources/ApiCalls.elm b/user-management/src/main/elm/sources/ApiCalls.elm index c4e31547e..27b7da3e5 100644 --- a/user-management/src/main/elm/sources/ApiCalls.elm +++ b/user-management/src/main/elm/sources/ApiCalls.elm @@ -7,7 +7,7 @@ module ApiCalls exposing (..) import DataTypes exposing (AddUserForm, Authorization, Model, Msg(..), User) -import Http exposing (emptyBody, expectJson, jsonBody, request, send) +import Http exposing (emptyBody, expectJson, jsonBody, request, get, post) import JsonDecoder exposing (decodeApiAddUserResult, decodeApiCurrentUsersConf, decodeApiDeleteUserResult, decodeApiReloadResult, decodeApiRoleCoverage, decodeApiUpdateUserResult, decodeGetRoleApiResult) import JsonEncoder exposing (encodeAddUser, encodeAuthorization) @@ -19,111 +19,85 @@ getUsersConf : Model -> Cmd Msg getUsersConf model = let req = - request - { method = "GET" - , headers = [] - , url = getUrl model "/usermanagement/users" - , body = emptyBody - , expect = expectJson decodeApiCurrentUsersConf - , timeout = Nothing - , withCredentials = False + get + { url = getUrl model "/usermanagement/users" + , expect = expectJson GetUserInfo decodeApiCurrentUsersConf } in - send GetUserInfo req + req postReloadConf : Model -> Cmd Msg postReloadConf model = let req = - request - { method = "POST" - , headers = [] - , url = getUrl model "/usermanagement/users/reload" - , body = emptyBody - , expect = expectJson decodeApiReloadResult - , timeout = Nothing - , withCredentials = False + post + { url = getUrl model "/usermanagement/users/reload" + , body = emptyBody + , expect = expectJson PostReloadUserInfo decodeApiReloadResult } in - send PostReloadUserInfo req + req computeRoleCoverage : Model -> Authorization -> Cmd Msg computeRoleCoverage model authorizations = let req = - request - { method = "POST" - , headers = [] - , url = getUrl model "/usermanagement/coverage" - , body = jsonBody (encodeAuthorization authorizations) - , expect = expectJson decodeApiRoleCoverage - , timeout = Nothing - , withCredentials = False + post + { url = getUrl model "/usermanagement/coverage" + , body = jsonBody (encodeAuthorization authorizations) + , expect = expectJson ComputeRoleCoverage decodeApiRoleCoverage } in - send ComputeRoleCoverage req + req addUser : Model -> AddUserForm -> Cmd Msg addUser model userForm = let req = - request - { method = "POST" - , headers = [] - , url = getUrl model "/usermanagement" - , body = jsonBody (encodeAddUser userForm) - , expect = expectJson decodeApiAddUserResult - , timeout = Nothing - , withCredentials = False + post + { url = getUrl model "/usermanagement" + , body = jsonBody (encodeAddUser userForm) + , expect = expectJson AddUser decodeApiAddUserResult } in - send AddUser req + req deleteUser : String -> Model -> Cmd Msg deleteUser username model = let req = request - { method = "DELETE" - , headers = [] - , url = getUrl model ("/usermanagement/" ++ username) - , body = emptyBody - , expect = expectJson decodeApiDeleteUserResult - , timeout = Nothing - , withCredentials = False + { method = "DELETE" + , headers = [] + , url = getUrl model ("/usermanagement/" ++ username) + , body = emptyBody + , expect = expectJson DeleteUser decodeApiDeleteUserResult + , timeout = Nothing + , tracker = Nothing } in - send DeleteUser req + req updateUser : Model -> String -> AddUserForm -> Cmd Msg updateUser model toUpdate userForm = let req = - request - { method = "POST" - , headers = [] - , url = getUrl model ("/usermanagement/update/" ++ toUpdate) - , body = jsonBody (encodeAddUser userForm) - , expect = expectJson decodeApiUpdateUserResult - , timeout = Nothing - , withCredentials = False + post + { url = getUrl model ("/usermanagement/update/" ++ toUpdate) + , body = jsonBody (encodeAddUser userForm) + , expect = expectJson UpdateUser decodeApiUpdateUserResult } in - send UpdateUser req + req getRoleConf : Model -> Cmd Msg getRoleConf model = let req = - request - { method = "GET" - , headers = [] - , url = getUrl model "/usermanagement/roles" - , body = emptyBody - , expect = expectJson decodeGetRoleApiResult - , timeout = Nothing - , withCredentials = False + get + { url = getUrl model "/usermanagement/roles" + , expect = expectJson GetRoleConf decodeGetRoleApiResult } in - send GetRoleConf req \ No newline at end of file + req \ No newline at end of file diff --git a/user-management/src/main/elm/sources/Init.elm b/user-management/src/main/elm/sources/Init.elm index 8c7ce7863..04d60d5ea 100644 --- a/user-management/src/main/elm/sources/Init.elm +++ b/user-management/src/main/elm/sources/Init.elm @@ -34,15 +34,8 @@ getErrorMessage e = let errMessage = case e of - Http.BadStatus b -> - let - status = - b.status - - message = - status.message - in - "Code " ++ String.fromInt status.code ++ " : " ++ message + Http.BadStatus status -> + "Code " ++ String.fromInt status Http.BadUrl str -> "Invalid API url" @@ -53,7 +46,7 @@ getErrorMessage e = Http.NetworkError -> "Network error" - Http.BadPayload str rstr -> + Http.BadBody str -> str in errMessage