diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-07-25 00:03:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 18:03:58 +0200 |
| commit | 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 (patch) | |
| tree | 6f27dc68a35d1f9d806c632e36f0edc8543184ea /services/auth | |
| parent | e0f9635c0691cb67f0fcbb758cabba801d9fc51b (diff) | |
| download | gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.tar.gz gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.zip | |
Add an abstract json layout to make it's easier to change json library (#16528)
* Add an abstract json layout to make it's easier to change json library
* Fix import
* Fix import sequence
* Fix blank lines
* Fix blank lines
Diffstat (limited to 'services/auth')
| -rw-r--r-- | services/auth/source/ldap/source.go | 4 | ||||
| -rw-r--r-- | services/auth/source/oauth2/source.go | 4 | ||||
| -rw-r--r-- | services/auth/source/pam/source.go | 4 | ||||
| -rw-r--r-- | services/auth/source/smtp/source.go | 4 | ||||
| -rw-r--r-- | services/auth/source/sspi/source.go | 3 |
5 files changed, 5 insertions, 14 deletions
diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go index 87be0117ee..79f118f784 100644 --- a/services/auth/source/ldap/source.go +++ b/services/auth/source/ldap/source.go @@ -8,10 +8,9 @@ import ( "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/secret" "code.gitea.io/gitea/modules/setting" - - jsoniter "github.com/json-iterator/go" ) // .____ ________ _____ __________ @@ -79,7 +78,6 @@ func (source *Source) ToDB() ([]byte, error) { return nil, err } source.BindPassword = "" - json := jsoniter.ConfigCompatibleWithStandardLibrary return json.Marshal(source) } diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index e9c49ef90b..40d8973b4b 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -6,8 +6,7 @@ package oauth2 import ( "code.gitea.io/gitea/models" - - jsoniter "github.com/json-iterator/go" + "code.gitea.io/gitea/modules/json" ) // ________ _____ __ .__ ________ @@ -37,7 +36,6 @@ func (source *Source) FromDB(bs []byte) error { // ToDB exports an SMTPConfig to a serialized format. func (source *Source) ToDB() ([]byte, error) { - json := jsoniter.ConfigCompatibleWithStandardLibrary return json.Marshal(source) } diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go index b717ee6fe8..75aa99e45f 100644 --- a/services/auth/source/pam/source.go +++ b/services/auth/source/pam/source.go @@ -6,8 +6,7 @@ package pam import ( "code.gitea.io/gitea/models" - - jsoniter "github.com/json-iterator/go" + "code.gitea.io/gitea/modules/json" ) // __________ _____ _____ @@ -33,7 +32,6 @@ func (source *Source) FromDB(bs []byte) error { // ToDB exports a PAMConfig to a serialized format. func (source *Source) ToDB() ([]byte, error) { - json := jsoniter.ConfigCompatibleWithStandardLibrary return json.Marshal(source) } diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 0f948d5381..3d80aea68a 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -6,8 +6,7 @@ package smtp import ( "code.gitea.io/gitea/models" - - jsoniter "github.com/json-iterator/go" + "code.gitea.io/gitea/modules/json" ) // _________ __________________________ @@ -37,7 +36,6 @@ func (source *Source) FromDB(bs []byte) error { // ToDB exports an SMTPConfig to a serialized format. func (source *Source) ToDB() ([]byte, error) { - json := jsoniter.ConfigCompatibleWithStandardLibrary return json.Marshal(source) } diff --git a/services/auth/source/sspi/source.go b/services/auth/source/sspi/source.go index e4be446f30..58cb10de1d 100644 --- a/services/auth/source/sspi/source.go +++ b/services/auth/source/sspi/source.go @@ -6,7 +6,7 @@ package sspi import ( "code.gitea.io/gitea/models" - jsoniter "github.com/json-iterator/go" + "code.gitea.io/gitea/modules/json" ) // _________ ___________________.___ @@ -32,7 +32,6 @@ func (cfg *Source) FromDB(bs []byte) error { // ToDB exports an SSPIConfig to a serialized format. func (cfg *Source) ToDB() ([]byte, error) { - json := jsoniter.ConfigCompatibleWithStandardLibrary return json.Marshal(cfg) } |