diff options
Diffstat (limited to 'internal/authentication')
| -rw-r--r-- | internal/authentication/file_user_provider.go | 2 | ||||
| -rw-r--r-- | internal/authentication/ldap_user_provider_lifecycle.go | 2 | ||||
| -rw-r--r-- | internal/authentication/ldap_user_provider_test.go | 16 | ||||
| -rw-r--r-- | internal/authentication/user_provider.go | 2 | 
4 files changed, 11 insertions, 11 deletions
diff --git a/internal/authentication/file_user_provider.go b/internal/authentication/file_user_provider.go index 9be6d8edf..bd7af3417 100644 --- a/internal/authentication/file_user_provider.go +++ b/internal/authentication/file_user_provider.go @@ -77,7 +77,7 @@ func (p *FileUserProvider) Reload() (reloaded bool, err error) {  	return true, nil  } -func (p *FileUserProvider) Shutdown() (err error) { +func (p *FileUserProvider) Close() (err error) {  	return nil  } diff --git a/internal/authentication/ldap_user_provider_lifecycle.go b/internal/authentication/ldap_user_provider_lifecycle.go index 73dceaa6a..8f45c99f2 100644 --- a/internal/authentication/ldap_user_provider_lifecycle.go +++ b/internal/authentication/ldap_user_provider_lifecycle.go @@ -10,7 +10,7 @@ import (  	"github.com/authelia/authelia/v4/internal/utils"  ) -func (p *LDAPUserProvider) Shutdown() (err error) { +func (p *LDAPUserProvider) Close() (err error) {  	return p.factory.Close()  } diff --git a/internal/authentication/ldap_user_provider_test.go b/internal/authentication/ldap_user_provider_test.go index 3975faa39..7b6b4ee73 100644 --- a/internal/authentication/ldap_user_provider_test.go +++ b/internal/authentication/ldap_user_provider_test.go @@ -457,7 +457,7 @@ func TestShouldCheckLDAPServerExtensionsPooled(t *testing.T) {  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.EqualError(t, provider.Shutdown(), "errors occurred closing the client pool: close error") +	assert.EqualError(t, provider.Close(), "errors occurred closing the client pool: close error")  }  func TestShouldNotCheckLDAPServerExtensionsWhenRootDSEReturnsMoreThanOneEntry(t *testing.T) { @@ -597,7 +597,7 @@ func TestShouldNotCheckLDAPServerExtensionsWhenRootDSEReturnsMoreThanOneEntryPoo  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldNotCheckLDAPServerExtensionsWhenRootDSEReturnsMoreThanOneEntryPooledClosing(t *testing.T) { @@ -680,7 +680,7 @@ func TestShouldNotCheckLDAPServerExtensionsWhenRootDSEReturnsMoreThanOneEntryPoo  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldCheckLDAPServerControlTypes(t *testing.T) { @@ -820,7 +820,7 @@ func TestShouldCheckLDAPServerControlTypesPooled(t *testing.T) {  	assert.True(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.True(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldNotEnablePasswdModifyExtensionOrControlTypes(t *testing.T) { @@ -886,7 +886,7 @@ func TestShouldNotEnablePasswdModifyExtensionOrControlTypes(t *testing.T) {  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldNotEnablePasswdModifyExtensionOrControlTypesPooled(t *testing.T) { @@ -962,7 +962,7 @@ func TestShouldNotEnablePasswdModifyExtensionOrControlTypesPooled(t *testing.T)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHints)  	assert.False(t, provider.features.ControlTypes.MsftPwdPolHintsDeprecated) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldReturnCheckServerConnectError(t *testing.T) { @@ -1092,7 +1092,7 @@ func TestShouldReturnCheckServerSearchErrorPooled(t *testing.T) {  	assert.False(t, provider.features.Extensions.PwdModifyExOp) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  func TestShouldPermitRootDSEFailure(t *testing.T) { @@ -1187,7 +1187,7 @@ func TestShouldPermitRootDSEFailurePooled(t *testing.T) {  	)  	assert.NoError(t, provider.StartupCheck()) -	assert.NoError(t, provider.Shutdown()) +	assert.NoError(t, provider.Close())  }  type SearchRequestMatcher struct { diff --git a/internal/authentication/user_provider.go b/internal/authentication/user_provider.go index 9d56e65cd..b1addebc9 100644 --- a/internal/authentication/user_provider.go +++ b/internal/authentication/user_provider.go @@ -22,5 +22,5 @@ type UserProvider interface {  	// ChangePassword is used to change a user's password but requires their old password to be successfully verified.  	ChangePassword(username string, oldPassword string, newPassword string) (err error) -	Shutdown() (err error) +	Close() (err error)  }  | 
