Merge files and albums pages into user dashboard
This commit is contained in:
@@ -1,59 +1,12 @@
|
||||
package webcontroller
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"html/template"
|
||||
"net/http"
|
||||
|
||||
"fornaxian.tech/log"
|
||||
"fornaxian.tech/pixeldrain_api_client/pixelapi"
|
||||
"github.com/julienschmidt/httprouter"
|
||||
)
|
||||
|
||||
// formAPIError makes it easier to display errors returned by the pixeldrain
|
||||
// API. TO make use of this function the form fields should be named exactly the
|
||||
// same as the API parameters
|
||||
func formAPIError(err error, f *Form) {
|
||||
fieldLabel := func(name string) string {
|
||||
for _, v := range f.Fields {
|
||||
if v.Name == name {
|
||||
return v.Label
|
||||
}
|
||||
}
|
||||
return name
|
||||
}
|
||||
|
||||
if apierr, ok := err.(pixelapi.Error); ok {
|
||||
if apierr.StatusCode == "multiple_errors" {
|
||||
for _, err := range apierr.Errors {
|
||||
// Modify the message to make it more user-friendly
|
||||
if err.StatusCode == "string_out_of_range" {
|
||||
err.Message = fmt.Sprintf(
|
||||
"%s is too long or too short. Should be between %v and %v characters. Current length: %v",
|
||||
fieldLabel(err.Extra["field"].(string)),
|
||||
err.Extra["min_len"],
|
||||
err.Extra["max_len"],
|
||||
err.Extra["len"],
|
||||
)
|
||||
} else if err.StatusCode == "field_contains_illegal_character" {
|
||||
err.Message = fmt.Sprintf(
|
||||
"Character '%v' is not allowed in %s",
|
||||
err.Extra["char"],
|
||||
fieldLabel(err.Extra["field"].(string)),
|
||||
)
|
||||
}
|
||||
|
||||
f.SubmitMessages = append(f.SubmitMessages, template.HTML(err.Message))
|
||||
}
|
||||
} else {
|
||||
f.SubmitMessages = append(f.SubmitMessages, template.HTML(apierr.Message))
|
||||
}
|
||||
} else {
|
||||
log.Error("Error submitting form: %s", err)
|
||||
f.SubmitMessages = []template.HTML{"Internal Server Error"}
|
||||
}
|
||||
}
|
||||
|
||||
func (wc *WebController) serveLogout(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
@@ -68,114 +21,3 @@ func (wc *WebController) serveLogout(
|
||||
|
||||
http.Redirect(w, r, "/", http.StatusSeeOther)
|
||||
}
|
||||
|
||||
func (wc *WebController) passwordResetForm(td *TemplateData, r *http.Request) (f Form) {
|
||||
f = Form{
|
||||
Name: "password_reset",
|
||||
Title: "Recover lost password",
|
||||
Fields: []Field{
|
||||
{
|
||||
Name: "email",
|
||||
Label: "E-mail address",
|
||||
Description: `we will send a password reset link to this e-mail
|
||||
address`,
|
||||
Type: FieldTypeEmail,
|
||||
}, {
|
||||
Name: "recaptcha_response",
|
||||
Label: "Turing test (click the white box)",
|
||||
Description: "the reCaptcha turing test verifies that you " +
|
||||
"are not an evil robot that is trying hijack accounts",
|
||||
Type: FieldTypeCaptcha,
|
||||
CaptchaSiteKey: wc.captchaKey(),
|
||||
},
|
||||
},
|
||||
SubmitLabel: "Submit",
|
||||
}
|
||||
|
||||
if f.ReadInput(r) {
|
||||
if err := td.PixelAPI.PutUserPasswordReset(
|
||||
f.FieldVal("email"),
|
||||
f.FieldVal("recaptcha_response"),
|
||||
); err != nil {
|
||||
formAPIError(err, &f)
|
||||
} else {
|
||||
f.SubmitSuccess = true
|
||||
f.SubmitMessages = []template.HTML{
|
||||
"Success! Check your inbox for instructions to reset your password",
|
||||
}
|
||||
}
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
func (wc *WebController) passwordResetConfirmForm(td *TemplateData, r *http.Request) (f Form) {
|
||||
f = Form{
|
||||
Name: "password_reset_confirm",
|
||||
Title: "Reset lost password",
|
||||
Fields: []Field{
|
||||
{
|
||||
Name: "new_password",
|
||||
Label: "Password",
|
||||
Type: FieldTypeNewPassword,
|
||||
}, {
|
||||
Name: "new_password2",
|
||||
Label: "Password again",
|
||||
Description: "you need to enter your password twice so we " +
|
||||
"can verify that no typing errors were made, which would " +
|
||||
"prevent you from logging into your new account",
|
||||
Type: FieldTypeNewPassword,
|
||||
},
|
||||
},
|
||||
SubmitLabel: "Submit",
|
||||
}
|
||||
|
||||
var resetKey = r.FormValue("key")
|
||||
if resetKey == "" {
|
||||
f.SubmitSuccess = false
|
||||
f.SubmitMessages = []template.HTML{"Password reset key required"}
|
||||
return f
|
||||
}
|
||||
|
||||
if f.ReadInput(r) {
|
||||
if f.FieldVal("new_password") != f.FieldVal("new_password2") {
|
||||
f.SubmitMessages = []template.HTML{
|
||||
"Password verification failed. Please enter the same " +
|
||||
"password in both password fields"}
|
||||
return f
|
||||
}
|
||||
|
||||
if err := td.PixelAPI.PutUserPasswordResetConfirm(resetKey, f.FieldVal("new_password")); err != nil {
|
||||
formAPIError(err, &f)
|
||||
} else {
|
||||
f.SubmitSuccess = true
|
||||
f.SubmitMessages = []template.HTML{
|
||||
`Success! You can now <a href="/login">log in</a> with your new password`,
|
||||
}
|
||||
}
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
func (wc *WebController) serveEmailConfirm(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
p httprouter.Params,
|
||||
) {
|
||||
var err error
|
||||
var status string
|
||||
|
||||
err = wc.api.PutUserEmailResetConfirm(r.FormValue("key"))
|
||||
if err != nil && err.Error() == "not_found" {
|
||||
status = "not_found"
|
||||
} else if err != nil {
|
||||
log.Debug("E-mail reset fail: %s", err)
|
||||
status = "internal_error"
|
||||
} else {
|
||||
status = "success"
|
||||
}
|
||||
|
||||
td := wc.newTemplateData(w, r)
|
||||
td.Other = status
|
||||
|
||||
wc.templates.Run(w, r, "email_confirm", td)
|
||||
}
|
||||
|
@@ -1,107 +0,0 @@
|
||||
package webcontroller
|
||||
|
||||
import (
|
||||
"io"
|
||||
"net/http"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"fornaxian.tech/log"
|
||||
"github.com/julienschmidt/httprouter"
|
||||
)
|
||||
|
||||
func writeCSVLine(w io.Writer, fields ...interface{}) {
|
||||
for i, field := range fields {
|
||||
if i != 0 {
|
||||
w.Write([]byte(","))
|
||||
}
|
||||
|
||||
switch val := field.(type) {
|
||||
case string:
|
||||
// In CSV files quotes are escaped by replacing them with double quotes
|
||||
w.Write([]byte(`"` + strings.ReplaceAll(val, `"`, `""`) + `"`))
|
||||
case int:
|
||||
w.Write([]byte(strconv.Itoa(val)))
|
||||
case int64:
|
||||
w.Write([]byte(strconv.FormatInt(val, 10)))
|
||||
case time.Time:
|
||||
w.Write([]byte(`"` + val.Format(time.RFC3339) + `"`))
|
||||
default:
|
||||
panic("unknown CSV field type")
|
||||
}
|
||||
}
|
||||
w.Write([]byte("\n"))
|
||||
}
|
||||
|
||||
func (wc *WebController) serveUserExportFiles(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
p httprouter.Params,
|
||||
) {
|
||||
td := wc.newTemplateData(w, r)
|
||||
if !td.Authenticated {
|
||||
http.Redirect(w, r, "/login", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
|
||||
files, err := td.PixelAPI.GetUserFiles()
|
||||
if err != nil {
|
||||
log.Error("Failed to get user files: %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
sort.Slice(files.Files, func(i, j int) (less bool) {
|
||||
return files.Files[i].DateUpload.Before(files.Files[j].DateUpload)
|
||||
})
|
||||
|
||||
w.Header().Add("Content-Description", "File Transfer")
|
||||
w.Header().Add("Content-Disposition", `attachment; filename=pixeldrain_user_files.csv`)
|
||||
w.Header().Add("Content-Type", "text/csv")
|
||||
w.Header().Add("Transfer-Encoding", "chunked") // Replacement for Content-Length
|
||||
|
||||
writeCSVLine(
|
||||
w, "id", "name", "size", "type", "date_upload", "date_last_view",
|
||||
"views", "downloads", "bandwidth_used", "bandwidth_used_paid",
|
||||
)
|
||||
for _, file := range files.Files {
|
||||
writeCSVLine(
|
||||
w, file.ID, file.Name, file.Size, file.MimeType, file.DateUpload,
|
||||
file.DateLastView, file.Views, file.Downloads, file.BandwidthUsed,
|
||||
file.BandwidthUsedPaid,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
func (wc *WebController) serveUserExportLists(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
p httprouter.Params,
|
||||
) {
|
||||
td := wc.newTemplateData(w, r)
|
||||
if !td.Authenticated {
|
||||
http.Redirect(w, r, "/login", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
|
||||
lists, err := td.PixelAPI.GetUserLists()
|
||||
if err != nil {
|
||||
log.Error("Failed to get user lists: %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
sort.Slice(lists.Lists, func(i, j int) (less bool) {
|
||||
return lists.Lists[i].DateCreated.Before(lists.Lists[j].DateCreated)
|
||||
})
|
||||
|
||||
w.Header().Add("Content-Description", "File Transfer")
|
||||
w.Header().Add("Content-Disposition", `attachment; filename=pixeldrain_user_lists.csv`)
|
||||
w.Header().Add("Content-Type", "text/csv")
|
||||
w.Header().Add("Transfer-Encoding", "chunked") // Replacement for Content-Length
|
||||
|
||||
writeCSVLine(w, "id", "title", "date_created", "file_count")
|
||||
for _, list := range lists.Lists {
|
||||
writeCSVLine(w, list.ID, list.Title, list.DateCreated, list.FileCount)
|
||||
}
|
||||
}
|
@@ -156,33 +156,13 @@ func New(r *httprouter.Router, prefix string, conf Config) (wc *WebController) {
|
||||
{GET, "speedtest" /* */, wc.serveTemplate("speedtest", handlerOpts{})},
|
||||
|
||||
// User account pages
|
||||
{GET, "login" /* */, wc.serveTemplate("login", handlerOpts{NoEmbed: true})},
|
||||
{GET, "register" /* */, wc.serveTemplate("login", handlerOpts{NoEmbed: true})},
|
||||
|
||||
{GET, "password_reset" /* */, wc.serveForm(wc.passwordResetForm, handlerOpts{NoEmbed: true})},
|
||||
{PST, "password_reset" /* */, wc.serveForm(wc.passwordResetForm, handlerOpts{NoEmbed: true})},
|
||||
{GET, "login" /* */, wc.serveTemplate("login", handlerOpts{NoEmbed: true})},
|
||||
{GET, "register" /* */, wc.serveTemplate("login", handlerOpts{NoEmbed: true})},
|
||||
{GET, "logout" /* */, wc.serveTemplate("logout", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{PST, "logout" /* */, wc.serveLogout},
|
||||
{GET, "user/filemanager" /* */, wc.serveTemplate("file_manager", handlerOpts{Auth: true})},
|
||||
{GET, "user/export/files" /**/, wc.serveUserExportFiles},
|
||||
{GET, "user/export/lists" /**/, wc.serveUserExportLists},
|
||||
|
||||
// User account settings
|
||||
{GET, "user" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/home" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/settings" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/sharing" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/sharing/*p" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/api_keys" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/activity" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/connect_app" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/transactions" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/subscription" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/prepaid" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/prepaid/*p" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
{GET, "user/confirm_email" /* */, wc.serveEmailConfirm},
|
||||
{GET, "user/password_reset_confirm" /**/, wc.serveForm(wc.passwordResetConfirmForm, handlerOpts{NoEmbed: true})},
|
||||
{PST, "user/password_reset_confirm" /**/, wc.serveForm(wc.passwordResetConfirmForm, handlerOpts{NoEmbed: true})},
|
||||
{GET, "user/*p", wc.serveTemplate("user_home", handlerOpts{Auth: true, NoEmbed: true})},
|
||||
|
||||
// Admin settings
|
||||
{GET, "admin" /* */, wc.serveTemplate("admin", handlerOpts{Auth: true})},
|
||||
|
Reference in New Issue
Block a user