+
+ );
+ }
+}
+
+const WorkWeixinDepartmentMembersListPropTypes = {
+ isMembersListLoading: PropTypes.bool.isRequired,
+ membersList: PropTypes.array.isRequired,
+ newUsersTempObj: PropTypes.object.isRequired,
+ checkedDepartmentId: PropTypes.number.isRequired,
+ onUserChecked: PropTypes.func.isRequired,
+ onAllUsersChecked: PropTypes.func.isRequired,
+ isCheckedAll: PropTypes.bool.isRequired,
+ canCheckUserIds: PropTypes.array.isRequired,
+};
+
+WorkWeixinDepartmentMembersList.propTypes = WorkWeixinDepartmentMembersListPropTypes;
+
+
+class WorkWeixinDepartmentsTreeNode extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isChildrenShow: false,
+ };
+ }
+
+ toggleChildren = () => {
+ this.setState({
+ isChildrenShow: !this.state.isChildrenShow,
+ });
+ };
+
+ renderTreeNodes = (departmentsTree) => {
+ if (departmentsTree.length > 0) {
+ return departmentsTree.map((department) => {
+ return (
+
+ {this.props.isMembersListLoading &&
+
+
+ }
+ {!this.props.isMembersListLoading && this.props.membersList.length === 0 &&
+
+ | {allUsersCheckBox} | ++ | {'名称'} | +{'手机号'} | +{'邮箱'} | +{'已添加'} | +
|---|
+
+ }
+ {gettext('无成员')}
+
+ {this.props.isChildrenShow &&
+
+ );
+ }
+}
+
+const WorkWeixinDepartmentsTreeNodePropTypes = {
+ index: PropTypes.number,
+ department: PropTypes.object.isRequired,
+ isChildrenShow: PropTypes.bool.isRequired,
+ onChangeDepartment: PropTypes.func.isRequired,
+ checkedDepartmentId: PropTypes.number.isRequired,
+};
+
+WorkWeixinDepartmentsTreeNode.propTypes = WorkWeixinDepartmentsTreeNodePropTypes;
+
+
+class WorkWeixinDepartmentsTreePanel extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ render() {
+ const departmentsTree = this.props.departmentsTree.map((department, index) => {
+ return (
+
+ this.toggleChildren()}>{' '}
+ this.props.onChangeDepartment(this.props.department.id)}
+ >{this.props.department.name}
+
+ }
+ {this.state.isChildrenShow &&
+
+ {this.props.department.children && this.renderTreeNodes(this.props.department.children)}
+
+ }
+
+
+ );
+ }
+}
+
+const WorkWeixinDepartmentsTreePanelPropTypes = {
+ isTreeLoading: PropTypes.bool.isRequired,
+ departmentsTree: PropTypes.array.isRequired,
+ onChangeDepartment: PropTypes.func.isRequired,
+ checkedDepartmentId: PropTypes.number.isRequired,
+};
+
+WorkWeixinDepartmentsTreePanel.propTypes = WorkWeixinDepartmentsTreePanelPropTypes;
+
+
+class WorkWeixinDepartments extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ isTreeLoading: true,
+ isMembersListLoading: true,
+ departmentsTree: [],
+ checkedDepartmentId: 0,
+ membersTempObj: {},
+ membersList: [],
+ newUsersTempObj: {},
+ isCheckedAll: false,
+ canCheckUserIds: [],
+ };
+ }
+
+ getDepartmentsTree = (list) => {
+ let childIds = [];
+ let parentIds = [];
+ for (let i = 0; i < list.length; i++) {
+ if (childIds.indexOf(list[i].id) === -1) {
+ childIds.push(list[i].id);
+ }
+ if (parentIds.indexOf(list[i].parentid) === -1) {
+ parentIds.push(list[i].parentid);
+ }
+ }
+ let intersection = parentIds.filter((v) => {
+ return childIds.indexOf(v) !== -1;
+ });
+ let rootIds = parentIds.concat(intersection).filter((v) => {
+ return parentIds.indexOf(v) === -1 || intersection.indexOf(v) === -1;
+ });
+
+ let cloneData = JSON.parse(JSON.stringify(list));
+ return cloneData.filter(father => {
+ let branchArr = cloneData.filter(child => father.id === child.parentid);
+ branchArr.length > 0 ? father.children = branchArr : '';
+ return rootIds.indexOf(father.parentid) !== -1;
+ });
+ };
+
+ getWorkWeixinDepartmentsList = () => {
+ seafileAPI.adminListWorkWeixinDepartments().then((res) => {
+ let departmentsTree = this.getDepartmentsTree(res.data.department);
+ this.setState({
+ isTreeLoading: false,
+ departmentsTree: departmentsTree,
+ });
+ }).catch((error) => {
+ this.setState({
+ isTreeLoading: false,
+ isMembersListLoading: false,
+ });
+ if (error.response) {
+ toaster.danger(error.response.data.error_msg || error.response.data.detail || gettext('Error'), {duration: 3});
+ } else {
+ toaster.danger(gettext('Please check the network.'), {duration: 3});
+ }
+ if (error.response.status === 403) {
+ window.location = siteRoot + 'sys/useradmin/';
+ }
+ });
+ };
+
+ getWorkWeixinDepartmentMembersList = (department_id) => {
+ this.setState({
+ isMembersListLoading: true,
+ });
+ seafileAPI.adminListWorkWeixinDepartmentMembers(department_id.toString(), {fetch_child: true}).then((res) => {
+ let membersTempObj = this.state.membersTempObj;
+ membersTempObj[department_id] = res.data.userlist;
+ let canCheckUserIds = this.getCanCheckUserIds(res.data.userlist);
+ this.setState({
+ membersTempObj: membersTempObj,
+ membersList: res.data.userlist,
+ isMembersListLoading: false,
+ canCheckUserIds: canCheckUserIds,
+ });
+ }).catch((error) => {
+ this.setState({isMembersListLoading: false});
+ if (error.response) {
+ toaster.danger(error.response.data.error_msg || error.response.data.detail || gettext('Error'), {duration: 3});
+ } else {
+ toaster.danger(gettext('Please check the network.'), {duration: 3});
+ }
+ });
+ };
+
+ getCanCheckUserIds = (membersList) => {
+ let canCheckUserIds = [];
+ for (let i = 0; i < membersList.length; i++) {
+ let user = membersList[i];
+ if (!user.email) {
+ canCheckUserIds.push(user.userid);
+ }
+ }
+ return canCheckUserIds;
+ };
+
+ onChangeDepartment = (department_id) => {
+ this.setState({
+ newUsersTempObj: {},
+ isCheckedAll: false,
+ checkedDepartmentId: department_id,
+ });
+ if (!(department_id in this.state.membersTempObj)) {
+ this.getWorkWeixinDepartmentMembersList(department_id);
+ } else {
+ let canCheckUserIds = this.getCanCheckUserIds(this.state.membersTempObj[department_id]);
+ this.setState({
+ membersList: this.state.membersTempObj[department_id],
+ canCheckUserIds: canCheckUserIds,
+ });
+ }
+ };
+
+ onUserChecked = (user) => {
+ if (this.state.canCheckUserIds.indexOf(user.userid) !== -1) {
+ let newUsersTempObj = this.state.newUsersTempObj;
+ if (user.userid in newUsersTempObj) {
+ delete newUsersTempObj[user.userid];
+ if (this.state.isCheckedAll) {
+ this.setState({
+ isCheckedAll: false,
+ });
+ }
+ } else {
+ newUsersTempObj[user.userid] = user;
+ if (Object.keys(newUsersTempObj).length === this.state.canCheckUserIds.length) {
+ this.setState({
+ isCheckedAll: true,
+ });
+ }
+ }
+ this.setState({
+ newUsersTempObj: newUsersTempObj,
+ });
+ }
+ };
+
+ onAllUsersChecked = () => {
+ this.setState({
+ isCheckedAll: !this.state.isCheckedAll,
+ }, () => {
+ if (this.state.isCheckedAll) {
+ let newUsersTempObj = {};
+ let newUsersTempList = this.state.membersList.filter(user => {
+ return this.state.canCheckUserIds.indexOf(user.userid) !== -1;
+ });
+
+ for (let i = 0; i < newUsersTempList.length; i++) {
+ newUsersTempObj[newUsersTempList[i].userid] = newUsersTempList[i];
+ }
+ this.setState({
+ newUsersTempObj: newUsersTempObj,
+ });
+ } else {
+ this.setState({
+ newUsersTempObj: {},
+ });
+ }
+ });
+ };
+
+ onSubmit = () => {
+ let userList = [];
+ for (let i in this.state.newUsersTempObj) {
+ userList.push(this.state.newUsersTempObj[i]);
+ }
+ if (!userList.length) {
+ toaster.danger('未选择成员', {duration: 3});
+ } else {
+ seafileAPI.adminAddWorkWeixinUsersBatch(userList).then((res) => {
+ this.setState({
+ newUsersTempObj: {},
+ isCheckedAll: false,
+ });
+ if (res.data.success) {
+ let membersTempObj = this.state.membersTempObj;
+ let membersList = this.state.membersList;
+ let canCheckUserIds = this.state.canCheckUserIds;
+ for (let i = 0; i < res.data.success.length; i++) {
+ let userid = res.data.success[i].userid;
+ let name = res.data.success[i].name;
+ let email = res.data.success[i].email;
+ toaster.success(name + ' 成功导入', {duration: 1});
+ // refresh all temp
+ if (canCheckUserIds.indexOf(userid) !== -1) {
+ canCheckUserIds.splice(canCheckUserIds.indexOf(userid), 1);
+ }
+ for (let j = 0; j < membersList.length; j++) {
+ if (membersList[j].userid === userid) {
+ membersList[j].email = email;
+ break;
+ }
+ }
+ for (let departmentId in membersTempObj) {
+ for (let k = 0; k < membersTempObj[departmentId].length; k++) {
+ if (membersTempObj[departmentId][k].userid === userid) {
+ membersTempObj[departmentId][k].email = email;
+ break;
+ }
+ }
+ }
+ }
+ this.setState({
+ membersTempObj: membersTempObj,
+ membersList: membersList,
+ canCheckUserIds: canCheckUserIds,
+ });
+ }
+ if (res.data.failed) {
+ for (let i = 0; i < res.data.failed.length; i++) {
+ let name = res.data.failed[i].name;
+ let errorMsg = res.data.failed[i].error_msg;
+ toaster.danger(name + ' ' + errorMsg, {duration: 3});
+ }
+ }
+ }).catch((error) => {
+ if (error.response) {
+ toaster.danger(error.response.data.error_msg || error.response.data.detail || gettext('Error'), {duration: 3});
+ } else {
+ toaster.danger(gettext('Please check the network.'), {duration: 3});
+ }
+ });
+ }
+
+ };
+
+ componentDidMount() {
+ this.getWorkWeixinDepartmentsList();
+ }
+
+ render() {
+ return (
+
+ {this.props.isTreeLoading &&
+
+ {this.props.departmentsTree.length > 0 && departmentsTree}
+
+ }
+
+
+ );
+ }
+}
+
+export default WorkWeixinDepartments;
+
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index 2b5ac97ad8..5b542eae52 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -112,4 +112,5 @@ export const canManageUser = window.sysadmin ? window.sysadmin.pageOptions.admin
export const canManageGroup = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_manage_group : '';
export const canViewUserLog = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_view_user_log : '';
export const canViewAdminLog = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_view_admin_log : '';
+export const enableWorkWeixinDepartments = window.sysadmin ? window.sysadmin.pageOptions.enable_work_weixin_departments : '';
diff --git a/seahub/api2/endpoints/admin/work_weixin.py b/seahub/api2/endpoints/admin/work_weixin.py
new file mode 100644
index 0000000000..b248a97f27
--- /dev/null
+++ b/seahub/api2/endpoints/admin/work_weixin.py
@@ -0,0 +1,206 @@
+# Copyright (c) 2012-2019 Seafile Ltd.
+# encoding: utf-8
+
+import logging
+import requests
+import json
+
+from rest_framework.authentication import SessionAuthentication
+from rest_framework.permissions import IsAdminUser
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from rest_framework import status
+from seahub.api2.authentication import TokenAuthentication
+from seahub.api2.throttling import UserRateThrottle
+from seahub.api2.utils import api_error
+from seahub.work_weixin.utils import handler_work_weixin_api_response, \
+ get_work_weixin_access_token, admin_work_weixin_departments_check, \
+ update_work_weixin_user_info
+from seahub.work_weixin.settings import WORK_WEIXIN_DEPARTMENTS_URL, \
+ WORK_WEIXIN_DEPARTMENT_MEMBERS_URL, WORK_WEIXIN_PROVIDER, WORK_WEIXIN_UID_PREFIX
+from seahub.base.accounts import User
+from seahub.utils.auth import gen_user_virtual_id
+from seahub.auth.models import SocialAuthUser
+
+logger = logging.getLogger(__name__)
+WORK_WEIXIN_DEPARTMENT_FIELD = 'department'
+WORK_WEIXIN_DEPARTMENT_MEMBERS_FIELD = 'userlist'
+
+# # uid = corpid + '_' + userid
+# from social_django.models import UserSocialAuth
+# get departments: https://work.weixin.qq.com/api/doc#90000/90135/90208
+# get members: https://work.weixin.qq.com/api/doc#90000/90135/90200
+
+
+class AdminWorkWeixinDepartments(APIView):
+ authentication_classes = (TokenAuthentication, SessionAuthentication)
+ throttle_classes = (UserRateThrottle,)
+ permission_classes = (IsAdminUser,)
+
+ def get(self, request):
+ if not admin_work_weixin_departments_check():
+ error_msg = 'Feature is not enabled.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ access_token = get_work_weixin_access_token()
+ if not access_token:
+ logger.error('can not get work weixin access_token')
+ error_msg = '获取企业微信组织架构失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ data = {
+ 'access_token': access_token,
+ }
+ department_id = request.GET.get('department_id', None)
+ if department_id:
+ data['id'] = department_id
+
+ api_response = requests.get(WORK_WEIXIN_DEPARTMENTS_URL, params=data)
+ api_response_dic = handler_work_weixin_api_response(api_response)
+ if not api_response_dic:
+ logger.error('can not get work weixin departments response')
+ error_msg = '获取企业微信组织架构失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ if WORK_WEIXIN_DEPARTMENT_FIELD not in api_response_dic:
+ logger.error(json.dumps(api_response_dic))
+ logger.error('can not get department list in work weixin departments response')
+ error_msg = '获取企业微信组织架构失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ return Response(api_response_dic)
+
+
+class AdminWorkWeixinDepartmentMembers(APIView):
+ authentication_classes = (TokenAuthentication, SessionAuthentication)
+ throttle_classes = (UserRateThrottle,)
+ permission_classes = (IsAdminUser,)
+
+ def get(self, request, department_id):
+ if not admin_work_weixin_departments_check():
+ error_msg = 'Feature is not enabled.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ access_token = get_work_weixin_access_token()
+ if not access_token:
+ logger.error('can not get work weixin access_token')
+ error_msg = '获取企业微信组织架构成员失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ data = {
+ 'access_token': access_token,
+ 'department_id': department_id,
+ }
+ fetch_child = request.GET.get('fetch_child', None)
+ if fetch_child:
+ if fetch_child not in ('true', 'false'):
+ error_msg = 'fetch_child invalid.'
+ return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+ data['fetch_child'] = 1 if fetch_child == 'true' else 0
+
+ api_response = requests.get(WORK_WEIXIN_DEPARTMENT_MEMBERS_URL, params=data)
+ api_response_dic = handler_work_weixin_api_response(api_response)
+ if not api_response_dic:
+ logger.error('can not get work weixin department members response')
+ error_msg = '获取企业微信组织架构成员失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ if WORK_WEIXIN_DEPARTMENT_MEMBERS_FIELD not in api_response_dic:
+ logger.error(json.dumps(api_response_dic))
+ logger.error('can not get userlist in work weixin department members response')
+ error_msg = '获取企业微信组织架构成员失败'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ api_user_list = api_response_dic[WORK_WEIXIN_DEPARTMENT_MEMBERS_FIELD]
+ # todo filter ccnet User database
+ social_auth_queryset = SocialAuthUser.objects.filter(
+ provider=WORK_WEIXIN_PROVIDER, uid__contains=WORK_WEIXIN_UID_PREFIX)
+ for api_user in api_user_list:
+ uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '')
+ api_user['contact_email'] = api_user['email']
+ # # determine the user exists
+ if social_auth_queryset.filter(uid=uid).exists():
+ api_user['email'] = social_auth_queryset.get(uid=uid).username
+ else:
+ api_user['email'] = ''
+
+ return Response(api_response_dic)
+
+
+def _handler_work_weixin_user_data(api_user, social_auth_queryset):
+ user_id = api_user.get('userid', '')
+ uid = WORK_WEIXIN_UID_PREFIX + user_id
+ name = api_user.get('name', None)
+ error_data = None
+ if not uid:
+ error_data = {
+ 'userid': None,
+ 'name': None,
+ 'error_msg': 'userid invalid.',
+ }
+ elif social_auth_queryset.filter(uid=uid).exists():
+ error_data = {
+ 'userid': user_id,
+ 'name': name,
+ 'error_msg': '用户已存在',
+ }
+
+ return error_data
+
+
+def _import_user_from_work_weixin(email, api_user):
+
+ api_user['username'] = email
+ uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid')
+ try:
+ User.objects.create_user(email)
+ SocialAuthUser.objects.add(email, WORK_WEIXIN_PROVIDER, uid)
+ update_work_weixin_user_info(api_user)
+ except Exception as e:
+ logger.error(e)
+ return False
+
+ return True
+
+
+class AdminWorkWeixinUsersBatch(APIView):
+ authentication_classes = (TokenAuthentication, SessionAuthentication)
+ permission_classes = (IsAdminUser,)
+ throttle_classes = (UserRateThrottle,)
+
+ def post(self, request):
+ if not admin_work_weixin_departments_check():
+ error_msg = 'Feature is not enabled.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ api_user_list = request.data.get(WORK_WEIXIN_DEPARTMENT_MEMBERS_FIELD, None)
+ if not api_user_list or not isinstance(api_user_list, list):
+ error_msg = 'userlist invalid.'
+ return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+
+ success = []
+ failed = []
+ social_auth_queryset = SocialAuthUser.objects.filter(
+ provider=WORK_WEIXIN_PROVIDER, uid__contains=WORK_WEIXIN_UID_PREFIX)
+
+ for api_user in api_user_list:
+
+ error_data = _handler_work_weixin_user_data(api_user, social_auth_queryset)
+ if not error_data:
+ email = gen_user_virtual_id()
+ if _import_user_from_work_weixin(email, api_user):
+ success.append({
+ 'userid': api_user.get('userid'),
+ 'name': api_user.get('name'),
+ 'email': email,
+ })
+ else:
+ failed.append({
+ 'userid': api_user.get('userid'),
+ 'name': api_user.get('name'),
+ 'error_msg': '导入失败'
+ })
+ else:
+ failed.append(error_data)
+
+ return Response({'success': success, 'failed': failed})
diff --git a/seahub/auth/models.py b/seahub/auth/models.py
index 800cc2b1fb..bf4bdcb714 100644
--- a/seahub/auth/models.py
+++ b/seahub/auth/models.py
@@ -2,6 +2,7 @@
import datetime
import hashlib
import urllib
+import logging
# import auth
from django.core.exceptions import ImproperlyConfigured
@@ -11,8 +12,9 @@ from django.contrib.contenttypes.models import ContentType
from django.utils.encoding import smart_str
from django.utils.translation import ugettext_lazy as _
+logger = logging.getLogger(__name__)
+UNUSABLE_PASSWORD = '!' # This will never be a valid hash
-UNUSABLE_PASSWORD = '!' # This will never be a valid hash
def get_hexdigest(algorithm, salt, raw_password):
"""
@@ -33,6 +35,7 @@ def get_hexdigest(algorithm, salt, raw_password):
return hashlib.sha1(salt + raw_password).hexdigest()
raise ValueError("Got unknown password algorithm type in password.")
+
def check_password(raw_password, enc_password):
"""
Returns a boolean of whether the raw_password was correct. Handles
@@ -41,6 +44,7 @@ def check_password(raw_password, enc_password):
algo, salt, hsh = enc_password.split('$')
return hsh == get_hexdigest(algo, salt, raw_password)
+
class SiteProfileNotAvailable(Exception):
pass
@@ -70,7 +74,7 @@ class AnonymousUser(object):
return not self.__eq__(other)
def __hash__(self):
- return 1 # instances always return the same hash value
+ return 1 # instances always return the same hash value
def save(self):
raise NotImplementedError
@@ -86,10 +90,12 @@ class AnonymousUser(object):
def _get_groups(self):
return self._groups
+
groups = property(_get_groups)
def _get_user_permissions(self):
return self._user_permissions
+
user_permissions = property(_get_user_permissions)
def get_group_permissions(self, obj=None):
@@ -118,3 +124,49 @@ class AnonymousUser(object):
def is_authenticated(self):
return False
+
+
+class SocialAuthUserManager(models.Manager):
+ def add(self, username, provider, uid, extra_data=''):
+ try:
+ social_auth_user = self.model(username=username, provider=provider, uid=uid, extra_data=extra_data)
+ social_auth_user.save()
+ return social_auth_user
+ except Exception as e:
+ logger.error(e)
+ return None
+
+ def get_by_provider_and_uid(self, provider, uid):
+ try:
+ social_auth_user = self.get(provider=provider, uid=uid)
+ return social_auth_user
+ except self.model.DoesNotExist:
+ return None
+
+ def delete_by_username_and_provider(self, username, provider):
+ self.filter(username=username, provider=provider).delete()
+
+
+class SocialAuthUser(models.Model):
+ username = models.CharField(max_length=255, db_index=True)
+ provider = models.CharField(max_length=32)
+ uid = models.CharField(max_length=255)
+ extra_data = models.TextField()
+ objects = SocialAuthUserManager()
+
+ class Meta:
+ """Meta data"""
+ app_label = "seahub.work_weixin"
+ unique_together = ('provider', 'uid')
+ db_table = 'social_auth_usersocialauth'
+
+
+# # handle signals
+from django.dispatch import receiver
+from registration.signals import user_deleted
+
+
+@receiver(user_deleted)
+def user_deleted_cb(sender, **kwargs):
+ username = kwargs['username']
+ SocialAuthUser.objects.filter(username=username).delete()
diff --git a/seahub/auth/views.py b/seahub/auth/views.py
index a56a35e458..efb1cdb0fb 100644
--- a/seahub/auth/views.py
+++ b/seahub/auth/views.py
@@ -185,7 +185,8 @@ def login(request, template_name='registration/login.html',
getattr(settings, 'ENABLE_ADFS_LOGIN', False) or \
getattr(settings, 'ENABLE_OAUTH', False) or \
getattr(settings, 'ENABLE_CAS', False) or \
- getattr(settings, 'ENABLE_REMOTE_USER_AUTHENTICATION', False)
+ getattr(settings, 'ENABLE_REMOTE_USER_AUTHENTICATION', False) or \
+ getattr(settings, 'ENABLE_WORK_WEIXIN_OAUTH', False)
login_bg_image_path = get_login_bg_image_path()
diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py
index 3f04a18a80..25e610c24a 100644
--- a/seahub/base/context_processors.py
+++ b/seahub/base/context_processors.py
@@ -49,6 +49,7 @@ try:
from seahub.settings import ENABLE_FILE_SCAN
except ImportError:
ENABLE_FILE_SCAN = False
+from seahub.work_weixin.settings import ENABLE_WORK_WEIXIN_DEPARTMENTS
def base(request):
@@ -128,6 +129,7 @@ def base(request):
'enable_resumable_fileupload': dj_settings.ENABLE_RESUMABLE_FILEUPLOAD,
'service_url': get_service_url().rstrip('/'),
'enable_file_scan': ENABLE_FILE_SCAN,
+ 'enable_work_weixin_departments': ENABLE_WORK_WEIXIN_DEPARTMENTS,
}
if request.user.is_staff:
diff --git a/seahub/oauth/backends.py b/seahub/oauth/backends.py
index c2cac677ec..6cad124101 100644
--- a/seahub/oauth/backends.py
+++ b/seahub/oauth/backends.py
@@ -4,7 +4,7 @@ from seahub.auth.backends import RemoteUserBackend
from seahub.base.accounts import User
from registration.models import (notify_admins_on_activate_request,
notify_admins_on_register_complete)
-
+from seahub.work_weixin.settings import ENABLE_WORK_WEIXIN_OAUTH
class OauthRemoteUserBackend(RemoteUserBackend):
"""
@@ -21,9 +21,11 @@ class OauthRemoteUserBackend(RemoteUserBackend):
# Create a User object if not already in the database?
create_unknown_user = getattr(settings, 'OAUTH_CREATE_UNKNOWN_USER', True)
# Create active user by default.
- activate_after_creation = getattr(settings,
- 'OAUTH_ACTIVATE_USER_AFTER_CREATION',
- True)
+ activate_after_creation = getattr(settings, 'OAUTH_ACTIVATE_USER_AFTER_CREATION', True)
+
+ if ENABLE_WORK_WEIXIN_OAUTH:
+ create_unknown_user = getattr(settings, 'WORK_WEIXIN_OAUTH_CREATE_UNKNOWN_USER', True)
+ activate_after_creation = getattr(settings, 'WORK_WEIXIN_OAUTH_ACTIVATE_USER_AFTER_CREATION', True)
def get_user(self, username):
try:
@@ -51,10 +53,10 @@ class OauthRemoteUserBackend(RemoteUserBackend):
if self.create_unknown_user:
user = User.objects.create_user(
email=username, is_active=self.activate_after_creation)
- if user and self.activate_after_creation is False:
- notify_admins_on_activate_request(user.email)
- if user and settings.NOTIFY_ADMIN_AFTER_REGISTRATION is True:
- notify_admins_on_register_complete(user.email)
+ if not self.activate_after_creation:
+ notify_admins_on_activate_request(username)
+ elif settings.NOTIFY_ADMIN_AFTER_REGISTRATION:
+ notify_admins_on_register_complete(username)
else:
user = None
diff --git a/seahub/profile/views.py b/seahub/profile/views.py
index 35e69f47e4..67bb203153 100644
--- a/seahub/profile/views.py
+++ b/seahub/profile/views.py
@@ -22,7 +22,7 @@ from seahub.options.models import UserOptions, CryptoOptionNotSetError
from seahub.utils import is_ldap_user
from seahub.utils.two_factor_auth import has_two_factor_auth
from seahub.views import get_owned_repo_list
-
+from seahub.work_weixin.utils import work_weixin_oauth_check
from seahub.settings import ENABLE_DELETE_ACCOUNT, ENABLE_UPDATE_USER_INFO
@login_required
@@ -86,12 +86,14 @@ def edit_profile(request):
email_inverval = UserOptions.objects.get_file_updates_email_interval(username)
email_inverval = email_inverval if email_inverval is not None else 0
- if settings.SOCIAL_AUTH_WEIXIN_WORK_KEY:
+ if work_weixin_oauth_check():
enable_wechat_work = True
- from social_django.models import UserSocialAuth
- social_connected = UserSocialAuth.objects.filter(
- username=request.user.username, provider='weixin-work').count() > 0
+ # from social_django.models import UserSocialAuth
+ from seahub.auth.models import SocialAuthUser
+ from seahub.work_weixin.settings import WORK_WEIXIN_PROVIDER
+ social_connected = SocialAuthUser.objects.filter(
+ username=request.user.username, provider=WORK_WEIXIN_PROVIDER).count() > 0
else:
enable_wechat_work = False
social_connected = False
diff --git a/seahub/settings.py b/seahub/settings.py
index 0c77dc402a..3713a3433a 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -257,6 +257,7 @@ INSTALLED_APPS = (
'seahub.repo_tags',
'seahub.file_tags',
'seahub.related_files',
+ 'seahub.work_weixin',
)
# Enable or disable view File Scan
@@ -300,6 +301,11 @@ SOCIAL_AUTH_PIPELINE = (
ENABLE_OAUTH = False
ENABLE_WATERMARK = False
+# allow user scan the work weixin qrcode to login
+ENABLE_WORK_WEIXIN_OAUTH = False
+# allow seafile admin import user from work weixin
+ENABLE_WORK_WEIXIN_DEPARTMENTS = False
+
# allow user to clean library trash
ENABLE_USER_CLEAN_TRASH = True
@@ -906,5 +912,5 @@ if ENABLE_REMOTE_USER_AUTHENTICATION:
MIDDLEWARE_CLASSES += ('seahub.auth.middleware.SeafileRemoteUserMiddleware',)
AUTHENTICATION_BACKENDS += ('seahub.auth.backends.SeafileRemoteUserBackend',)
-if ENABLE_OAUTH:
+if ENABLE_OAUTH or ENABLE_WORK_WEIXIN_OAUTH:
AUTHENTICATION_BACKENDS += ('seahub.oauth.backends.OauthRemoteUserBackend',)
diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index 8ae1b0b79f..c28ea22c08 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -83,6 +83,12 @@
{% endif %}
+ {% if is_pro and is_default_admin and enable_file_scan %}
+
+
+
+
+ {'企业微信集成'}
+ {JSON.stringify(this.state.newUsersTempObj) !== '{}' && + + } +
+
+