authfixes

This commit is contained in:
tonyrewin 2022-08-12 11:13:18 +03:00
parent f13f40c89a
commit 0873304068
2 changed files with 102 additions and 100 deletions

View File

@ -1,3 +1,4 @@
from datetime import datetime
from orm.user import User, UserRole, Role, UserRating, AuthorFollower
from services.auth.users import UserStorage
from orm.shout import Shout
@ -59,7 +60,7 @@ async def user_followers(_, slug) -> List[User]:
all()
return users
# for query.field("getCurrentUser")
# for query.field("refreshSession")
async def get_user_info(slug):
return {
"inbox": await get_inbox_counter(slug),
@ -70,10 +71,14 @@ async def get_user_info(slug):
}
@query.field("getCurrentUser")
@query.field("refreshSession")
@login_required
async def get_current_user(_, info):
user = info.context["request"].user
with local_session() as session:
user.lastSeen = datetime.now()
user.save()
session.commit()
return {
"user": user,
"info": await get_user_info(user.slug)

View File

@ -140,10 +140,10 @@ type Mutation {
# auth
confirmEmail(token: String!): AuthResult!
refreshSession: AuthResult!
registerUser(email: String!, password: String): AuthResult!
requestPasswordUpdate(email: String!): Result!
updatePassword(password: String!, token: String!): Result!
# requestEmailConfirmation: User!
# shout
createShout(input: ShoutInput!): Result!
@ -203,10 +203,6 @@ type Query {
isEmailUsed(email: String!): Boolean!
signIn(email: String!, password: String): AuthResult!
signOut: AuthResult!
forget(email: String!): AuthResult!
requestPasswordReset(email: String!): AuthResult!
updatePassword(password: String!, token: String!): AuthResult!
getCurrentUser: AuthResult!
# profile
getUsersBySlugs(slugs: [String]!): [User]!
@ -312,6 +308,7 @@ type User {
id: Int!
username: String! # to login, ex. email
createdAt: DateTime!
lastSeen: DataTime
slug: String!
name: String # to display
email: String