From ba714ea1f5f7b810f42f050072e7a75c8e10712a Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Tue, 12 Sep 2017 13:55:06 +0800
Subject: [PATCH] Remove force server crypto

---
 seahub/options/models.py | 22 ++--------------------
 seahub/profile/views.py  |  1 -
 seahub/settings.py       |  3 ---
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/seahub/options/models.py b/seahub/options/models.py
index 3ca5adc90f..541124cac5 100644
--- a/seahub/options/models.py
+++ b/seahub/options/models.py
@@ -4,7 +4,6 @@
 from django.db import models
 
 from seahub.base.fields import LowerCaseCharField
-from seahub.settings import FORCE_SERVER_CRYPTO
 from seahub.utils import is_pro_version
 
 KEY_SERVER_CRYPTO = "server_crypto"
@@ -71,26 +70,9 @@ class UserOptionsManager(models.Manager):
                                     VAL_SERVER_CRYPTO_DISABLED)
 
     def is_server_crypto(self, username):
-        """Check whether user is set server crypto. Returns ``True`` if
-        server crypto is enabled, otherwise ``False``.
-
-        Raise ``CryptoOptionNotSetError`` if this option is not set.
-
-        NOTE: Always return ``True`` if ``FORCE_SERVER_CRYPTO`` is set to
-        ``True``.
-
-        Arguments:
-        - `username`:
+        """Client crypto is deprecated, always return ``True``.
         """
-        if FORCE_SERVER_CRYPTO is True:
-            return True
-
-        try:
-            user_option = super(UserOptionsManager, self).get(
-                email=username, option_key=KEY_SERVER_CRYPTO)
-            return bool(int(user_option.option_val))
-        except UserOptions.DoesNotExist:
-            raise CryptoOptionNotSetError
+        return True
 
     def enable_user_guide(self, username):
         """
diff --git a/seahub/profile/views.py b/seahub/profile/views.py
index 6f11837d34..8cf1599250 100644
--- a/seahub/profile/views.py
+++ b/seahub/profile/views.py
@@ -80,7 +80,6 @@ def edit_profile(request):
             'form': form,
             'server_crypto': server_crypto,
             "sub_lib_enabled": sub_lib_enabled,
-            'force_server_crypto': settings.FORCE_SERVER_CRYPTO,
             'default_repo': default_repo,
             'owned_repos': owned_repos,
             'is_pro': is_pro_version(),
diff --git a/seahub/settings.py b/seahub/settings.py
index 685757b5a2..cdd7c70d4d 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -300,9 +300,6 @@ USER_STRONG_PASSWORD_REQUIRED = False
 # Force user to change password when admin add/reset a user.
 FORCE_PASSWORD_CHANGE = True
 
-# Using server side crypto by default, otherwise, let user choose crypto method.
-FORCE_SERVER_CRYPTO = True
-
 # Enable or disable repo history setting
 ENABLE_REPO_HISTORY_SETTING = True