From 9d7fd498a98b2bda2a0a442e66815ccebb877d8f Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Fri, 7 Sep 2018 17:59:57 +0200 Subject: [PATCH] Auth: Removed session/auth system from GraphQL API --- graphql/resolver/mutations/login.go | 26 -------------------------- graphql/resolver/mutations/logout.go | 16 ---------------- graphql/resolver/queries/session.go | 13 ------------- graphql/schema/root.graphql | 11 ----------- graphql/schema/types/session.graphql | 5 ----- 5 files changed, 71 deletions(-) delete mode 100644 graphql/resolver/mutations/login.go delete mode 100644 graphql/resolver/mutations/logout.go delete mode 100644 graphql/resolver/queries/session.go delete mode 100644 graphql/schema/types/session.graphql diff --git a/graphql/resolver/mutations/login.go b/graphql/resolver/mutations/login.go deleted file mode 100644 index 9bea911..0000000 --- a/graphql/resolver/mutations/login.go +++ /dev/null @@ -1,26 +0,0 @@ -package mutations - -import ( - "context" - - "git.aiterp.net/rpdata/api/graphql/resolver/types" - "git.aiterp.net/rpdata/api/internal/session" -) - -// LoginArgs is args for the login mutation -type LoginArgs struct { - Username string - Password string -} - -// Login resolves the login mutation -func (r *MutationResolver) Login(ctx context.Context, args *LoginArgs) (*types.SessionResolver, error) { - session := session.FromContext(ctx) - - err := session.Login(args.Username, args.Password) - if err != nil { - return nil, err - } - - return &types.SessionResolver{S: session}, nil -} diff --git a/graphql/resolver/mutations/logout.go b/graphql/resolver/mutations/logout.go deleted file mode 100644 index ed9f8ec..0000000 --- a/graphql/resolver/mutations/logout.go +++ /dev/null @@ -1,16 +0,0 @@ -package mutations - -import ( - "context" - - "git.aiterp.net/rpdata/api/graphql/resolver/types" - "git.aiterp.net/rpdata/api/internal/session" -) - -// Logout resolves mutation.logout -func (r *MutationResolver) Logout(ctx context.Context) (*types.SessionResolver, error) { - session := session.FromContext(ctx) - session.Logout() - - return &types.SessionResolver{S: session}, nil -} diff --git a/graphql/resolver/queries/session.go b/graphql/resolver/queries/session.go deleted file mode 100644 index b076131..0000000 --- a/graphql/resolver/queries/session.go +++ /dev/null @@ -1,13 +0,0 @@ -package queries - -import ( - "context" - - "git.aiterp.net/rpdata/api/graphql/resolver/types" - "git.aiterp.net/rpdata/api/internal/session" -) - -// Session resolves query.session -func (r *QueryResolver) Session(ctx context.Context) (*types.SessionResolver, error) { - return &types.SessionResolver{S: session.FromContext(ctx)}, nil -} diff --git a/graphql/schema/root.graphql b/graphql/schema/root.graphql index 0ed2761..fdd2b4a 100644 --- a/graphql/schema/root.graphql +++ b/graphql/schema/root.graphql @@ -49,10 +49,6 @@ type Query { # Find all distinct tags used in stories tags: [Tag!]! - - - # Find current session - session: Session! } # The Mutation type represents write entry points into the API. @@ -137,13 +133,6 @@ type Mutation { # Remove a chapter removeChapter(id: String!): Chapter! - - - # Log in - login(username: String!, password: String!): Session! - - # Log out - logout(): Session! } schema { diff --git a/graphql/schema/types/session.graphql b/graphql/schema/types/session.graphql deleted file mode 100644 index ea2355e..0000000 --- a/graphql/schema/types/session.graphql +++ /dev/null @@ -1,5 +0,0 @@ -# The session represents the current login state -type Session { - # The user that is logged in, null if not logged in - user: User -} \ No newline at end of file