Skip to content

Commit

Permalink
renamin user_data to meta_data
Browse files Browse the repository at this point in the history
  • Loading branch information
dencoded committed Feb 5, 2019
1 parent b8b9a1e commit d258450
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ type NewClientRequest struct {
APIID string `json:"api_id"`
PolicyID string `json:"policy_id"`
ClientSecret string `json:"secret"`
UserData interface{} `json:"user_data"`
MetaData interface{} `json:"meta_data"`
}

func oauthClientStorageID(clientID string) string {
Expand Down Expand Up @@ -1213,7 +1213,7 @@ func createOauthClient(w http.ResponseWriter, r *http.Request) {
ClientRedirectURI: newOauthClient.ClientRedirectURI,
ClientSecret: secret,
PolicyID: newOauthClient.PolicyID,
UserData: newOauthClient.UserData,
MetaData: newOauthClient.MetaData,
}

storageID := oauthClientStorageID(newClient.GetId())
Expand Down Expand Up @@ -1296,7 +1296,7 @@ func createOauthClient(w http.ResponseWriter, r *http.Request) {
ClientSecret: newClient.GetSecret(),
ClientRedirectURI: newClient.GetRedirectUri(),
PolicyID: newClient.GetPolicyID(),
UserData: newClient.GetUserData(),
MetaData: newClient.GetUserData(),
}

log.WithFields(logrus.Fields{
Expand Down Expand Up @@ -1453,7 +1453,7 @@ func getOauthClientDetails(keyName, apiID string) (interface{}, int) {
ClientSecret: clientData.GetSecret(),
ClientRedirectURI: clientData.GetRedirectUri(),
PolicyID: clientData.GetPolicyID(),
UserData: clientData.GetUserData(),
MetaData: clientData.GetUserData(),
}

log.WithFields(logrus.Fields{
Expand Down Expand Up @@ -1551,7 +1551,7 @@ func getOauthClients(apiID string) (interface{}, int) {
ClientSecret: osinClient.GetSecret(),
ClientRedirectURI: osinClient.GetRedirectUri(),
PolicyID: osinClient.GetPolicyID(),
UserData: osinClient.GetUserData(),
MetaData: osinClient.GetUserData(),
}

clients = append(clients, reportableClientData)
Expand Down
4 changes: 2 additions & 2 deletions oauth_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type OAuthClient struct {
ClientID string `json:"id"`
ClientSecret string `json:"secret"`
ClientRedirectURI string `json:"redirecturi"`
UserData interface{} `json:"user_data,omitempty"`
MetaData interface{} `json:"meta_data,omitempty"`
PolicyID string `json:"policyid"`
}

Expand All @@ -61,7 +61,7 @@ func (oc *OAuthClient) GetRedirectUri() string {
}

func (oc *OAuthClient) GetUserData() interface{} {
return oc.UserData
return oc.MetaData
}

func (oc *OAuthClient) GetPolicyID() string {
Expand Down

0 comments on commit d258450

Please sign in to comment.