Upgrade JS and Go deps versions (#517)

internal/auth/totp/aes.go

@@ -19,7 +19,8 @@ func AESEncrypt(key, text []byte) ([]byte, error) {
 	if _, err = io.ReadFull(rand.Reader, iv); err != nil {
 		return nil, err
 	}
-
+	// TODO: remove deprecated
+	//nolint:staticcheck
 	stream := cipher.NewCFBEncrypter(block, iv)
 	stream.XORKeyStream(ciphertext[aes.BlockSize:], text)
 
@@ -38,7 +39,8 @@ func AESDecrypt(key, ciphertext []byte) ([]byte, error) {
 
 	iv := ciphertext[:aes.BlockSize]
 	ciphertext = ciphertext[aes.BlockSize:]
-
+	// TODO: remove deprecated
+	//nolint:staticcheck
 	stream := cipher.NewCFBDecrypter(block, iv)
 	stream.XORKeyStream(ciphertext, ciphertext)
 

internal/auth/totp/totp.go

@@ -4,20 +4,21 @@ import (
 	"bytes"
 	"crypto/rand"
 	"encoding/base64"
-	"github.com/pquerna/otp/totp"
 	"html/template"
 	"image/png"
 	"strings"
+
+	"github.com/pquerna/otp/totp"
 )
 
 const secretSize = 16
 
-func GenerateQRCode(username, siteUrl string, secret []byte) (string, template.URL, error, []byte) {
+func GenerateQRCode(username, siteUrl string, secret []byte) (string, template.URL, []byte, error) {
 	var err error
 	if secret == nil {
 		secret, err = generateSecret()
 		if err != nil {
-			return "", "", err, nil
+			return "", "", nil, err
 		}
 	}
 
@@ -28,22 +29,22 @@ func GenerateQRCode(username, siteUrl string, secret []byte) (string, template.U
 		Secret:      secret,
 	})
 	if err != nil {
-		return "", "", err, nil
+		return "", "", nil, err
 	}
 
 	qrcode, err := otpKey.Image(320, 240)
 	if err != nil {
-		return "", "", err, nil
+		return "", "", nil, err
 	}
 
 	var imgBytes bytes.Buffer
 	if err = png.Encode(&imgBytes, qrcode); err != nil {
-		return "", "", err, nil
+		return "", "", nil, err
 	}
 
 	qrcodeImage := template.URL("data:image/png;base64," + base64.StdEncoding.EncodeToString(imgBytes.Bytes()))
 
-	return otpKey.Secret(), qrcodeImage, nil, secret
+	return otpKey.Secret(), qrcodeImage, secret, nil
 }
 
 func Validate(passcode, secret string) bool {

internal/auth/webauthn/webauthn.go

@@ -2,13 +2,14 @@ package webauthn
 
 import (
 	"encoding/json"
+	"net/http"
+	"net/url"
+
 	"github.com/go-webauthn/webauthn/protocol"
 	"github.com/go-webauthn/webauthn/webauthn"
 	"github.com/rs/zerolog/log"
 	"github.com/thomiceli/opengist/internal/config"
 	"github.com/thomiceli/opengist/internal/db"
-	"net/http"
-	"net/url"
 )
 
 var webAuthn *webauthn.WebAuthn
@@ -101,7 +102,7 @@ func FinishDiscoverableLogin(jsonSession []byte, response *http.Request) (uint,
 		return 0, err
 	}
 
-	return waUser.(*user).User.ID, nil
+	return waUser.(*user).ID, nil
 }
 
 func BeginLogin(dbUser *db.User) (credCreation *protocol.CredentialAssertion, jsonSession []byte, err error) {