Quellcode durchsuchen

fix auth db access

Guénaël Muller vor 7 Jahren
Ursprung
Commit
92820a6a16
2 geänderte Dateien mit 10 neuen und 5 gelöschten Zeilen
  1. 1 1
      tracim/lib/user.py
  2. 9 4
      tracim/models/auth.py

+ 1 - 1
tracim/lib/user.py Datei anzeigen

95
         #from tracim.lib.calendar import CalendarManager
95
         #from tracim.lib.calendar import CalendarManager
96
         #from tracim.model.organisational import UserCalendar
96
         #from tracim.model.organisational import UserCalendar
97
 
97
 
98
-        created_user.ensure_auth_token(dbsession=self._session, validity_seconds=self._config.USER_AUTH_TOKEN_VALIDITY)
98
+        created_user.ensure_auth_token(session=self._session, validity_seconds=self._config.USER_AUTH_TOKEN_VALIDITY)
99
 
99
 
100
         # Ensure database is up-to-date
100
         # Ensure database is up-to-date
101
         self._session.flush()
101
         self._session.flush()

+ 9 - 4
tracim/models/auth.py Datei anzeigen

264
                 roles.append(role)
264
                 roles.append(role)
265
         return roles
265
         return roles
266
 
266
 
267
-    def ensure_auth_token(self, validity_seconds, dbsession) -> None:
267
+    def ensure_auth_token(self, validity_seconds, session) -> None:
268
         """
268
         """
269
         Create auth_token if None, regenerate auth_token if too much old.
269
         Create auth_token if None, regenerate auth_token if too much old.
270
 
270
 
275
         if not self.auth_token or not self.auth_token_created:
275
         if not self.auth_token or not self.auth_token_created:
276
             self.auth_token = str(uuid.uuid4())
276
             self.auth_token = str(uuid.uuid4())
277
             self.auth_token_created = datetime.utcnow()
277
             self.auth_token_created = datetime.utcnow()
278
-            dbsession.flush()
278
+            session.flush()
279
             return
279
             return
280
 
280
 
281
         now_seconds = time.mktime(datetime.utcnow().timetuple())
281
         now_seconds = time.mktime(datetime.utcnow().timetuple())
285
         if difference > validity_seconds:
285
         if difference > validity_seconds:
286
             self.auth_token = str(uuid.uuid4())
286
             self.auth_token = str(uuid.uuid4())
287
             self.auth_token_created = datetime.utcnow()
287
             self.auth_token_created = datetime.utcnow()
288
-            DBSession.flush()
288
+            session.flush()
289
 
289
 
290
 
290
 
291
 class Permission(DeclarativeBase):
291
 class Permission(DeclarativeBase):
298
 
298
 
299
     __tablename__ = 'permissions'
299
     __tablename__ = 'permissions'
300
 
300
 
301
-    permission_id = Column(Integer, Sequence('seq__permissions__permission_id'), autoincrement=True, primary_key=True)
301
+    permission_id = Column(
302
+        Integer,
303
+        Sequence('seq__permissions__permission_id'),
304
+        autoincrement=True,
305
+        primary_key=True
306
+    )
302
     permission_name = Column(Unicode(63), unique=True, nullable=False)
307
     permission_name = Column(Unicode(63), unique=True, nullable=False)
303
     description = Column(Unicode(255))
308
     description = Column(Unicode(255))
304
 
309