From 83e73376ad141fa9ded7ef163b38ce790b1b3a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 23 Feb 2017 12:04:33 +0100 Subject: [PATCH] Change CofProfile to Profile in kfet/backends.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - K-Fêt accounts are now linked to profiles - There is no need to perform the `get_or_create` as long as the profile creation has been automated. - This file is now PEP8 compliant --- kfet/backends.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kfet/backends.py b/kfet/backends.py index d0dcc5f6..56d85b81 100644 --- a/kfet/backends.py +++ b/kfet/backends.py @@ -1,15 +1,11 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, - print_function, unicode_literals) -from builtins import * - import hashlib from django.contrib.auth.models import User, Permission -from cof.models import CofProfile from kfet.models import Account, GenericTeamToken + class KFetBackend(object): def authenticate(self, request): password = request.POST.get('KFETPASSWORD', '') @@ -17,8 +13,8 @@ class KFetBackend(object): if not password: return None + password_sha256 = hashlib.sha256(password.encode('utf-8')).hexdigest() try: - password_sha256 = hashlib.sha256(password.encode('utf-8')).hexdigest() account = Account.objects.get(password=password_sha256) user = account.profile.user except Account.DoesNotExist: @@ -26,16 +22,20 @@ class KFetBackend(object): return user + class GenericTeamBackend(object): + """ + Authenticate using the generic_team user. + """ def authenticate(self, username=None, token=None): valid_token = GenericTeamToken.objects.get(token=token) if username == 'kfet_genericteam' and valid_token: # Création du user s'il n'existe pas déjà user, _ = User.objects.get_or_create(username='kfet_genericteam') - profile, _ = CofProfile.objects.get_or_create(user=user) account, _ = Account.objects.get_or_create( - profile=profile, - trigramme='GNR') + profile=user.profile, + trigramme='GNR' + ) # Ajoute la permission kfet.is_team à ce user perm_is_team = Permission.objects.get(codename='is_team')