Merge remote-tracking branch 'remotes/origin/dev' into test

Controller/UserController.py

@@ -2429,7 +2429,10 @@ class OauthPerfectView(TemplateView):
         tko = TokenObject(token)
         if password is None or authcode is None:
             return response.json(444, 'password,authcode')
-        authcode = authcode.strip()
+        authcode = CommonService.decode_data(authcode.strip())
+        if authcode is None:
+            return response.json(444, 'password,authcode')
+
         password = CommonService.decode_data(password.strip())
         if password is None:
             return response.json(444, 'password,authcode')