auth: Replaced old system with api key-based system.

graphql/resolver/mutations/addChannel.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/channel"
 )
@@ -24,8 +24,8 @@ type ChannelAddArgs struct {
 func (r *MutationResolver) AddChannel(ctx context.Context, args *ChannelAddArgs) (*types.ChannelResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("channel.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("channel.add") {
 		return nil, ErrUnauthorized
 	}
 
@@ -48,7 +48,7 @@ func (r *MutationResolver) AddChannel(ctx context.Context, args *ChannelAddArgs)
 		return nil, err
 	}
 
-	go change.Submit("Channel", "add", user.ID, channel.Name, map[string]interface{}{
+	go change.Submit("Channel", "add", token.UserID, channel.Name, map[string]interface{}{
 		"logged":   channel.Logged,
 		"hub":      channel.Hub,
 		"location": input.LocationName,

graphql/resolver/mutations/addChapter.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -25,8 +25,8 @@ type AddChapterArgs struct {
 func (r *MutationResolver) AddChapter(ctx context.Context, args *AddChapterArgs) (*types.ChapterResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "chapter.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "chapter.add") {
 		return nil, ErrUnauthorized
 	}
 
@@ -35,11 +35,11 @@ func (r *MutationResolver) AddChapter(ctx context.Context, args *AddChapterArgs)
 		return nil, err
 	}
 
-	author := user.ID
+	author := token.UserID
 	if input.Author != nil {
 		author = *input.Author
 
-		if user.ID != author && !user.Permitted("chapter.add") {
+		if token.UserID != author && !token.Permitted("chapter.add") {
 			return nil, ErrPermissionDenied
 		}
 	}
@@ -57,7 +57,7 @@ func (r *MutationResolver) AddChapter(ctx context.Context, args *AddChapterArgs)
 		return nil, err
 	}
 
-	go change.Submit("Chapter", "add", user.ID, chapter.ID, map[string]interface{}{
+	go change.Submit("Chapter", "add", token.UserID, chapter.ID, map[string]interface{}{
 		"title":         input.Title,
 		"author":        author,
 		"fictionalDate": fictionalDate,

graphql/resolver/mutations/addCharacter.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/character"
 	"git.aiterp.net/rpdata/api/model/log"
@@ -23,8 +23,8 @@ type AddCharacterInput struct {
 // AddCharacter resolves the addCharacter mutation
 func (r *MutationResolver) AddCharacter(ctx context.Context, args struct{ Input *AddCharacterInput }) (*types.CharacterResolver, error) {
 	input := args.Input
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "character.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "character.add") {
 		return nil, ErrUnauthorized
 	}
 
@@ -39,11 +39,11 @@ func (r *MutationResolver) AddCharacter(ctx context.Context, args struct{ Input
 		shortName = strings.SplitN(input.Name, " ", 2)[0]
 	}
 
-	author := user.ID
+	author := token.UserID
 	if input.Author != nil {
 		author = *input.Author
 
-		if author != user.ID && !user.Permitted("character.add") {
+		if author != token.UserID && !token.Permitted("character.add") {
 			return nil, ErrPermissionDenied
 		}
 	}
@@ -58,7 +58,7 @@ func (r *MutationResolver) AddCharacter(ctx context.Context, args struct{ Input
 		return nil, err
 	}
 
-	go change.Submit("Character", "add", user.ID, character.ID, map[string]interface{}{
+	go change.Submit("Character", "add", token.UserID, character.ID, map[string]interface{}{
 		"name":   character.Name,
 		"nick":   character.Nicks[0],
 		"author": character.Author,

graphql/resolver/mutations/addCharacterNick.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/character"
 	"git.aiterp.net/rpdata/api/model/log"
@@ -20,8 +20,8 @@ type AddCharacterNickInput struct {
 func (r *MutationResolver) AddCharacterNick(ctx context.Context, args struct{ Input *AddCharacterNickInput }) (*types.CharacterResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -29,7 +29,7 @@ func (r *MutationResolver) AddCharacterNick(ctx context.Context, args struct{ In
 	if err != nil {
 		return nil, err
 	}
-	if character.Author != user.ID && !user.Permitted("character.edit") {
+	if character.Author != token.UserID && !token.Permitted("character.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -38,7 +38,7 @@ func (r *MutationResolver) AddCharacterNick(ctx context.Context, args struct{ In
 		return nil, err
 	}
 
-	go change.Submit("Character", "add.nick", user.ID, character.ID, map[string]interface{}{
+	go change.Submit("Character", "add.nick", token.UserID, character.ID, map[string]interface{}{
 		"nick": input.Nick,
 	})
 

graphql/resolver/mutations/addLog.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -26,8 +26,8 @@ type LogAddArgs struct {
 func (r *MutationResolver) AddLog(ctx context.Context, args *LogAddArgs) (*types.LogResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("log.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("log.add") {
 		return nil, ErrUnauthorized
 	}
 
@@ -58,7 +58,7 @@ func (r *MutationResolver) AddLog(ctx context.Context, args *LogAddArgs) (*types
 		return nil, err
 	}
 
-	go change.Submit("Log", "add", user.ID, log.ID, map[string]interface{}{
+	go change.Submit("Log", "add", token.UserID, log.ID, map[string]interface{}{
 		"channel":     log.Channel,
 		"title":       log.Title,
 		"event":       log.Event,

graphql/resolver/mutations/addPost.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -25,8 +25,8 @@ type PostAddArgs struct {
 func (r *MutationResolver) AddPost(ctx context.Context, args *PostAddArgs) (*types.PostResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("post.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("post.add") {
 		return nil, ErrUnauthorized
 	}
 
@@ -45,7 +45,7 @@ func (r *MutationResolver) AddPost(ctx context.Context, args *PostAddArgs) (*typ
 		return nil, err
 	}
 
-	go change.Submit("Post", "add", user.ID, post.ID, map[string]interface{}{
+	go change.Submit("Post", "add", token.UserID, post.ID, map[string]interface{}{
 		"logId":    post.LogID,
 		"time":     post.Time,
 		"kind":     post.Kind,

graphql/resolver/mutations/addStory.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -30,16 +30,16 @@ type StoryAddArgs struct {
 func (r *MutationResolver) AddStory(ctx context.Context, args *StoryAddArgs) (*types.StoryResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "story.add") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "story.add") {
 		return nil, ErrUnauthorized
 	}
 
-	author := user.ID
+	author := token.UserID
 	if input.Author != nil {
 		author = *input.Author
 
-		if user.ID != author && !user.Permitted("story.add") {
+		if token.UserID != author && !token.Permitted("story.add") {
 			return nil, ErrPermissionDenied
 		}
 	}
@@ -73,7 +73,7 @@ func (r *MutationResolver) AddStory(ctx context.Context, args *StoryAddArgs) (*t
 		return nil, err
 	}
 
-	go change.Submit("Story", "add", user.ID, story.ID, map[string]interface{}{
+	go change.Submit("Story", "add", token.UserID, story.ID, map[string]interface{}{
 		"name":     input.Name,
 		"category": input.Category,
 		"author":   input.Author,

graphql/resolver/mutations/addStoryTag.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -25,8 +25,8 @@ func (r *MutationResolver) AddStoryTag(ctx context.Context, args *StoryTagAddArg
 	input := args.Input
 	tag := story.Tag{Kind: input.Tag.Kind, Name: input.Tag.Name}
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "story.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "story.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -35,7 +35,7 @@ func (r *MutationResolver) AddStoryTag(ctx context.Context, args *StoryTagAddArg
 		return nil, err
 	}
 
-	if story.Author != user.ID && !user.Permitted("story.edit") {
+	if story.Author != token.UserID && !token.Permitted("story.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -44,7 +44,7 @@ func (r *MutationResolver) AddStoryTag(ctx context.Context, args *StoryTagAddArg
 		return nil, err
 	}
 
-	go change.Submit("Story", "add.tag", user.ID, story.ID, map[string]interface{}{
+	go change.Submit("Story", "add.tag", token.UserID, story.ID, map[string]interface{}{
 		"kind": tag.Kind,
 		"name": tag.Name,
 	})

graphql/resolver/mutations/editChannel.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/channel"
 )
@@ -24,8 +24,8 @@ type ChannelEditArgs struct {
 func (r *MutationResolver) EditChannel(ctx context.Context, args *ChannelEditArgs) (*types.ChannelResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("channel.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("channel.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -39,7 +39,7 @@ func (r *MutationResolver) EditChannel(ctx context.Context, args *ChannelEditArg
 		return nil, err
 	}
 
-	go change.Submit("Channel", "edit", user.ID, channel.Name, map[string]interface{}{
+	go change.Submit("Channel", "edit", token.UserID, channel.Name, map[string]interface{}{
 		"logged":   input.Logged,
 		"hub":      input.Hub,
 		"location": input.LocationName,

graphql/resolver/mutations/editChapter.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -24,8 +24,8 @@ type EditChapterArgs struct {
 func (r *MutationResolver) EditChapter(ctx context.Context, args *EditChapterArgs) (*types.ChapterResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "chapter.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "chapter.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -34,7 +34,7 @@ func (r *MutationResolver) EditChapter(ctx context.Context, args *EditChapterArg
 		return nil, err
 	}
 
-	if chapter.Author != user.ID && !user.Permitted("chapter.edit") {
+	if chapter.Author != token.UserID && !token.Permitted("chapter.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -53,7 +53,7 @@ func (r *MutationResolver) EditChapter(ctx context.Context, args *EditChapterArg
 		return nil, err
 	}
 
-	go change.Submit("Chapter", "edit", user.ID, chapter.ID, map[string]interface{}{
+	go change.Submit("Chapter", "edit", token.UserID, chapter.ID, map[string]interface{}{
 		"title":         input.Title,
 		"source":        input.Source,
 		"fictionalDate": fictionalDate,

graphql/resolver/mutations/editCharacter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/character"
 )
@@ -21,8 +21,8 @@ type CharacterEditInput struct {
 func (r *MutationResolver) EditCharacter(ctx context.Context, args struct{ Input *CharacterEditInput }) (*types.CharacterResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -30,7 +30,7 @@ func (r *MutationResolver) EditCharacter(ctx context.Context, args struct{ Input
 	if err != nil {
 		return nil, err
 	}
-	if character.Author != user.ID && !user.Permitted("character.edit") {
+	if character.Author != token.UserID && !token.Permitted("character.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -54,7 +54,7 @@ func (r *MutationResolver) EditCharacter(ctx context.Context, args struct{ Input
 		return nil, err
 	}
 
-	go change.Submit("Character", "edit", user.ID, character.ID, map[string]interface{}{
+	go change.Submit("Character", "edit", token.UserID, character.ID, map[string]interface{}{
 		"name":        character.Name,
 		"shortName":   character.ShortName,
 		"description": character.Description,

graphql/resolver/mutations/editFile.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/file"
 )
 
@@ -21,8 +21,8 @@ type FileEditArgs struct {
 func (r *MutationResolver) EditFile(ctx context.Context, args *FileEditArgs) (*types.FileResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -30,7 +30,7 @@ func (r *MutationResolver) EditFile(ctx context.Context, args *FileEditArgs) (*t
 	if err != nil {
 		return nil, err
 	}
-	if file.Author != user.ID && !user.Permitted("file.edit") {
+	if file.Author != token.UserID && !token.Permitted("file.edit") {
 		return nil, ErrUnauthorized
 	}
 

graphql/resolver/mutations/editLog.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -24,8 +24,8 @@ type LogEditArgs struct {
 func (r *MutationResolver) EditLog(ctx context.Context, args *LogEditArgs) (*types.LogResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("log.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("log.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -39,7 +39,7 @@ func (r *MutationResolver) EditLog(ctx context.Context, args *LogEditArgs) (*typ
 		return nil, err
 	}
 
-	go change.Submit("Log", "edit", user.ID, log.ID, map[string]interface{}{
+	go change.Submit("Log", "edit", token.UserID, log.ID, map[string]interface{}{
 		"channel":     log.Channel,
 		"title":       input.Title,
 		"event":       input.Event,

graphql/resolver/mutations/editPost.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -25,8 +25,8 @@ type PostEditArgs struct {
 func (r *MutationResolver) EditPost(ctx context.Context, args *PostEditArgs) (*types.PostResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("post.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("post.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -50,7 +50,7 @@ func (r *MutationResolver) EditPost(ctx context.Context, args *PostEditArgs) (*t
 		return nil, err
 	}
 
-	go change.Submit("Post", "edit", user.ID, post.ID, map[string]interface{}{
+	go change.Submit("Post", "edit", token.UserID, post.ID, map[string]interface{}{
 		"time": postTime,
 		"kind": input.Kind,
 		"nick": input.Nick,

graphql/resolver/mutations/editStory.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -27,8 +27,8 @@ type StoryEditArgs struct {
 func (r *MutationResolver) EditStory(ctx context.Context, args *StoryEditArgs) (*types.StoryResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "story.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "story.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -37,7 +37,7 @@ func (r *MutationResolver) EditStory(ctx context.Context, args *StoryEditArgs) (
 		return nil, err
 	}
 
-	if story.Author != user.ID && !user.Permitted("story.edit") {
+	if story.Author != token.UserID && !token.Permitted("story.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -56,7 +56,7 @@ func (r *MutationResolver) EditStory(ctx context.Context, args *StoryEditArgs) (
 		return nil, err
 	}
 
-	go change.Submit("Story", "edit", user.ID, story.ID, map[string]interface{}{
+	go change.Submit("Story", "edit", token.UserID, story.ID, map[string]interface{}{
 		"name":          input.Name,
 		"category":      input.Category,
 		"author":        input.Author,

graphql/resolver/mutations/movePost.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -21,8 +21,8 @@ type PostMoveArgs struct {
 func (r *MutationResolver) MovePost(ctx context.Context, args *PostMoveArgs) (*types.PostResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("post.move") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("post.move") {
 		return nil, ErrUnauthorized
 	}
 
@@ -36,7 +36,7 @@ func (r *MutationResolver) MovePost(ctx context.Context, args *PostMoveArgs) (*t
 		return nil, err
 	}
 
-	go change.Submit("Post", "move", user.ID, post.ID, map[string]interface{}{
+	go change.Submit("Post", "move", token.UserID, post.ID, map[string]interface{}{
 		"logId":       post.LogID,
 		"targetIndex": input.ToPosition,
 	})

graphql/resolver/mutations/removeChannel.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/channel"
 )
@@ -16,8 +16,8 @@ type RemoveChannelArgs struct {
 
 // RemoveChannel resolves the editChannel mutation
 func (r *MutationResolver) RemoveChannel(ctx context.Context, args RemoveChannelArgs) (*types.ChannelResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("channel.remove") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("channel.remove") {
 		return nil, ErrUnauthorized
 	}
 
@@ -31,7 +31,7 @@ func (r *MutationResolver) RemoveChannel(ctx context.Context, args RemoveChannel
 		return nil, err
 	}
 
-	go change.Submit("Channel", "remove", user.ID, channel.Name, nil)
+	go change.Submit("Channel", "remove", token.UserID, channel.Name, nil)
 
 	return &types.ChannelResolver{C: channel}, nil
 }

graphql/resolver/mutations/removeChapter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -16,8 +16,8 @@ type RemoveChapterArgs struct {
 
 // RemoveChapter resolves the removeChapter mutation
 func (r *MutationResolver) RemoveChapter(ctx context.Context, args *RemoveChapterArgs) (*types.ChapterResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "chapter.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "chapter.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -31,7 +31,7 @@ func (r *MutationResolver) RemoveChapter(ctx context.Context, args *RemoveChapte
 		return nil, err
 	}
 
-	go change.Submit("Chapter", "remove", user.ID, chapter.ID, nil)
+	go change.Submit("Chapter", "remove", token.UserID, chapter.ID, nil)
 
 	return &types.ChapterResolver{C: chapter}, nil
 }

graphql/resolver/mutations/removeCharacter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/character"
 )
@@ -16,8 +16,8 @@ type RemoveCharacterArgs struct {
 
 // RemoveCharacter resolves the removeCharacter mutation
 func (r *MutationResolver) RemoveCharacter(ctx context.Context, args RemoveCharacterArgs) (*types.CharacterResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -25,7 +25,7 @@ func (r *MutationResolver) RemoveCharacter(ctx context.Context, args RemoveChara
 	if err != nil {
 		return nil, err
 	}
-	if character.Author != user.ID && !user.Permitted("character.remove") {
+	if character.Author != token.UserID && !token.Permitted("character.remove") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -34,7 +34,7 @@ func (r *MutationResolver) RemoveCharacter(ctx context.Context, args RemoveChara
 		return nil, err
 	}
 
-	go change.Submit("Character", "remove", user.ID, character.ID, map[string]interface{}{
+	go change.Submit("Character", "remove", token.UserID, character.ID, map[string]interface{}{
 		"name":   character.Name,
 		"author": character.Author,
 		"nicks":  character.Nicks,

graphql/resolver/mutations/removeCharacterNick.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/character"
 	"git.aiterp.net/rpdata/api/model/log"
@@ -20,8 +20,8 @@ type RemoveCharacterNick struct {
 func (r *MutationResolver) RemoveCharacterNick(ctx context.Context, args struct{ Input *RemoveCharacterNick }) (*types.CharacterResolver, error) {
 	input := args.Input
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -29,7 +29,7 @@ func (r *MutationResolver) RemoveCharacterNick(ctx context.Context, args struct{
 	if err != nil {
 		return nil, err
 	}
-	if character.Author != user.ID && !user.Permitted("character.edit") {
+	if character.Author != token.UserID && !token.Permitted("character.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -38,7 +38,7 @@ func (r *MutationResolver) RemoveCharacterNick(ctx context.Context, args struct{
 		return nil, err
 	}
 
-	go change.Submit("Character", "remove.nick", user.ID, character.ID, map[string]interface{}{
+	go change.Submit("Character", "remove.nick", token.UserID, character.ID, map[string]interface{}{
 		"nick": input.Nick,
 	})
 

graphql/resolver/mutations/removeFile.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/file"
 )
 
@@ -15,8 +15,8 @@ type RemoveFileArgs struct {
 
 // RemoveFile resolves the removeFIle mutation
 func (r *MutationResolver) RemoveFile(ctx context.Context, args *RemoveFileArgs) (*types.FileResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member") {
 		return nil, ErrUnauthorized
 	}
 
@@ -24,7 +24,7 @@ func (r *MutationResolver) RemoveFile(ctx context.Context, args *RemoveFileArgs)
 	if err != nil {
 		return nil, err
 	}
-	if file.Author != user.ID && !user.Permitted("file.remove") {
+	if file.Author != token.UserID && !token.Permitted("file.remove") {
 		return nil, ErrUnauthorized
 	}
 

graphql/resolver/mutations/removeLog.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -16,8 +16,8 @@ type RemoveLogArgs struct {
 
 // RemoveLog resolves the removeLog mutation
 func (r *MutationResolver) RemoveLog(ctx context.Context, args *RemoveLogArgs) (*types.LogResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("log.remove") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("log.remove") {
 		return nil, ErrUnauthorized
 	}
 
@@ -31,7 +31,7 @@ func (r *MutationResolver) RemoveLog(ctx context.Context, args *RemoveLogArgs) (
 		return nil, err
 	}
 
-	go change.Submit("Log", "remove", user.ID, log.ID, nil)
+	go change.Submit("Log", "remove", token.UserID, log.ID, nil)
 
 	return &types.LogResolver{L: log}, nil
 }

graphql/resolver/mutations/removePost.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/log"
 )
@@ -16,8 +16,8 @@ type PostRemoveArgs struct {
 
 // RemovePost resolves the removePost mutation
 func (r *MutationResolver) RemovePost(ctx context.Context, args PostRemoveArgs) (*types.PostResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("post.remove") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("post.remove") {
 		return nil, ErrUnauthorized
 	}
 
@@ -26,7 +26,7 @@ func (r *MutationResolver) RemovePost(ctx context.Context, args PostRemoveArgs)
 		return nil, err
 	}
 
-	go change.Submit("Post", "remove", user.ID, post.ID, map[string]interface{}{
+	go change.Submit("Post", "remove", token.UserID, post.ID, map[string]interface{}{
 		"logId": post.LogID,
 	})
 

graphql/resolver/mutations/removeStory.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -16,8 +16,8 @@ type StoryRemoveArgs struct {
 
 // RemoveStory resolves the removeStory mutation
 func (r *MutationResolver) RemoveStory(ctx context.Context, args *StoryRemoveArgs) (*types.StoryResolver, error) {
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "story.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "story.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -26,7 +26,7 @@ func (r *MutationResolver) RemoveStory(ctx context.Context, args *StoryRemoveArg
 		return nil, err
 	}
 
-	if story.Author != user.ID && !user.Permitted("story.remove") {
+	if story.Author != token.UserID && !token.Permitted("story.remove") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -35,7 +35,7 @@ func (r *MutationResolver) RemoveStory(ctx context.Context, args *StoryRemoveArg
 		return nil, err
 	}
 
-	go change.Submit("Story", "remove", user.ID, story.ID, nil)
+	go change.Submit("Story", "remove", token.UserID, story.ID, nil)
 
 	return &types.StoryResolver{S: story}, nil
 }

graphql/resolver/mutations/removeStoryTag.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/change"
 	"git.aiterp.net/rpdata/api/model/story"
 )
@@ -25,8 +25,8 @@ func (r *MutationResolver) RemoveStoryTag(ctx context.Context, args *StoryTagRem
 	input := args.Input
 	tag := story.Tag{Kind: input.Tag.Kind, Name: input.Tag.Name}
 
-	user := session.FromContext(ctx).User()
-	if user == nil || !user.Permitted("member", "story.edit") {
+	token := auth.TokenFromContext(ctx)
+	if !token.Permitted("member", "story.edit") {
 		return nil, ErrUnauthorized
 	}
 
@@ -35,7 +35,7 @@ func (r *MutationResolver) RemoveStoryTag(ctx context.Context, args *StoryTagRem
 		return nil, err
 	}
 
-	if story.Author != user.ID && !user.Permitted("story.edit") {
+	if story.Author != token.UserID && !token.Permitted("story.edit") {
 		return nil, ErrPermissionDenied
 	}
 
@@ -44,7 +44,7 @@ func (r *MutationResolver) RemoveStoryTag(ctx context.Context, args *StoryTagRem
 		return nil, err
 	}
 
-	go change.Submit("Story", "remove.tag", user.ID, story.ID, map[string]interface{}{
+	go change.Submit("Story", "remove.tag", token.UserID, story.ID, map[string]interface{}{
 		"kind": tag.Kind,
 		"name": tag.Name,
 	})

graphql/resolver/queries/files.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/file"
 )
 
@@ -19,11 +19,11 @@ type FilesArgs struct {
 // Files resolves the file query
 func (r *QueryResolver) Files(ctx context.Context, args *FilesArgs) ([]*types.FileResolver, error) {
 	filter := args.Filter
-	user := session.FromContext(ctx).User()
+	token := auth.TokenFromContext(ctx)
 
 	author := ""
-	if user != nil {
-		author = user.ID
+	if token != nil {
+		author = token.UserID
 	}
 
 	mimeTypes := []string(nil)

graphql/resolver/queries/stories.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.aiterp.net/rpdata/api/graphql/resolver/types"
-	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/model/story"
 )
 
@@ -30,6 +30,8 @@ type StoriesArg struct {
 func (r *QueryResolver) Stories(ctx context.Context, args *StoriesArg) ([]*types.StoryResolver, error) {
 	var err error
 
+	token := auth.TokenFromContext(ctx)
+
 	filter := args.Filter
 
 	author := ""
@@ -79,16 +81,15 @@ func (r *QueryResolver) Stories(ctx context.Context, args *StoriesArg) ([]*types
 
 		unlisted = filter.Unlisted != nil && *filter.Unlisted == true
 		if unlisted {
-			user := session.FromContext(ctx).User()
-			if user == nil {
+			if token == nil {
 				return nil, ErrUnauthorized
 			}
 
-			if author != "" && author != user.ID && !user.Permitted("story.unlisted") {
+			if author != "" && author != token.UserID && !token.Permitted("story.unlisted") {
 				return nil, ErrPermissionDenied
 			}
 
-			author = user.ID
+			author = token.UserID
 		}
 
 		open = filter.Open

graphql/resolver/types/session.go

@@ -1,16 +0,0 @@
-package types
-
-import "git.aiterp.net/rpdata/api/internal/session"
-
-// SessionResolver resolves Session
-type SessionResolver struct{ S *session.Session }
-
-// User resolves Session.user
-func (r *SessionResolver) User() *UserResolver {
-	user := r.S.User()
-	if user == nil {
-		return nil
-	}
-
-	return &UserResolver{U: user}
-}

graphql/resolver/types/user.go

@@ -1,16 +0,0 @@
-package types
-
-import "git.aiterp.net/rpdata/api/internal/session"
-
-// UserResolver resulves the user type
-type UserResolver struct{ U *session.User }
-
-// ID resolves User.id
-func (r *UserResolver) ID() string {
-	return r.U.ID
-}
-
-// Permissions resolves User.permissions
-func (r *UserResolver) Permissions() []string {
-	return r.U.Permissions
-}