global session to local session

auth/identity.py

@@ -1,7 +1,7 @@
 from auth.password import Password
 from exceptions import InvalidPassword, ObjectNotExist
 from orm import User as OrmUser
-from orm.base import global_session
+from orm.base import local_session
 from auth.validations import User
 
 from sqlalchemy import or_
@@ -10,7 +10,8 @@ from sqlalchemy import or_
 class Identity:
 	@staticmethod
 	def identity(user_id: int, password: str) -> User:
-		user = global_session.query(OrmUser).filter_by(id=user_id).first()
+		with local_session() as session:
+			user = session.query(OrmUser).filter_by(id=user_id).first()
 		if not user:
 			raise ObjectNotExist("User does not exist")
 		user = User(**user.dict())
@@ -22,14 +23,15 @@ class Identity:
 	
 	@staticmethod
 	def identity_oauth(input) -> User:
-		user = global_session.query(OrmUser).filter(
-			or_(OrmUser.oauth_id == input["oauth_id"], OrmUser.email == input["email"])
-			).first()
-		if not user:
-			user = OrmUser.create(**input)
-		if not user.oauth_id:
-			user.oauth_id = input["oauth_id"]
-			global_session.commit()
+		with local_session() as session:
+			user = session.query(OrmUser).filter(
+				or_(OrmUser.oauth_id == input["oauth_id"], OrmUser.email == input["email"])
+				).first()
+			if not user:
+				user = OrmUser.create(**input)
+			if not user.oauth_id:
+				user.oauth_id = input["oauth_id"]
+				session.commit()
 
 		user = User(**user.dict())
 		return user