extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-21 20:51:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

verify/register ui improvements (#50)

Browse Source
This commit is contained in:
Michael Quigley 2022-09-20 16:27:18 -04:00
parent 073507e0e0
commit 27d1f390a5
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/account.go
View File

@ -55,16 +55,16 @@ func (self *createAccountHandler) Handle(params identity.CreateAccountParams) mi
}
if _, err := str.CreateAccountRequest(ar, tx); err != nil {
logrus.Error(err)
logrus.Errorf("error creating account request for '%v': %v", params.Body.Email, err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
if err := tx.Commit(); err != nil {
logrus.Error(err)
logrus.Errorf("error committing account request for '%v': %v", params.Body.Email, err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
if err := sendVerificationEmail(params.Body.Email, token, self.cfg); err != nil {
logrus.Error(err)
logrus.Errorf("error sending verification email for '%v': %v", params.Body.Email, err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}

6
ui/src/Login.js
View File

@ -4,7 +4,7 @@ import * as identity from './api/identity';
const Login = (props) => {
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
const [failed, setFailed] = useState();
const [message, setMessage] = useState();
const errorMessage = <h2 className={"errorMessage"}>Login Failed!</h2>;
@ -24,7 +24,7 @@ const Login = (props) => {
console.log('login succeeded', resp)
} else {
console.log('login failed')
setFailed(errorMessage);
setMessage(errorMessage);
}
})
.catch((resp) => {
@ -36,7 +36,7 @@ const Login = (props) => {
<div className={"fullscreen"}>
<img src={"ziggy.svg"} width={200}/>
<h1>zrok</h1>
{failed}
{message}
<form onSubmit={handleSubmit}>
<fieldset>
<legend>Log In</legend>

28
ui/src/Register.js
View File

@ -5,11 +5,32 @@ import * as identity from "./api/identity";
const Proceed = (props) => {
const [password, setPassword] = useState('');
const [confirm, setConfirm] = useState('');
const [message, setMessage] = useState();
const passwordMismatchMessage = <h2 className={"errorMessage"}>Entered passwords do not match!</h2>
const registerFailed = <h2 className={"errorMessage"}>Account creation failed!</h2>
const handleSubmit = async e => {
e.preventDefault();
console.log("submit", password, confirm)
}
console.log("handleSubmit");
if(confirm !== password) {
setMessage(passwordMismatchMessage);
} else {
identity.register({body: {"token": props.token, "password": password}})
.then(resp => {
if(!resp.error) {
console.log("resp", resp)
setMessage(undefined);
} else {
setMessage(registerFailed);
}
})
.catch(resp => {
console.log("resp", resp);
setMessage(registerFailed);
});
}
};
return (
<div className={"fullscreen"}>
@ -26,6 +47,7 @@ const Proceed = (props) => {
</p>
</fieldset>
</form>
{message}
</div>
)
}
@ -67,7 +89,7 @@ const Register = () => {
let step;
if(!failed) {
step = <Proceed email={email}/>
step = <Proceed email={email} token={token}/>
} else {
step = <Failed />
}