discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

minors

Browse Source
This commit is contained in:
tonyrewin 2022-11-24 19:02:42 +03:00
parent 59640df3bc
commit 8216dd0d4e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auth/authenticate.py
View File

@ -58,7 +58,8 @@ def login_required(func):
async def wrap(parent, info: GraphQLResolveInfo, *args, **kwargs): async def wrap(parent, info: GraphQLResolveInfo, *args, **kwargs):
# print('[auth.authenticate] login required for %r with info %r' % (func, info)) # debug only # print('[auth.authenticate] login required for %r with info %r' % (func, info)) # debug only
auth: AuthCredentials = info.context["request"].auth auth: AuthCredentials = info.context["request"].auth
print('[auth.authenticate] request auth data: %r' % auth) # debug only if auth and auth.user_id:
print(auth) # debug only
if not auth.logged_in: if not auth.logged_in:
return {"error": auth.error_message or "Please login"} return {"error": auth.error_message or "Please login"}
return await func(parent, info, *args, **kwargs) return await func(parent, info, *args, **kwargs)

25
server.py
View File

@ -48,6 +48,17 @@ log_settings = {
} }
} }
local_headers = [
("Access-Control-Allow-Methods", "GET, POST, OPTIONS, HEAD"),
("Access-Control-Allow-Origin", "http://localhost:3000"),
(
"Access-Control-Allow-Headers",
"DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization",
),
("Access-Control-Expose-Headers", "Content-Length,Content-Range"),
("Access-Control-Allow-Credentials", "true"),
]
if __name__ == "__main__": if __name__ == "__main__":
x = "" x = ""
if len(sys.argv) > 1: if len(sys.argv) > 1:
@ -56,27 +67,18 @@ if __name__ == "__main__":
if os.path.exists(DEV_SERVER_STATUS_FILE_NAME): if os.path.exists(DEV_SERVER_STATUS_FILE_NAME):
os.remove(DEV_SERVER_STATUS_FILE_NAME) os.remove(DEV_SERVER_STATUS_FILE_NAME)
headers = [
("Access-Control-Allow-Methods", "GET, POST, OPTIONS, HEAD"),
("Access-Control-Allow-Origin", "http://localhost:3000"),
(
"Access-Control-Allow-Headers",
"DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization",
),
("Access-Control-Expose-Headers", "Content-Length,Content-Range"),
("Access-Control-Allow-Credentials", "true"),
]
want_reload = False want_reload = False
if "reload" in sys.argv: if "reload" in sys.argv:
print("MODE: DEV + RELOAD") print("MODE: DEV + RELOAD")
want_reload = True want_reload = True
else: else:
print("MODE: DEV") print("MODE: DEV")
uvicorn.run( uvicorn.run(
"main:dev_app", "main:dev_app",
host="localhost", host="localhost",
port=8080, port=8080,
headers=headers, headers=local_headers,
# log_config=LOGGING_CONFIG, # log_config=LOGGING_CONFIG,
log_level=None, log_level=None,
access_log=False, access_log=False,
@ -84,6 +86,7 @@ if __name__ == "__main__":
) # , ssl_keyfile="discours.key", ssl_certfile="discours.crt") ) # , ssl_keyfile="discours.key", ssl_certfile="discours.crt")
elif x == "migrate": elif x == "migrate":
from migration import migrate from migration import migrate
print("MODE: MIGRATE")
migrate() migrate()
else: else: