From 5f72b04ef8e84b1c367ca6874519706318e351f5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 19 Jun 2020 00:35:56 +0100 Subject: Use ErrNotAuthenticated --- graphql/graphqlidentity/graphqlidentity.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'graphql/graphqlidentity/graphqlidentity.go') diff --git a/graphql/graphqlidentity/graphqlidentity.go b/graphql/graphqlidentity/graphqlidentity.go index 6851c4a8..36b496f3 100644 --- a/graphql/graphqlidentity/graphqlidentity.go +++ b/graphql/graphqlidentity/graphqlidentity.go @@ -18,22 +18,24 @@ func AttachToContext(ctx context.Context, u *identity.Identity) context.Context return context.WithValue(ctx, identityCtxKey, u.Id()) } -// ForContext retrieves an IdentityCache from the context, or nil if no identity is present. +// ForContext retrieves an IdentityCache from the context. +// If there is no identity in the context, ErrNotAuthenticated is returned. // If an error occurs while resolving the identity (e.g. I/O error), then it will be returned. func ForContext(ctx context.Context, r *cache.RepoCache) (*cache.IdentityCache, error) { id, ok := ctx.Value(identityCtxKey).(entity.Id) if !ok { - return nil, nil + return nil, ErrNotAuthenticated } return r.ResolveIdentity(id) } -// ForContextUncached retrieves an Identity from the context, or nil if no identity is present. +// ForContextUncached retrieves an Identity from the context. +// If there is no identity in the context, ErrNotAuthenticated is returned. // If an error occurs while resolving the identity (e.g. I/O error), then it will be returned. func ForContextUncached(ctx context.Context, repo repository.Repo) (*identity.Identity, error) { id, ok := ctx.Value(identityCtxKey).(entity.Id) if !ok { - return nil, nil + return nil, ErrNotAuthenticated } return identity.ReadLocal(repo, id) } -- cgit