Update user.py

spl0k · Jan 30, 2025 · 5ff8f60 · 5ff8f60
1 parent f7fd0d7
commit 5ff8f60
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/supysonic/managers/user.py b/supysonic/managers/user.py
@@ -13,11 +13,7 @@
 
 from ..db import User
 from ..config import get_current_config
-
-try:
-    from .ldap import LdapManager
-except:
-    ldap=None
+from .ldap import LdapManager
 
 class UserManager:
     @staticmethod
@@ -52,22 +48,19 @@ def delete_by_name(name):
     @staticmethod
     def try_auth(name, password):
         try:
-            ldap=LdapManager(**get_current_config().LDAP)
-        except:
-            ldap= None
-        if ldap:
-            ldap_user = ldap.try_auth(name, password)
-        else:
-            ldap_user= False
+            ldap = LdapManager(**get_current_config().LDAP)
+        except ValueError:
+            ldap = None
+        ldap_user = ldap.try_auth(name, password) if ldap else None
         user = User.get_or_none(name=name)
         if ldap_user:
             if user is None:
-                user = User.create(name=name,mail=ldap_user["mail"],admin=ldap_user["admin"])
+                user = User.create(name=name, mail=ldap_user["mail"], admin=ldap_user["admin"])
             else:
-                if user.admin != ldap_user['admin']:
-                    user.admin=ldap_user['admin']
-                if user.mail != ldap_user['mail']:
-                    user.mail=ldap_user['mail']
+                if user.admin != ldap_user["admin"]:
+                    user.admin = ldap_user["admin"]
+                if user.mail != ldap_user["mail"]:
+                    user.mail = ldap_user["mail"]
             return user
         else:
             if user is None: