Fix: Replace return HTTPException with raise HTTPException and resolve indentation errors
This commit is contained in:
parent
02465f721e
commit
69f5e0465d
@ -7,6 +7,6 @@ def login_required(func):
|
|||||||
async def wrapper(self, *args, **kwargs):
|
async def wrapper(self, *args, **kwargs):
|
||||||
session = await get_session(self.request)
|
session = await get_session(self.request)
|
||||||
if 'user_email' not in session:
|
if 'user_email' not in session:
|
||||||
return web.HTTPFound('/login')
|
raise web.HTTPFound('/login')
|
||||||
return await func(self, *args, **kwargs)
|
return await func(self, *args, **kwargs)
|
||||||
return wrapper
|
return wrapper
|
||||||
|
|||||||
@ -48,8 +48,7 @@ class LoginView(CustomPydanticView):
|
|||||||
if user_service.authenticate_user(login_data.email, login_data.password):
|
if user_service.authenticate_user(login_data.email, login_data.password):
|
||||||
session = await new_session(self.request)
|
session = await new_session(self.request)
|
||||||
session["user_email"] = login_data.email
|
session["user_email"] = login_data.email
|
||||||
return web.HTTPFound("/dashboard")
|
raise web.HTTPFound("/dashboard")
|
||||||
|
|
||||||
return aiohttp_jinja2.render_template(
|
return aiohttp_jinja2.render_template(
|
||||||
self.template_name,
|
self.template_name,
|
||||||
self.request,
|
self.request,
|
||||||
@ -85,6 +84,7 @@ class RegistrationView(CustomPydanticView):
|
|||||||
user_service: UserService = self.request.app["user_service"]
|
user_service: UserService = self.request.app["user_service"]
|
||||||
try:
|
try:
|
||||||
user_service.create_user(user_data.full_name, user_data.email, user_data.password) # Changed username to full_name
|
user_service.create_user(user_data.full_name, user_data.email, user_data.password) # Changed username to full_name
|
||||||
|
raise web.HTTPFound("/login")
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return aiohttp_jinja2.render_template(
|
return aiohttp_jinja2.render_template(
|
||||||
self.template_name,
|
self.template_name,
|
||||||
@ -97,11 +97,8 @@ class RegistrationView(CustomPydanticView):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
return web.HTTPFound("/login")
|
|
||||||
|
|
||||||
|
|
||||||
class LogoutView(web.View):
|
class LogoutView(web.View):
|
||||||
async def get(self):
|
async def get(self):
|
||||||
session = await get_session(self.request)
|
session = await get_session(self.request)
|
||||||
session.clear()
|
session.clear()
|
||||||
return web.HTTPFound("/")
|
raise web.HTTPFound("/")
|
||||||
|
|||||||
@ -66,5 +66,4 @@ class OrderView(CustomPydanticView):
|
|||||||
user_email = session.get("user_email")
|
user_email = session.get("user_email")
|
||||||
user_service: UserService = self.request.app["user_service"]
|
user_service: UserService = self.request.app["user_service"]
|
||||||
user_service.update_user_quota(user_email, quota_data.storage_amount)
|
user_service.update_user_quota(user_email, quota_data.storage_amount)
|
||||||
|
raise web.HTTPFound("/dashboard")
|
||||||
return web.HTTPFound("/dashboard")
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user