From 9f7a0f5ec891472f2236d292540831223aa76390 Mon Sep 17 00:00:00 2001
From: srgooglo <sirgoogla@gmail.com>
Date: Wed, 14 Oct 2020 22:32:08 +0200
Subject: [PATCH] updated get_user_data endpoints

---
 config/endpoints.js           |  2 +-
 src/core/models/user/index.js |  7 ++-----
 src/models/app.js             |  2 +-
 src/pages/login/login.js      | 27 +++++++++++----------------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/config/endpoints.js b/config/endpoints.js
index 41143599..2cbb3dea 100644
--- a/config/endpoints.js
+++ b/config/endpoints.js
@@ -5,7 +5,7 @@ export default {
   posts: 'POST /posts',
   post_actions: 'POST /post-actions',
   
-  get_data: 'POST /get-user-data',
+  get_data: 'POST /get_user_data',
   basicData: 'POST /early_user',
   profileData: 'POST /get-user-data-username'
 };
diff --git a/src/core/models/user/index.js b/src/core/models/user/index.js
index 4924abd3..98f21f4b 100644
--- a/src/core/models/user/index.js
+++ b/src/core/models/user/index.js
@@ -10,18 +10,15 @@ const set = {
 export const get = {
   data: (parms, callback) => {
     if (!parms) return false;
-    const { id, access_token, serverKey, fetch } = parms;
+    const { user_id, access_token, serverKey, fetch } = parms;
 
     let req = {
       fetch: fetch? fetch : 'user_data'
     }
 
-    if (!id || !access_token) {
-      // core get id data from current session
-    }
     v3_model.api_request(
       {
-        body: {user_id: id, fetch: req.fetch},
+        body: {user_id: user_id, fetch: req.fetch},
         serverKey: serverKey,
         userToken: access_token,
         endpoint: endpoints.get_data
diff --git a/src/models/app.js b/src/models/app.js
index 1f4bb3c7..bcab7b75 100755
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -358,7 +358,7 @@ export default {
           }
           if (res) {
               try {
-                const session_data = JSON.stringify(res.user_data)
+                const session_data = JSON.stringify(res.response)
                 sessionStorage.setItem(app_config.session_data_storage, btoa(session_data))
               } catch (error) {
                 verbosity([error])
diff --git a/src/pages/login/login.js b/src/pages/login/login.js
index f4cfce79..c622208e 100755
--- a/src/pages/login/login.js
+++ b/src/pages/login/login.js
@@ -39,25 +39,20 @@ export class NormalLoginForm extends React.PureComponent {
         const payload = { username: Object.values(values).toString() }
         user.get.basicData(payload, (err, res) => {
           if (err || !res) return false
-          try {
-            if (res.api_status == 200) {
+            if (res.code == 200) {
               a++
               this.anim_transition(300)
               this.setState({
                 step_error: false,
-                early_data: res.data,
+                early_data: res.response,
                 form_rawd_1: b,
                 step: a,
               })
             }
-            if (res.api_status == 400) {
+            if (res.code == 400) {
                this.anim_error()
             }
-          } catch (error) {
-            return false
-          }
         })
-
         return true
       case 2:
         this.setState({ form_rawd_2: b, step: a })
@@ -103,21 +98,21 @@ export class NormalLoginForm extends React.PureComponent {
             if (res) {
                 verbosity([res])
 
-                switch (res.api_status.toString()) {
-                    case "200": {
+                switch (res.code) {
+                    case 200: {
                         try {
-                            return resolve(res)
+                            return resolve(res.response)
                         } catch (error) {
                             verbosity([error])
                         }
                         break;
                     }
-                    case "400": {
+                    case 400: {
                         console.log('Credentials error')
                         this.setState({ validating: false })
                         return this.anim_error()
                     }
-                    case "500": {
+                    case 500: {
                         console.log('Server error')
                         this.setState({ validating: false })
                         return this.back()
@@ -142,9 +137,9 @@ export class NormalLoginForm extends React.PureComponent {
             }
             if (res) {
                 try {
-                    return resolve(JSON.stringify(res.user_data))
+                  return resolve(JSON.stringify(res.response))
                 } catch (error) {
-                    verbosity([error])
+                  verbosity([error])
                 }
             }
         })
@@ -158,7 +153,7 @@ export class NormalLoginForm extends React.PureComponent {
     this.setState({ step_error: false, validating: true })
     
     const authFrame = await this.getAuthFrame({username: form_rawd_1, password: form_rawd_2, server_key: this.props.app.server_key})
-    const dataFrame = await this.getDataFrame({id: authFrame.user_id, access_token: authFrame.access_token, serverKey: this.props.app.server_key})
+    const dataFrame = await this.getDataFrame({user_id: authFrame.user_id, access_token: authFrame.access_token, serverKey: this.props.app.server_key})
 
     return this.props.dispatch({
         type: 'app/login',