ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-07-05 01:09:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

New lint rules

Browse Source
This commit is contained in:
Jamie Curnow
2024-11-21 19:07:36 +10:00
parent 4e6d65645f
commit 152b7666d8
85 changed files with 385 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/internal/entity/auth/entity_test.go
View File

@ -139,13 +139,11 @@ func (s *testsuite) TestSave() {
func (s *testsuite) TestSetPassword() {
// goleak is used to detect goroutine leaks
defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
m := Model{UserID: 100}
err := m.SetPassword("abc123")
require.NoError(s.T(), err)
assert.Equal(s.T(), TypeLocal, m.Type)
assert.Greater(s.T(), len(m.Secret), 15)
}
func (s *testsuite) TestValidateSecret() {

2
backend/internal/entity/auth/methods.go
View File

@ -22,7 +22,7 @@ func GetByUserIDType(userID uint, authType string) (Model, error) {
return auth, result.Error
}
// GetByUserIDType finds a user by id and type
// GetByIdenityType finds a user by identity and type
func GetByIdenityType(identity string, authType string) (Model, error) {
var auth Model
db := database.GetDB()

2
backend/internal/entity/auth/model.go
View File

@ -17,7 +17,7 @@ const (
// Model is the model
type Model struct {
model.ModelBase
model.Base
UserID uint `json:"user_id" gorm:"column:user_id"`
Type string `json:"type" gorm:"column:type;default:local"`
Identity string `json:"identity,omitempty" gorm:"column:identity"`

6
backend/internal/entity/auth/oauth.go
View File

@ -32,9 +32,9 @@ func OAuthCacheInit() {
// OAuthUser is the OAuth User
type OAuthUser struct {
Identifier string `json:"identifier"`
Token string `json:"token"`
Resource map[string]interface{} `json:"resource"`
Identifier string `json:"identifier"`
Token string `json:"token"`
Resource map[string]any `json:"resource"`
}
// GetResourceField will attempt to get a field from the resource

36
backend/internal/entity/auth/oauth_test.go
View File

@ -105,7 +105,7 @@ func TestGetEmail(t *testing.T) {
{
name: "Email in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"email": "user@example.com",
},
},
@ -128,7 +128,7 @@ func TestGetEmail(t *testing.T) {
{
name: "No email or identifier",
oauthUser: OAuthUser{
Resource: map[string]interface{}{},
Resource: map[string]any{},
},
expected: "",
},
@ -151,7 +151,7 @@ func TestGetName(t *testing.T) {
{
name: "Nickname in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"nickname": "user_nick",
},
},
@ -160,7 +160,7 @@ func TestGetName(t *testing.T) {
{
name: "Given name in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"given_name": "User Given",
},
},
@ -169,7 +169,7 @@ func TestGetName(t *testing.T) {
{
name: "Name in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"name": "User Name",
},
},
@ -178,7 +178,7 @@ func TestGetName(t *testing.T) {
{
name: "Preferred username in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"preferred_username": "preferred_user",
},
},
@ -187,7 +187,7 @@ func TestGetName(t *testing.T) {
{
name: "Username in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"username": "user123",
},
},
@ -197,14 +197,14 @@ func TestGetName(t *testing.T) {
name: "No name fields in resource, fallback to identifier",
oauthUser: OAuthUser{
Identifier: "fallback_identifier",
Resource: map[string]interface{}{},
Resource: map[string]any{},
},
expected: "fallback_identifier",
},
{
name: "No name fields and no identifier",
oauthUser: OAuthUser{
Resource: map[string]interface{}{},
Resource: map[string]any{},
},
expected: "",
},
@ -212,7 +212,7 @@ func TestGetName(t *testing.T) {
name: "All fields",
oauthUser: OAuthUser{
Identifier: "fallback_identifier",
Resource: map[string]interface{}{
Resource: map[string]any{
"nickname": "user_nick",
"given_name": "User Given",
"name": "User Name",
@ -248,7 +248,7 @@ func TestGetID(t *testing.T) {
{
name: "UID in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"uid": "uid123",
},
},
@ -257,7 +257,7 @@ func TestGetID(t *testing.T) {
{
name: "User ID in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"user_id": "user_id123",
},
},
@ -266,7 +266,7 @@ func TestGetID(t *testing.T) {
{
name: "Username in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"username": "username123",
},
},
@ -275,7 +275,7 @@ func TestGetID(t *testing.T) {
{
name: "Preferred username in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"preferred_username": "preferred_user",
},
},
@ -284,7 +284,7 @@ func TestGetID(t *testing.T) {
{
name: "Email in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"email": "user@example.com",
},
},
@ -293,7 +293,7 @@ func TestGetID(t *testing.T) {
{
name: "Mail in resource",
oauthUser: OAuthUser{
Resource: map[string]interface{}{
Resource: map[string]any{
"mail": "mail@example.com",
},
},
@ -302,7 +302,7 @@ func TestGetID(t *testing.T) {
{
name: "No identifier or resource fields",
oauthUser: OAuthUser{
Resource: map[string]interface{}{},
Resource: map[string]any{},
},
expected: "",
},
@ -310,7 +310,7 @@ func TestGetID(t *testing.T) {
name: "All fields",
oauthUser: OAuthUser{
Identifier: "user123",
Resource: map[string]interface{}{
Resource: map[string]any{
"uid": "uid123",
"user_id": "user_id123",
"username": "username123",