fix: allow for using auth header (#67)

Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
pluralsh · Jul 11, 2023 · 0e03d18 · 0e03d18
1 parent eab0220
commit 0e03d18
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 1,243 deletions.
diff --git a/clients/group.go b/clients/group.go
@@ -71,9 +71,9 @@ func (c *ClientWrapper) MutateGroup(ctx context.Context, name string, members []
 
 	return &model.Group{
 		Name: name,
-		Organization: &model.Organization{
-			Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
-		},
+		// Organization: &model.Organization{
+		// 	Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
+		// },
 	}, nil
 }
 
@@ -324,9 +324,9 @@ func (c *ClientWrapper) GetGroupFromName(ctx context.Context, groupName string)
 
 	return &model.Group{
 		Name: groupName,
-		Organization: &model.Organization{
-			Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
-		},
+		// Organization: &model.Organization{
+		// 	Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
+		// },
 	}, nil
 }
 
@@ -439,8 +439,8 @@ func (c *ClientWrapper) DeleteGroup(ctx context.Context, groupName string) (*mod
 	log.Info("Success deleting group in keto")
 	return &model.Group{
 		Name: groupName,
-		Organization: &model.Organization{
-			Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
-		},
+		// Organization: &model.Organization{
+		// 	Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
+		// },
 	}, nil
 }
diff --git a/clients/oauth2client.go b/clients/oauth2client.go
@@ -257,9 +257,9 @@ func (c *ClientWrapper) CreateOAuth2Client(ctx context.Context, mode HydraOperat
 
 	output := format.HydraOAuth2ClientToGraphQL(*createdClient)
 
-	output.Organization = &model.Organization{
-		Name: "main", //TODO: decide whether to hardcode this or not
-	}
+	// output.Organization = &model.Organization{
+	// 	Name: "main", //TODO: decide whether to hardcode this or not
+	// }
 
 	return output, nil
 }
@@ -300,9 +300,9 @@ func (c *ClientWrapper) DeleteOAuth2Client(ctx context.Context, clientID string)
 
 	return &model.OAuth2Client{
 		ClientID: px.Ptr(clientID),
-		Organization: &model.Organization{
-			Name: "main", //TODO: decide whether to hardcode this or not
-		},
+		// Organization: &model.Organization{
+		// 	Name: "main", //TODO: decide whether to hardcode this or not
+		// },
 	}, nil
 }
 

diff --git a/clients/user.go b/clients/user.go
@@ -243,9 +243,9 @@ func (c *ClientWrapper) DeleteUser(ctx context.Context, id string) (*model.User,
 	return &model.User{
 		ID:    id,
 		Email: "deleted",
-		Organization: &model.Organization{
-			Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
-		},
+		// Organization: &model.Organization{
+		// 	Name: consts.MainOrganizationName, //TODO: decide whether to hardcode this or not
+		// },
 	}, nil
 }
 

diff --git a/generated/client/client.go b/generated/client/client.go
diff --git a/generated/client/models_gen.go b/generated/client/models_gen.go
diff --git a/go.mod b/go.mod
@@ -17,8 +17,6 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
 	go.opentelemetry.io/contrib/propagators/jaeger v1.17.0
 	go.opentelemetry.io/otel v1.16.0
-	go.opentelemetry.io/otel/exporters/jaeger v1.16.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
 	go.opentelemetry.io/otel/sdk v1.16.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	sigs.k8s.io/controller-runtime v0.14.4