diff --git a/controller/projects.go b/controller/projects.go index 50106d76..46a48e32 100644 --- a/controller/projects.go +++ b/controller/projects.go @@ -153,8 +153,6 @@ func (p *Projects) Get(id uuid.UUID) (*model.Project, error) { } func (p *Projects) GetProjectListForUser(userID uuid.UUID, auth *auth.Authenticator, ctx context.Context) (*model.ProjectList, error) { - fmt.Println("GetProjectListForUser()") - fmt.Println("GetProjectListForUser() ctx session:", ctx.Value("session")) var projects []*model.Project err := p.store.GetAllProjectsForUser(userID, &projects) if err != nil { @@ -162,7 +160,6 @@ func (p *Projects) GetProjectListForUser(userID uuid.UUID, auth *auth.Authentica } exportedProjects := make([]*model.Project, len(projects)) - fmt.Println("GetProjectListForUser(): Exporting ", len(projects), "projects") numImmutable := 0 @@ -175,9 +172,6 @@ func (p *Projects) GetProjectListForUser(userID uuid.UUID, auth *auth.Authentica } } - fmt.Println("GetProjectListForUser(): ", numImmutable, "immutable +", len(projects)-numImmutable, "mutable") - - fmt.Println("GetProjectListForUser(): returning", len(exportedProjects), "projects") return &model.ProjectList{Projects: exportedProjects}, nil } diff --git a/generated.go b/generated.go index 38f04b40..efb4e43c 100644 --- a/generated.go +++ b/generated.go @@ -5116,12 +5116,10 @@ func (ec *executionContext) _Query_projectList(ctx context.Context, field graphq return ec.resolvers.Query().ProjectList(rctx) }) if err != nil { - fmt.Println("Generated.go: line 5199 error!") ec.Error(ctx, err) return graphql.Null } if resTmp == nil { - fmt.Println("Generated.go: resTmp == nil!!") if !graphql.HasFieldError(ctx, fc) { ec.Errorf(ctx, "must not be null") } @@ -5129,7 +5127,6 @@ func (ec *executionContext) _Query_projectList(ctx context.Context, field graphq } res := resTmp.(*model.ProjectList) fc.Result = res - fmt.Println("Generated Result:", res.Projects) return ec.marshalNProjectList2ᚖgithubᚗcomᚋdapperlabsᚋflowᚑplaygroundᚑapiᚋmodelᚐProjectList(ctx, field.Selections, res) } diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go index e463871b..0cb6ee2a 100644 --- a/middleware/errors/errors.go +++ b/middleware/errors/errors.go @@ -51,13 +51,6 @@ func Middleware(entry *logrus.Entry, localHub *sentry.Hub) graphql.ResponseMiddl res := next(ctx) errList := graphql.GetErrors(ctx) - fmt.Println("Errors Middleware Response: ", res) - responseData, err := res.Data.MarshalJSON() - if err != nil { - fmt.Println("ERROR FAILED TO MARSHALL RESP DATA") - } - fmt.Println("ResponseData: ", string(responseData)) - for i, err := range errList { contextEntry := entry. WithFields(debugFields) @@ -71,7 +64,6 @@ func Middleware(entry *logrus.Entry, localHub *sentry.Hub) graphql.ResponseMiddl telemetry.UserErrorCounter.Inc() res.Extensions["code"] = "BAD_REQUEST" } else if errors.As(err, &authErr) { - fmt.Println("Middleware Auth errors:", err.Error()) res.Extensions["code"] = "AUTHORIZATION_ERROR" } else { fmt.Println("Middleware errors: ", err.Error()) diff --git a/middleware/sessions/sessions.go b/middleware/sessions/sessions.go index 4ef53228..7629593e 100644 --- a/middleware/sessions/sessions.go +++ b/middleware/sessions/sessions.go @@ -32,8 +32,6 @@ type sessionCtxKey string const sessionCtxKeySession sessionCtxKey = "session" -//var store *sessions.CookieStore - // Middleware injects middleware for managing sessions into an HTTP handler. // // Sessions are stored using the provided sessions.Store instance. @@ -50,24 +48,14 @@ func Middleware(store sessions.Store) func(http.Handler) http.Handler { } } -/* -func SetCookieStore(cookieStore *sessions.CookieStore) { - store = cookieStore -} -*/ - // Get returns the session with the given name, or creates one if it does not exist. func Get(ctx context.Context, name string) *sessions.Session { - // TODO: Store panics on dereference - // TODO: This means that ctx.Value(sessionCtxKeySession) is not a sessions.Store - store := ctx.Value(sessionCtxKeySession).(sessions.Store) // TODO: Revert to this - //fmt.Println("Session.Get(): Store ctx value: ", ctx.Value(sessionCtxKeySession)) + store := ctx.Value(sessionCtxKeySession).(sessions.Store) // ignore error because a session is always returned even if one does not exist session, _ := store.Get(httpcontext.Request(ctx), name) - // TODO: Save must be called to set the response cookie/ headers? - _ = Save(ctx, session) // Pre save in case it's not saved elsewhere? + _ = Save(ctx, session) // Pre save in case it's not saved elsewhere return session } diff --git a/resolver.go b/resolver.go index 11b08d00..c276d9c1 100644 --- a/resolver.go +++ b/resolver.go @@ -20,7 +20,6 @@ package playground import ( "context" - "fmt" "github.com/Masterminds/semver" "github.com/dapperlabs/flow-playground-api/adapter" "github.com/dapperlabs/flow-playground-api/auth" @@ -352,7 +351,6 @@ func (r *mutationResolver) CreateContractDeployment( type projectResolver struct{ *Resolver } func (r *projectResolver) TransactionTemplates(_ context.Context, proj *model.Project) ([]*model.TransactionTemplate, error) { - fmt.Println("projectResolver: TransactionTemplates()") files, err := r.files.GetFilesForProject(proj.ID, model.TransactionFile) if err != nil { return nil, err @@ -372,7 +370,6 @@ func (r *projectResolver) TransactionExecutions(_ context.Context, proj *model.P } func (r *projectResolver) ScriptTemplates(_ context.Context, proj *model.Project) ([]*model.ScriptTemplate, error) { - fmt.Println("projectResolver: ScriptTemplates()") return r.files.GetFilesForProject(proj.ID, model.ScriptFile) } @@ -387,12 +384,10 @@ func (r *projectResolver) ScriptExecutions(_ context.Context, proj *model.Projec } func (r *projectResolver) ContractTemplates(_ context.Context, proj *model.Project) ([]*model.ContractTemplate, error) { - fmt.Println("projectResolver: ContractTemplates()") return r.files.GetFilesForProject(proj.ID, model.ContractFile) } func (r *projectResolver) ContractDeployments(_ context.Context, proj *model.Project) ([]*model.ContractDeployment, error) { - fmt.Println("projectResolver: ContractDeployments()") var deploys []*model.ContractDeployment err := r.store.GetContractDeploymentsForProject(proj.ID, &deploys) if err != nil { @@ -431,18 +426,15 @@ func (r *queryResolver) PlaygroundInfo(_ context.Context) (*model.PlaygroundInfo } func (r *queryResolver) Project(ctx context.Context, id uuid.UUID) (*model.Project, error) { - fmt.Println("queryResolver: Project()") proj, err := r.projects.Get(id) if err != nil { return nil, errors.Wrap(err, "failed to get project") } if err := r.auth.CheckProjectAccess(ctx, proj); err != nil { - fmt.Println("queryResolver: Project(): Exporting Public Immutable") return proj.ExportPublicImmutable(), nil } - fmt.Println("queryResolver: Project(): Exporting Public Mutable") return proj.ExportPublicMutable(), nil } @@ -468,14 +460,11 @@ func (r *queryResolver) Account(_ context.Context, address model.Address, projec } func (r *queryResolver) ProjectList(ctx context.Context) (*model.ProjectList, error) { - fmt.Println("ProjectList()") user, err := r.auth.GetOrCreateUser(ctx) if err != nil { - fmt.Println("ProjectList(): Failed to GetOrCreateUser()") return nil, userErr.NewAuthorizationError(err.Error()) } - fmt.Println("ProjectList(): Returning project list to query resolver") return r.projects.GetProjectListForUser(user.ID, r.auth, ctx) } diff --git a/server/server.go b/server/server.go index 04b9f356..09b9a795 100644 --- a/server/server.go +++ b/server/server.go @@ -153,8 +153,6 @@ func main() { cookieStore.Options.SameSite = http.SameSiteNoneMode } - //sessions.SetCookieStore(cookieStore) - // Create a new hub for this subroutine and bind current client and handle to scope localHub := sentry.CurrentHub().Clone() localHub.ConfigureScope(func(scope *sentry.Scope) { @@ -164,7 +162,7 @@ func main() { defer func() { err := recover() if err != nil { - fmt.Println("Server Recover: ", err) + fmt.Println("Server Recovered: ", err) localHub.Recover(err) sentry.Flush(time.Second * 5) } diff --git a/storage/sql.go b/storage/sql.go index 4cf6594e..88503655 100644 --- a/storage/sql.go +++ b/storage/sql.go @@ -272,7 +272,6 @@ func (s *SQL) GetProject(id uuid.UUID, proj *model.Project) error { } func (s *SQL) GetAllProjectsForUser(userID uuid.UUID, proj *[]*model.Project) error { - fmt.Println("SQL: GetAllProjectsForUser()") return s.db.Where(&model.Project{UserID: userID}). Order("\"updated_at\" desc"). Find(proj).Error