imaginaerraum_door_admin/door_handle.py

@@ -92,15 +92,15 @@ class DoorHandle:
         if self.nfc_sock is not None:
             self.nfc_sock.send(b'rld\n')
 
-    def open_door(self, user=b''):
+    def open_door(self):
         if self.nfc_sock is not None:
-            self.nfc_sock.send(b'open ' + user + b'\n')
+            self.nfc_sock.send(b'open\n')
         else:
             raise Exception("No connection to NFC socket. Cannot close door!")
 
-    def close_door(self, user=b''):
+    def close_door(self):
         if self.nfc_sock is not None:
-            self.nfc_sock.send(b'close ' + user + b'\n')
+            self.nfc_sock.send(b'close\n')
         else:
             raise Exception("No connection to NFC socket. Cannot close door!")
 

imaginaerraum_door_admin/webapp.py

@@ -207,19 +207,18 @@ def create_application(config):
         new_user_data['password'] = hash_password(password)
         new_user_data['roles'] = []
         lock_permission = con.search('ou=Users,dc=imaginaerraum,dc=de',
-                                     f'(&(uid={username})(memberof=cn=Keyholders,ou=Groups,dc=imaginaerraum,dc=de))',
+                                     f'(&(uid={username})(memberof=cn=Members,ou=Groups,dc=imaginaerraum,dc=de))',
                                      attributes=ldap3.ALL_ATTRIBUTES)
-        authorized = True
         if lock_permission:
             new_user_data['email'] = con.entries[0].mail.value
         else:
-            authorized = False
+            new_user_data['email'] = None
         token_granting_permission = con.search('ou=Users,dc=imaginaerraum,dc=de',
                                                f'(&(uid={username})(memberof=cn=Vorstand,ou=Groups,dc=imaginaerraum,dc=de))')
         if token_granting_permission:
             new_user_data['roles'].append('admin')
 
-        return authorized, new_user_data
+        return True, new_user_data
 
     class ExtendedLoginForm(LoginForm):
         email = StringField('Benutzername oder E-Mail', [Required()])
@@ -678,9 +677,8 @@ def create_application(config):
     @app.route('/open')
     @auth_required()
     def open_door():
-
         try:
-            door.open_door(user=current_user.username)
+            door.open_door()
             logger.info(f"Door opened by admin user {current_user.username}")
         except Exception as e:
             flash(f'Could not open door. Exception: {e}')
@@ -691,7 +689,7 @@ def create_application(config):
     @auth_required()
     def close_door():
         try:
-            door.close_door(user=current_user.username)
+            door.close_door()
             logger.info(f"Door closed by admin user {current_user.username}")
         except Exception as e:
             flash(f'Could not close door. Exception: {e}')