1f349/tulip
4
0
Fork 0
mirror of https://github.com/1f349/tulip.git synced 2024-12-23 00:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add otp enabled state on the home

Browse Source
This commit is contained in:
Melon 2023-11-25 15:08:44 +00:00
parent 68237dfc42
commit c6ddc7b197
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
7 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/edit-otp.go.html
View File

@ -17,7 +17,7 @@
<p style="display:none">Raw OTP string: {{.OtpUrl}}</p> <p style="display:none">Raw OTP string: {{.OtpUrl}}</p>
<div> <div>
<label for="field_code">OTP Code:</label> <label for="field_code">OTP Code:</label>
<input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode"/> <input type="text" name="code" id="field_code" required autofocus pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode"/>
</div> </div>
<button type="submit">Login</button> <button type="submit">Login</button>
</form> </form>

28
pages/edit-password.go.html
View File

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>{{.ServiceName}}</title>
</head>
<body>
<header>
<h1>{{.ServiceName}}</h1>
</header>
<main>
<form method="POST" action="/edit/password">
<div>
<label for="field_password">Current Password:</label>
<input type="password" name="password" id="field_password" autocomplete="password" autofocus required/>
</div>
<div>
<label for="field_password">New Password:</label>
<input type="password" name="password" id="field_password" autocomplete="new_password" required/>
</div>
<div>
<label for="field_password">Retype New Password:</label>
<input type="password" name="password" id="field_password" autocomplete="confirm_password" required/>
</div>
<button type="submit">Change Password</button>
</form>
</main>
</body>
</html>

0
pages/edit-username.go.html
View File

14
pages/index.go.html
View File

@ -14,11 +14,6 @@
<button type="submit">Edit Profile</button> <button type="submit">Edit Profile</button>
</form> </form>
</div> </div>
<div>
<form method="GET" action="/edit/username">
<button type="submit">Change Username</button>
</form>
</div>
<div> <div>
<form method="GET" action="/edit/password"> <form method="GET" action="/edit/password">
<button type="submit">Change Password</button> <button type="submit">Change Password</button>
@ -34,6 +29,14 @@
<button type="submit">Manage Users</button> <button type="submit">Manage Users</button>
</form> </form>
</div> </div>
{{if .OtpEnabled}}
<div>
<form method="POST" action="/edit/otp">
<input type="hidden" name="remove" value="1"/>
<button type="submit">Remove OTP</button>
</form>
</div>
{{else}}
<div> <div>
<form method="POST" action="/edit/otp"> <form method="POST" action="/edit/otp">
<label><input type="radio" name="digits" value="6"/> 6 digits</label> <label><input type="radio" name="digits" value="6"/> 6 digits</label>
@ -42,6 +45,7 @@
<button type="submit">Change OTP</button> <button type="submit">Change OTP</button>
</form> </form>
</div> </div>
{{end}}
<div> <div>
<form method="POST" action="/logout"> <form method="POST" action="/logout">
<input type="hidden" name="nonce" value="{{.Nonce}}"> <input type="hidden" name="nonce" value="{{.Nonce}}">

2
pages/login-otp.go.html
View File

@ -12,7 +12,7 @@
<input type="hidden" name="redirect" value="{{.Redirect}}"/> <input type="hidden" name="redirect" value="{{.Redirect}}"/>
<div> <div>
<label for="field_code">OTP Code:</label> <label for="field_code">OTP Code:</label>
<input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode" autocomplete="off" aria-autocomplete="none" role="presentation"/> <input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode" autocomplete="off" autofocus aria-autocomplete="none" role="presentation"/>
</div> </div>
<button type="submit">Login</button> <button type="submit">Login</button>
</form> </form>

26
pages/verification-code.go.html
View File

@ -1,26 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>{{.Title}}</title>
<style>
#app > h1 {
text-decoration: underline;
}
@media screen and (prefers-color-scheme: dark) {
:root {
color: #d2d2d2;
background-color: #1c1b22;
}
}
</style>
</head>
<body>
<div id="app">
<h1>{{.Title}}</h1>
<p>Hi {{.Name}},</p>
<p>Here is your email verification code: <span>{{.Code}}</span></p>
<p>{{.ServiceName}}</p>
</div>
</body>
</html>

6
server/home.go
View File

@ -27,11 +27,16 @@ func (h *HttpServer) Home(rw http.ResponseWriter, req *http.Request, _ httproute
} }
var userWithName *database.User var userWithName *database.User
var hasTwoFactor bool
if h.DbTx(rw, func(tx *database.Tx) (err error) { if h.DbTx(rw, func(tx *database.Tx) (err error) {
userWithName, err = tx.GetUserDisplayName(auth.Data.ID) userWithName, err = tx.GetUserDisplayName(auth.Data.ID)
if err != nil { if err != nil {
return fmt.Errorf("failed to get user display name: %w", err) return fmt.Errorf("failed to get user display name: %w", err)
} }
hasTwoFactor, err = tx.HasTwoFactor(auth.Data.ID)
if err != nil {
return fmt.Errorf("failed to get user two factor state: %w", err)
}
return return
}) { }) {
return return
@ -41,5 +46,6 @@ func (h *HttpServer) Home(rw http.ResponseWriter, req *http.Request, _ httproute
"Auth": auth, "Auth": auth,
"User": userWithName, "User": userWithName,
"Nonce": lNonce, "Nonce": lNonce,
"OtpEnabled": hasTwoFactor,
}) })
} }