mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-15 02:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make Serialize functions private

Browse source
This commit is contained in:
Anant Prakash 2018-05-22 12:33:23 +05:30
parent bb5863e15e
commit 8a9102ff04
No known key found for this signature in database
GPG key ID: C5D399F626523045
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/clientapi/auth/tokens/tokens.go
View file

@ -63,7 +63,7 @@ func GenerateLoginToken(op TokenOptions) (string, error) {
return "", macaroonError(err) return "", macaroonError(err)
} }
urlSafeEncode, err := SerializeMacaroon(*mac) urlSafeEncode, err := serializeMacaroon(*mac)
if err != nil { if err != nil {
return "", macaroonError(err) return "", macaroonError(err)
} }
@ -106,9 +106,9 @@ func macaroonError(err error) error {
return fmt.Errorf("Macaroon creation failed: %s", err.Error()) return fmt.Errorf("Macaroon creation failed: %s", err.Error())
} }
// SerializeMacaroon takes a macaroon to be serialized. // serializeMacaroon takes a macaroon to be serialized.
// returns it's base64 encoded string, URL safe, which can be sent via web, email, etc. // returns it's base64 encoded string, URL safe, which can be sent via web, email, etc.
func SerializeMacaroon(m macaroon.Macaroon) (string, error) { func serializeMacaroon(m macaroon.Macaroon) (string, error) {
bin, err := m.MarshalBinary() bin, err := m.MarshalBinary()
if err != nil { if err != nil {
return "", err return "", err
@ -118,9 +118,9 @@ func SerializeMacaroon(m macaroon.Macaroon) (string, error) {
return urlSafeEncode, nil return urlSafeEncode, nil
} }
// DeSerializeMacaroon takes a base64 encoded string of a macaroon to be de-serialized. // deSerializeMacaroon takes a base64 encoded string of a macaroon to be de-serialized.
// Returns a macaroon. On failure returns error with description. // Returns a macaroon. On failure returns error with description.
func DeSerializeMacaroon(urlSafeEncode string) (macaroon.Macaroon, error) { func deSerializeMacaroon(urlSafeEncode string) (macaroon.Macaroon, error) {
var mac macaroon.Macaroon var mac macaroon.Macaroon
bin, err := base64.RawURLEncoding.DecodeString(urlSafeEncode) bin, err := base64.RawURLEncoding.DecodeString(urlSafeEncode)
if err != nil { if err != nil {

4
src/github.com/matrix-org/dendrite/clientapi/auth/tokens/tokens_test.go
View file

@ -64,12 +64,12 @@ func TestSerialization(t *testing.T) {
t.Errorf(serializationTestError(err)) t.Errorf(serializationTestError(err))
} }
fakeMacaroon, err := DeSerializeMacaroon(fakeToken) fakeMacaroon, err := deSerializeMacaroon(fakeToken)
if err != nil { if err != nil {
t.Errorf(serializationTestError(err)) t.Errorf(serializationTestError(err))
} }
sameFakeToken, err := SerializeMacaroon(fakeMacaroon) sameFakeToken, err := serializeMacaroon(fakeMacaroon)
if err != nil { if err != nil {
t.Errorf(serializationTestError(err)) t.Errorf(serializationTestError(err))
} }