Sfoglia il codice sorgente

walle 2.1 - fix #773 编辑空间出现错误

coffee 6 anni fa
parent
commit
4089d0fdef

+ 1 - 0
walle/api/api.py

@@ -73,6 +73,7 @@ class SecurityResource(ApiResource):
 
     def __init__(self):
         if current_user.is_authenticated:
+            current_user.fresh_session()
             self.space_id = None if current_user.role == SUPER else session['space_id']
 
     # @login_required

+ 5 - 2
walle/api/passport.py

@@ -18,7 +18,6 @@ from walle.model.user import UserModel
 from walle.service.code import Code
 from walle.service.error import WalleError
 
-
 class PassportAPI(ApiResource):
     actions = ['login', 'logout']
 
@@ -49,7 +48,11 @@ class PassportAPI(ApiResource):
 
             if user is not None and user.verify_password(form.password.data):
                 try:
-                    login_user(user)
+                    remember = False
+                    if current_app.config.get("COOKIE_ENABLE"):
+                        remember = True
+                    current_app.logger.info("remember me(记住我)功能是否开启,{}".format(remember))
+                    login_user(user, remember=remember)
                     user.fresh_session()
                 except WalleError as e:
                     return self.render_json(code=e.code, data=Code.code_msg[e.code])

+ 3 - 0
walle/config/settings.py

@@ -49,3 +49,6 @@ class Config(object):
     # 轮转数量是 10 个
     LOG_FILE_BACKUP_COUNT = 10
     LOG_FORMAT = "%(asctime)s %(thread)d %(message)s"
+
+    # 登录cookie 防止退出浏览器重新登录
+    COOKIE_ENABLE = False

+ 3 - 0
walle/config/settings_dev.py

@@ -33,3 +33,6 @@ class DevConfig(Config):
     CODE_BASE = '/tmp/walle/codebase/'
 
     SQLALCHEMY_ECHO = True
+
+    # 登录cookie 防止退出浏览器重新登录
+    COOKIE_ENABLE = False

+ 3 - 0
walle/config/settings_prod.py

@@ -49,3 +49,6 @@ class ProdConfig(Config):
     MAIL_DEFAULT_SENDER = 'service@walle-web.io'
     MAIL_USERNAME = 'service@walle-web.io'
     MAIL_PASSWORD = 'Ki9y&3U82'
+
+    # 登录cookie 防止退出浏览器重新登录
+    COOKIE_ENABLE = False

+ 3 - 0
walle/config/settings_test.py

@@ -32,3 +32,6 @@ class TestConfig(Config):
 
     # 本地代码检出路径(用户查询分支, 编译, 打包) #TODO
     CODE_BASE = '/tmp/walle/codebase/'
+
+    # 登录cookie 防止退出浏览器重新登录
+    COOKIE_ENABLE = True