Resolves SDK and test issues (#4)

Gopkg.toml

@@ -75,7 +75,7 @@
 
 [[constraint]]
   name = "github.com/ory/hydra"
-  version = "0.11.12"
+  branch = "1.0.x"
 
 [[constraint]]
   name = "github.com/ory/ladon"

cmd/client/handler_warden.go

@@ -55,7 +55,7 @@ func (h *WardenHandler) IsOAuth2AccessTokenAuthorized(cmd *cobra.Command, args [
 	resource, _ := cmd.Flags().GetString("resources")
 
 	m := h.newWardenManager(cmd)
-	_, response, err := m.IsOAuth2AccessTokenAuthorized(keto.WardenOAuth2AccessRequest{
+	_, response, err := m.IsOAuth2AccessTokenAuthorized(keto.WardenOAuth2AuthorizationRequest{
 		Token:    token,
 		Scopes:   scopes,
 		Action:   action,
@@ -70,7 +70,7 @@ func (h *WardenHandler) IsSubjectAuthorized(cmd *cobra.Command, args []string) {
 	resource, _ := cmd.Flags().GetString("resources")
 
 	m := h.newWardenManager(cmd)
-	_, response, err := m.IsSubjectAuthorized(keto.WardenSubjectAccessRequest{
+	_, response, err := m.IsSubjectAuthorized(keto.WardenSubjectAuthorizationRequest{
 		Action:   action,
 		Subject:  subject,
 		Resource: resource,

cmd/groups_create.go

@@ -33,7 +33,7 @@ var createCmd = &cobra.Command{
 Example:
   hydra groups create my-group
 `,
-	Run: cmdHandler.Groups.CreateGroup,
+	Run: cmdHandler.Roles.CreateRole,
 }
 
 func init() {

cmd/groups_delete.go

@@ -33,7 +33,7 @@ var deleteCmd = &cobra.Command{
 Example:
   hydra groups delete my-group
 `,
-	Run: cmdHandler.Groups.DeleteGroup,
+	Run: cmdHandler.Roles.DeleteRole,
 }
 
 func init() {

cmd/groups_find.go

@@ -33,7 +33,7 @@ var findCmd = &cobra.Command{
 Example:
   hydra groups find peter
 `,
-	Run: cmdHandler.Groups.FindGroups,
+	Run: cmdHandler.Roles.FindRoles,
 }
 
 func init() {

cmd/groups_list.go

@@ -33,7 +33,7 @@ var listCmd = &cobra.Command{
 Example:
   hydra groups list
 `,
-	Run: cmdHandler.Groups.ListGroups,
+	Run: cmdHandler.Roles.ListRoles,
 }
 
 func init() {

cmd/groups_members_add.go

@@ -32,7 +32,7 @@ var addCmd = &cobra.Command{
 Example:
   hydra groups members add my-group peter julia
 `,
-	Run: cmdHandler.Groups.AddMembers,
+	Run: cmdHandler.Roles.RoleAddMembers,
 }
 
 func init() {

cmd/groups_members_remove.go

@@ -32,7 +32,7 @@ var removeCmd = &cobra.Command{
 Example:
   hydra groups members remove my-group peter julia
 `,
-	Run: cmdHandler.Groups.RemoveMembers,
+	Run: cmdHandler.Roles.RoleRemoveMembers,
 }
 
 func init() {

cmd/server/serve.go

@@ -116,7 +116,7 @@ func RunServe(
 					"/warden/oauth2/authorize",
 					"/warden/subjects/authorize",
 				},
-				nil,
+				logger,
 			)
 			go m.RegisterSegment(buildVersion, buildHash, buildTime)
 			go m.CommitMemoryStatistics()

docs/api.swagger.json

@@ -592,7 +592,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/wardenOAuth2Authorization"
+            "description": "wardenOAuth2AuthorizationResponse",
+            "schema": {
+              "$ref": "#/definitions/wardenOAuth2AuthorizationResponse"
+            }
           },
           "401": {
             "$ref": "#/responses/genericError"
@@ -635,7 +638,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/wardenSubjectAuthorization"
+            "description": "wardenSubjectAuthorizationResponse",
+            "schema": {
+              "$ref": "#/definitions/wardenSubjectAuthorizationResponse"
+            }
           },
           "401": {
             "$ref": "#/responses/genericError"

role/sdk_test.go

@@ -94,14 +94,14 @@ func TestGroupSDK(t *testing.T) {
 		assert.Equal(t, http.StatusOK, response.StatusCode)
 		assert.Len(t, results, 1)
 
-		client.AddMembersToRole("1", keto.GroupMembers{Members: []string{"baz"}})
+		client.AddMembersToRole("1", keto.RoleMembers{Members: []string{"baz"}})
 
 		results, response, err = client.ListRoles("baz", 100, 0)
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusOK, response.StatusCode)
 		assert.Len(t, results, 1)
 
-		response, err = client.RemoveMembersFromRole("1", keto.GroupMembers{Members: []string{"baz"}})
+		response, err = client.RemoveMembersFromRole("1", keto.RoleMembers{Members: []string{"baz"}})
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusNoContent, response.StatusCode)