A lot of delete and failed scream tests.

graph2/resolvers/file.go

@@ -2,48 +2,21 @@ package resolvers
 
 import (
 	"context"
-
-	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/files"
 )
 
 func (r *queryResolver) File(ctx context.Context, id string) (*models.File, error) {
-	file, err := files.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &file, nil
+	return r.s.Files.Find(ctx, id)
 }
 
-func (r *queryResolver) Files(ctx context.Context, filter *files.Filter) ([]*models.File, error) {
-	token := auth.TokenFromContext(ctx)
-
+func (r *queryResolver) Files(ctx context.Context, filter *models.FileFilter) ([]*models.File, error) {
 	if filter == nil {
-		filter = &files.Filter{}
-	}
+		public := true
 
-	// Only allow users to view public files that are not their own.
-	if token != nil {
-		if filter.Public == nil || *filter.Public == false {
-			filter.Author = &token.UserID
+		filter = &models.FileFilter{
+			Public: &public,
 		}
-	} else {
-		filter.Public = &trueValue
 	}
 
-	files, err := files.List(filter)
-	if err != nil {
-		return nil, err
-	}
-
-	files2 := make([]*models.File, len(files))
-	for i := range files {
-		files2[i] = &files[i]
-	}
-
-	return files2, nil
+	return r.s.Files.List(ctx, *filter)
 }
-
-var trueValue = true

graph2/resolvers/token.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"errors"
 
-	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/models"
 )
 
 func (r *queryResolver) Token(ctx context.Context) (*models.Token, error) {
-	token := auth.TokenFromContext(ctx)
+	token := r.s.Auth.TokenFromContext(ctx)
 	if !token.Authenticated() {
-		return nil, errors.New("No (valid) token")
+		return nil, errors.New("no (valid) token")
 	}
 
 	return token, nil