Fix SSH pubkey detection

internal/models/sshkey.go

@@ -48,7 +48,7 @@ func GetSSHKeyByID(sshKeyId uint) (*SSHKey, error) {
 	return sshKey, err
 }
 
-func GetSSHKeyByContent(sshKeyContent string) (*SSHKey, error) {
+func SSHKeyDoesExists(sshKeyContent string) (*SSHKey, error) {
 	sshKey := new(SSHKey)
 	err := db.
 		Where("content like ?", sshKeyContent+"%").
@@ -65,9 +65,9 @@ func (sshKey *SSHKey) Delete() error {
 	return db.Delete(&sshKey).Error
 }
 
-func SSHKeyLastUsedNow(sshKeyID uint) error {
+func SSHKeyLastUsedNow(sshKeyContent string) error {
 	return db.Model(&SSHKey{}).
-		Where("id = ?", sshKeyID).
+		Where("content = ?", sshKeyContent).
 		Update("last_used_at", time.Now().Unix()).Error
 }
 

internal/models/user.go

@@ -81,15 +81,14 @@ func GetUserById(userId uint) (*User, error) {
 	return user, err
 }
 
-func GetUserBySSHKeyID(sshKeyId uint) (*User, error) {
-	user := new(User)
+func SSHKeyExistsForUser(sshKey string, userId uint) (*SSHKey, error) {
+	key := new(SSHKey)
 	err := db.
-		Preload("SSHKeys").
-		Joins("join ssh_keys on users.id = ssh_keys.user_id").
-		Where("ssh_keys.id = ?", sshKeyId).
-		First(&user).Error
+		Where("content = ?", sshKey).
+		Where("user_id = ?", userId).
+		First(&key).Error
 
-	return user, err
+	return key, err
 }
 
 func GetUserByProvider(id string, provider string) (*User, error) {