From 3d2ce3b73dce64b6201019d58d707f2b8ddefdef Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Sun, 30 Jan 2022 14:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=BB=E5=8A=A0=E8=8B=B9?=
 =?UTF-8?q?=E6=9E=9C=E5=BC=80=E5=8F=91=E8=80=85=E8=B4=A6=E5=8F=B7=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_admin/src/views/wxbind/list.vue |  2 +-
 fir_ser/api/views/supersign.py      | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/fir_admin/src/views/wxbind/list.vue b/fir_admin/src/views/wxbind/list.vue
index 6d4f0e4..944315b 100644
--- a/fir_admin/src/views/wxbind/list.vue
+++ b/fir_admin/src/views/wxbind/list.vue
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-import { getWxBindInfos, deleteWxBind, getWxBindList } from '@/api/wxbind'
+import { deleteWxBind, getWxBindList } from '@/api/wxbind'
 import { baseFilter } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import waves from '@/directive/waves' // waves directive
diff --git a/fir_ser/api/views/supersign.py b/fir_ser/api/views/supersign.py
index 59be6d9..3756579 100644
--- a/fir_ser/api/views/supersign.py
+++ b/fir_ser/api/views/supersign.py
@@ -29,6 +29,15 @@ from fir_ser.settings import DEVELOPER_USE_STATUS, DEVELOPER_DISABLED_STATUS
 logger = logging.getLogger(__name__)
 
 
+def delete_developer_and_clean(developer_obj, user_obj):
+    if developer_obj and user_obj:
+        logger.error(f"user {user_obj} delete developer {developer_obj}")
+        if developer_obj.certid:
+            IosUtils.clean_developer(developer_obj, user_obj)
+            IosUtils.revoke_developer_cert(developer_obj, user_obj)
+        developer_obj.delete()
+
+
 class DeveloperView(APIView):
     authentication_classes = [ExpiringTokenAuthentication, ]
     permission_classes = [SuperSignPermission, ]
@@ -242,6 +251,7 @@ class DeveloperView(APIView):
             if not status:
                 res.code = 1008
                 res.msg = result.get("return_info", "未知错误")
+                delete_developer_and_clean(developer_obj, request.user)
                 return Response(res.dict)
             else:
                 IosUtils.get_device_from_developer(developer_obj)
@@ -260,14 +270,7 @@ class DeveloperView(APIView):
             developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, issuer_id=issuer_id).first()
         else:
             return self.get(request)
-
-        if developer_obj:
-            logger.error(f"user {request.user} delete developer {developer_obj}")
-            if developer_obj.certid:
-                IosUtils.clean_developer(developer_obj, request.user)
-                IosUtils.revoke_developer_cert(developer_obj, request.user)
-            developer_obj.delete()
-
+        delete_developer_and_clean(developer_obj, request.user)
         return self.get(request)