Skip to content

Commit

Permalink
Remove debug prints
Browse files Browse the repository at this point in the history
  • Loading branch information
DylanTinianov committed Aug 29, 2023
1 parent 503a706 commit a9db6f2
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 46 deletions.
6 changes: 0 additions & 6 deletions controller/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,13 @@ 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 {
return nil, errors.Wrap(err, "failed to get projects for user "+userID.String())
}

exportedProjects := make([]*model.Project, len(projects))
fmt.Println("GetProjectListForUser(): Exporting ", len(projects), "projects")

numImmutable := 0

Expand All @@ -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
}

Expand Down
3 changes: 0 additions & 3 deletions generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions middleware/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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())
Expand Down
16 changes: 2 additions & 14 deletions middleware/sessions/sessions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
}
Expand Down
11 changes: 0 additions & 11 deletions resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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)
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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
}

Expand All @@ -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)
}

Expand Down
4 changes: 1 addition & 3 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion storage/sql.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a9db6f2

Please sign in to comment.