|
@@ -1943,9 +1943,6 @@ class UnbundingWXView(TemplateView):
|
|
|
if not lang:
|
|
|
lang = request_dict.get('language', None)
|
|
|
response = ResponseObject(lang)
|
|
|
- was_limited = getattr(request, 'limited', False)
|
|
|
- if was_limited is True:
|
|
|
- return response.json(5)
|
|
|
return self.ValidationError(request_dict, response)
|
|
|
|
|
|
def post(self, request, *args, **kwargs):
|
|
@@ -1955,25 +1952,26 @@ class UnbundingWXView(TemplateView):
|
|
|
if not lang:
|
|
|
lang = request_dict.get('language', None)
|
|
|
response = ResponseObject(lang)
|
|
|
- was_limited = getattr(request, 'limited', False)
|
|
|
- if was_limited is True:
|
|
|
- return response.json(5)
|
|
|
return self.ValidationError(request_dict, response)
|
|
|
|
|
|
def ValidationError(self, request_dict, response):
|
|
|
token = request_dict.get('token', None)
|
|
|
+ auth_type = request_dict.get('auth_type', None)
|
|
|
+ if not all([token, auth_type]):
|
|
|
+ return response.json(444, 'token,auth_type')
|
|
|
tko = TokenObject(token)
|
|
|
if tko.code == 0:
|
|
|
- user_qs = Device_User.objects.filter(userID=tko.userID).values('phone', 'userEmail')
|
|
|
- UserExtend = UserExtendModel.objects.filter(userID=tko.userID)
|
|
|
- if (user_qs[0]['phone'] != '' or user_qs[0]['userEmail'] != ''):
|
|
|
- if UserExtend.exists():
|
|
|
- UserExtend.update(authOpenID='', authType=0)
|
|
|
- return response.json(0)
|
|
|
+ userID = tko.userID
|
|
|
+ user_extend_qs = UserExtendModel.objects.filter(
|
|
|
+ ~Q(authOpenID='') & Q(userID_id=userID) & Q(authType=auth_type))
|
|
|
+ if user_extend_qs.exists():
|
|
|
+ user_qs = Device_User.objects.filter(phone='', userEmail='', userID=userID)
|
|
|
+ if user_qs.exists():
|
|
|
+ return response.json(17)
|
|
|
else:
|
|
|
- return response.json(173)
|
|
|
+ user_extend_qs.update(authOpenID='', authType=0)
|
|
|
+ return response.json(0)
|
|
|
else:
|
|
|
- print('都是空')
|
|
|
- return response.json(48)
|
|
|
+ return response.json(173)
|
|
|
else:
|
|
|
return response.json(tko.code)
|