mirror of
				https://github.com/avatao-content/test-tutorial-framework
				synced 2025-11-04 05:12:54 +00:00 
			
		
		
		
	Reduce user_ops.py line length to better fit webIDE
This commit is contained in:
		@@ -23,9 +23,16 @@ class UserOps:
 | 
				
			|||||||
        :raises InvalidCredentialsError:
 | 
					        :raises InvalidCredentialsError:
 | 
				
			||||||
            User does not exist or password provided is invalid
 | 
					            User does not exist or password provided is invalid
 | 
				
			||||||
        """
 | 
					        """
 | 
				
			||||||
        user = self.db_session.query(User).filter(User.username == self.username).first()
 | 
					        user = self.db_session.query(User).filter(
 | 
				
			||||||
 | 
					            User.username == self.username
 | 
				
			||||||
 | 
					        ).first()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if not user or not PasswordHasher.verify(self.password, user.passwordhash):
 | 
					        passw_is_correct = PasswordHasher.verify(
 | 
				
			||||||
 | 
					            self.password,
 | 
				
			||||||
 | 
					            user.passwordhash
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if not user or not passw_is_correct:
 | 
				
			||||||
            self.log(f'Invalid credentials for user "{self.username}"!')
 | 
					            self.log(f'Invalid credentials for user "{self.username}"!')
 | 
				
			||||||
            raise InvalidCredentialsError
 | 
					            raise InvalidCredentialsError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -39,11 +46,17 @@ class UserOps:
 | 
				
			|||||||
        :raises UserExistsError:
 | 
					        :raises UserExistsError:
 | 
				
			||||||
            A user with the provided username already exists
 | 
					            A user with the provided username already exists
 | 
				
			||||||
        """
 | 
					        """
 | 
				
			||||||
        if self.db_session.query(User).filter(User.username == self.username).all():
 | 
					        existing_users = self.db_session.query(User).filter(
 | 
				
			||||||
 | 
					            User.username == self.username
 | 
				
			||||||
 | 
					        ).all()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if existing_users:
 | 
				
			||||||
            raise UserExistsError
 | 
					            raise UserExistsError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        user = User(username=self.username,
 | 
					        user = User(
 | 
				
			||||||
                    passwordhash=PasswordHasher.hash(self.password))
 | 
					            username=self.username,
 | 
				
			||||||
 | 
					            passwordhash=PasswordHasher.hash(self.password)
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
        self.db_session.add(user)
 | 
					        self.db_session.add(user)
 | 
				
			||||||
        self.db_session.commit()
 | 
					        self.db_session.commit()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user