jgaunt/portwarden
1
0
Fork 0
mirror of https://github.com/vwxyzjn/portwarden synced 2025-12-26 03:53:12 +00:00
Code Issues Releases Wiki Activity

API-1 # Return basic error messages to the front end

Browse Source
This commit is contained in:
Costa Huang
2018-11-16 17:45:24 -05:00
parent 368f2c7ef7
commit c30f1ed31b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core.go
View File

@@ -189,7 +189,7 @@ func BWLoginGetSessionKey(lc *LoginCredentials) (string, error) {
var stdout bytes.Buffer
cmd.Stdout = &stdout
if err := cmd.Run(); err != nil {
return "", err
return stdout.String(), err
}
sessionKey := stdout.String()
return sessionKey, nil

7
web/controllers/backup_controller.go
View File

@@ -14,21 +14,20 @@ import (
func EncryptBackupController(c *gin.Context) {
var bi models.BackupInfo
if err := c.ShouldBindJSON(&bi); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error(), "message": ""})
return
}
spew.Dump(&bi.BitwardenLoginCredentials)
sessionKey, err := portwarden.BWLoginGetSessionKey(&bi.BitwardenLoginCredentials)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error(), "message": sessionKey})
return
}
fmt.Println(sessionKey)
err = portwarden.CreateBackupFile(bi.FileNamePrefix, bi.Passphrase, sessionKey, models.BackupDefaultSleepMilliseconds)
if err != nil {
panic(err)
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error(), "message": sessionKey})
return
}
}