From 5ba239caa8928a078362af0e6e2d1a4626bd508d Mon Sep 17 00:00:00 2001 From: retoor <retoor@molodetz.nl> Date: Thu, 20 Mar 2025 02:12:00 +0100 Subject: [PATCH] Changes by r. --- src/snek/view/login.py | 2 +- src/snek/view/register.py | 10 ++++++---- src/snek/view/register_form.py | 23 ++++++++++++----------- src/snek/view/status.py | 5 ++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/snek/view/login.py b/src/snek/view/login.py index 6d6d6ad..5028a7a 100644 --- a/src/snek/view/login.py +++ b/src/snek/view/login.py @@ -31,4 +31,4 @@ class LoginView(BaseFormView): "color": user["color"] }) return {"redirect_url": "/web.html"} - return {"is_valid": False} + return {"is_valid": False} \ No newline at end of file diff --git a/src/snek/view/register.py b/src/snek/view/register.py index db812b5..6e49506 100644 --- a/src/snek/view/register.py +++ b/src/snek/view/register.py @@ -24,8 +24,10 @@ class RegisterView(BaseFormView): result = await self.app.services.user.register( form.email.value, form.username.value, form.password.value ) - self.request.session["uid"] = result["uid"] - self.request.session["username"] = result["username"] - self.request.session["logged_in"] = True - self.request.session["color"] = result["color"] + self.request.session.update({ + "uid": result["uid"], + "username": result["username"], + "logged_in": True, + "color": result["color"] + }) return {"redirect_url": "/web.html"} \ No newline at end of file diff --git a/src/snek/view/register_form.py b/src/snek/view/register_form.py index 858edad..5ce42a7 100644 --- a/src/snek/view/register_form.py +++ b/src/snek/view/register_form.py @@ -14,21 +14,20 @@ # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. from snek.form.register import RegisterForm from snek.system.view import BaseFormView - class RegisterFormView(BaseFormView): form = RegisterForm @@ -36,8 +35,10 @@ class RegisterFormView(BaseFormView): result = await self.app.services.user.register( form.email.value, form.username.value, form.password.value ) - self.request.session["uid"] = result["uid"] - self.request.session["username"] = result["username"] - self.request.session["logged_in"] = True - + self.request.session.update({ + "uid": result["uid"], + "username": result["username"], + "logged_in": True, + "color": result["color"] + }) return {"redirect_url": "/web.html"} \ No newline at end of file diff --git a/src/snek/view/status.py b/src/snek/view/status.py index 9428f08..117942a 100644 --- a/src/snek/view/status.py +++ b/src/snek/view/status.py @@ -19,11 +19,10 @@ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, # INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A # PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF +# CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - from snek.system.view import BaseView class StatusView(BaseView):