RageStudio/comty
1
0
Fork 0
mirror of https://github.com/ragestudio/comty.git synced 2025-06-09 10:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated get_user_data endpoints

Browse Source
This commit is contained in:
srgooglo 2020-10-14 22:32:08 +02:00
parent 8d95da288f
commit 9f7a0f5ec8
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/endpoints.js
View File

@ -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'
};

7
src/core/models/user/index.js
View File

@ -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

2
src/models/app.js
View File

@ -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])

27
src/pages/login/login.js
View File

@ -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',