TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PasswordInput in change password form

Browse Source
This commit is contained in:
Eike Kettner 2020-01-11 18:27:19 +01:00
parent 36075fbaaf
commit c15701a21a
1 changed files with 78 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
View File

@ -9,6 +9,7 @@ module Comp.ChangePasswordForm exposing
import Api import Api
import Api.Model.BasicResult exposing (BasicResult) import Api.Model.BasicResult exposing (BasicResult)
import Api.Model.PasswordChange exposing (PasswordChange) import Api.Model.PasswordChange exposing (PasswordChange)
import Comp.PasswordInput
import Data.Flags exposing (Flags) import Data.Flags exposing (Flags)
import Html exposing (..) import Html exposing (..)
import Html.Attributes exposing (..) import Html.Attributes exposing (..)
@ -18,12 +19,12 @@ import Util.Http
type alias Model = type alias Model =
{ current : String { currentModel : Comp.PasswordInput.Model
, newPass1 : String , current : Maybe String
, newPass2 : String , pass1Model : Comp.PasswordInput.Model
, showCurrent : Bool , newPass1 : Maybe String
, showPass1 : Bool , pass2Model : Comp.PasswordInput.Model
, showPass2 : Bool , newPass2 : Maybe String
, errors : List String , errors : List String
, loading : Bool , loading : Bool
, successMsg : String , successMsg : String
@ -33,12 +34,12 @@ type alias Model =
emptyModel : Model emptyModel : Model
emptyModel = emptyModel =
validateModel validateModel
{ current = "" { current = Nothing
, newPass1 = "" , currentModel = Comp.PasswordInput.init
, newPass2 = "" , newPass1 = Nothing
, showCurrent = False , pass1Model = Comp.PasswordInput.init
, showPass1 = False , newPass2 = Nothing
, showPass2 = False , pass2Model = Comp.PasswordInput.init
, errors = [] , errors = []
, loading = False , loading = False
, successMsg = "" , successMsg = ""
@ -46,12 +47,9 @@ emptyModel =
type Msg type Msg
= SetCurrent String = SetCurrent Comp.PasswordInput.Msg
| SetNew1 String | SetNew1 Comp.PasswordInput.Msg
| SetNew2 String | SetNew2 Comp.PasswordInput.Msg
| ToggleShowPass1
| ToggleShowPass2
| ToggleShowCurrent
| Submit | Submit
| SubmitResp (Result Http.Error BasicResult) | SubmitResp (Result Http.Error BasicResult)
@ -59,12 +57,12 @@ type Msg
validate : Model -> List String validate : Model -> List String
validate model = validate model =
List.concat List.concat
[ if model.newPass1 /= "" && model.newPass2 /= "" && model.newPass1 /= model.newPass2 then [ if model.newPass1 /= Nothing && model.newPass2 /= Nothing && model.newPass1 /= model.newPass2 then
[ "New passwords do not match." ] [ "New passwords do not match." ]
else else
[] []
, if model.newPass1 == "" || model.newPass2 == "" || model.current == "" then , if model.newPass1 == Nothing || model.newPass2 == Nothing || model.current == Nothing then
[ "Please fill in required fields." ] [ "Please fill in required fields." ]
else else
@ -96,23 +94,32 @@ validateModel model =
update : Flags -> Msg -> Model -> ( Model, Cmd Msg ) update : Flags -> Msg -> Model -> ( Model, Cmd Msg )
update flags msg model = update flags msg model =
case msg of case msg of
SetCurrent s -> SetCurrent m ->
( validateModel { model | current = s }, Cmd.none ) let
( pm, pw ) =
Comp.PasswordInput.update m model.currentModel
in
( validateModel { model | currentModel = pm, current = pw }
, Cmd.none
)
SetNew1 s -> SetNew1 m ->
( validateModel { model | newPass1 = s }, Cmd.none ) let
( pm, pw ) =
Comp.PasswordInput.update m model.pass1Model
in
( validateModel { model | newPass1 = pw, pass1Model = pm }
, Cmd.none
)
SetNew2 s -> SetNew2 m ->
( validateModel { model | newPass2 = s }, Cmd.none ) let
( pm, pw ) =
ToggleShowCurrent -> Comp.PasswordInput.update m model.pass2Model
( { model | showCurrent = not model.showCurrent }, Cmd.none ) in
( validateModel { model | newPass2 = pw, pass2Model = pm }
ToggleShowPass1 -> , Cmd.none
( { model | showPass1 = not model.showPass1 }, Cmd.none ) )
ToggleShowPass2 ->
( { model | showPass2 = not model.showPass2 }, Cmd.none )
Submit -> Submit ->
let let
@ -120,10 +127,14 @@ update flags msg model =
validate model validate model
cp = cp =
PasswordChange model.current model.newPass1 PasswordChange
(Maybe.withDefault "" model.current)
(Maybe.withDefault "" model.newPass1)
in in
if List.isEmpty valid then if List.isEmpty valid then
( { model | loading = True, errors = [], successMsg = "" }, Api.changePassword flags cp SubmitResp ) ( { model | loading = True, errors = [], successMsg = "" }
, Api.changePassword flags cp SubmitResp
)
else else
( model, Cmd.none ) ( model, Cmd.none )
@ -131,20 +142,35 @@ update flags msg model =
SubmitResp (Ok res) -> SubmitResp (Ok res) ->
let let
em = em =
{ emptyModel | errors = [], successMsg = "Password has been changed." } { emptyModel
| errors = []
, successMsg = "Password has been changed."
}
in in
if res.success then if res.success then
( em, Cmd.none ) ( em, Cmd.none )
else else
( { model | errors = [ res.message ], loading = False, successMsg = "" }, Cmd.none ) ( { model
| errors = [ res.message ]
, loading = False
, successMsg = ""
}
, Cmd.none
)
SubmitResp (Err err) -> SubmitResp (Err err) ->
let let
str = str =
Util.Http.errorToString err Util.Http.errorToString err
in in
( { model | errors = [ str ], loading = False, successMsg = "" }, Cmd.none ) ( { model
| errors = [ str ]
, loading = False
, successMsg = ""
}
, Cmd.none
)
@ -162,75 +188,30 @@ view model =
] ]
[ div [ div
[ classList [ classList
[ ( "field", True ) [ ( "required field", True )
, ( "error", model.current == "" ) , ( "error", model.current == Nothing )
] ]
] ]
[ label [] [ text "Current Password*" ] [ label [] [ text "Current Password" ]
, div [ class "ui action input" ] , Html.map SetCurrent (Comp.PasswordInput.view model.current model.currentModel)
[ input
[ type_ <|
if model.showCurrent then
"text"
else
"password"
, onInput SetCurrent
, value model.current
]
[]
, button [ class "ui icon button", onClick ToggleShowCurrent ]
[ i [ class "eye icon" ] []
]
]
] ]
, div , div
[ classList [ classList
[ ( "field", True ) [ ( "required field", True )
, ( "error", model.newPass1 == "" ) , ( "error", model.newPass1 == Nothing )
] ]
] ]
[ label [] [ text "New Password*" ] [ label [] [ text "New Password" ]
, div [ class "ui action input" ] , Html.map SetNew1 (Comp.PasswordInput.view model.newPass1 model.pass1Model)
[ input
[ type_ <|
if model.showPass1 then
"text"
else
"password"
, onInput SetNew1
, value model.newPass1
]
[]
, button [ class "ui icon button", onClick ToggleShowPass1 ]
[ i [ class "eye icon" ] []
]
]
] ]
, div , div
[ classList [ classList
[ ( "field", True ) [ ( "required field", True )
, ( "error", model.newPass2 == "" ) , ( "error", model.newPass2 == Nothing )
] ]
] ]
[ label [] [ text "New Password (repeat)*" ] [ label [] [ text "New Password (repeat)" ]
, div [ class "ui action input" ] , Html.map SetNew2 (Comp.PasswordInput.view model.newPass2 model.pass2Model)
[ input
[ type_ <|
if model.showPass2 then
"text"
else
"password"
, onInput SetNew2
, value model.newPass2
]
[]
, button [ class "ui icon button", onClick ToggleShowPass2 ]
[ i [ class "eye icon" ] []
]
]
] ]
, div [ class "ui horizontal divider" ] [] , div [ class "ui horizontal divider" ] []
, div [ class "ui success message" ] , div [ class "ui success message" ]