Merge branch 'develop' into v2

resources/scripts/api/account/getTwoFactorTokenData.ts

@@ -0,0 +1,15 @@
+import http from '@/api/http';
+
+export interface TwoFactorTokenData {
+    // eslint-disable-next-line camelcase
+    image_url_data: string;
+    secret: string;
+}
+
+export default (): Promise<TwoFactorTokenData> => {
+    return new Promise((resolve, reject) => {
+        http.get('/api/client/account/two-factor')
+            .then(({ data }) => resolve(data.data))
+            .catch(reject);
+    });
+};

resources/scripts/api/account/getTwoFactorTokenUrl.ts

@@ -1,9 +0,0 @@
-import http from '@/api/http';
-
-export default (): Promise<string> => {
-    return new Promise((resolve, reject) => {
-        http.get('/api/client/account/two-factor')
-            .then(({ data }) => resolve(data.data.image_url_data))
-            .catch(reject);
-    });
-};