From d4871feb8d0b7ebce692c463d0c940c92a93fdc1 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Fri, 14 Feb 2020 05:19:59 +0000 Subject: [PATCH] Allow users not yet in LDAP to claim old portal accounts --- apiserver/apiserver/api/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index 25db660..a3b0e29 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -232,14 +232,14 @@ def link_old_member(data, user): if utils_ldap.is_configured(): result = utils_ldap.find_user(user.username) if result == 200: - pass + if utils_ldap.set_password(data) != 200: + raise ValidationError(dict(non_field_errors='Problem connecting to LDAP server: set.')) elif result == 404: - raise ValidationError(dict(username='Unable to find username in old portal.')) + if utils_ldap.create_user(data) != 200: + raise ValidationError(dict(non_field_errors='Problem connecting to LDAP server: create.')) else: raise ValidationError(dict(non_field_errors='Problem connecting to LDAP server: find.')) - if utils_ldap.set_password(data) != 200: - raise ValidationError(dict(non_field_errors='Problem connecting to LDAP server: set.')) member.user = user member.first_name = data['first_name']