client/manager_sql: return an empty slice if string is empty (#491)

Signed-off-by: Mohamedh Fazal <mohamedhfazal@gmail.com>

client/manager_sql.go

@@ -104,16 +104,16 @@ func (d *sqlData) ToClient() *Client {
  ID: d.ID,
  Name: d.Name,
  Secret: d.Secret,
- RedirectURIs: strings.Split(d.RedirectURIs, "|"),
- GrantTypes: strings.Split(d.GrantTypes, "|"),
- ResponseTypes: strings.Split(d.ResponseTypes, "|"),
+ RedirectURIs: pkg.SplitNonEmpty(d.RedirectURIs, "|"),
+ GrantTypes: pkg.SplitNonEmpty(d.GrantTypes, "|"),
+ ResponseTypes: pkg.SplitNonEmpty(d.ResponseTypes, "|"),
  Scope: d.Scope,
  Owner: d.Owner,
  PolicyURI: d.PolicyURI,
  TermsOfServiceURI: d.TermsOfServiceURI,
  ClientURI: d.ClientURI,
  LogoURI: d.LogoURI,
- Contacts: strings.Split(d.Contacts, "|"),
+ Contacts: pkg.SplitNonEmpty(d.Contacts, "|"),
  Public: d.Public,
  }
 }

client/manager_test.go

@@ -189,6 +189,7 @@ func TestCreateGetDeleteClient(t *testing.T) {
  assert.Equal(t, "bar", nc.TermsOfServiceURI, "%s", k)
  assert.Equal(t, "name-new", nc.Name, "%s", k)
  assert.EqualValues(t, []string{"http://redirect/new"}, nc.GetRedirectURIs(), "%s", k)
+ assert.Zero(t, len(nc.Contacts))
 
  err = m.DeleteClient("1234")
  assert.Nil(t, err)

pkg/split_string.go

@@ -0,0 +1,13 @@
+package pkg
+
+import "strings"
+
+// SplitNonEmpty is a special case of strings.Split
+// which returns an empty slice if string is empty
+func SplitNonEmpty(s, sep string) []string {
+ if s == "" {
+ return nil
+ }
+
+ return strings.Split(s, sep)
+}