From 879d703d223d498a92d58eb78f5dc270451e7d6f Mon Sep 17 00:00:00 2001 From: srgooglo <38926803+srgooglo@users.noreply.github.com> Date: Mon, 2 Mar 2020 21:03:52 +0100 Subject: [PATCH] DevServer Fix --- globals/endpoints.js | 31 +++++++++++++------------------ package.json | 3 ++- src/@ycore/libs/yulio_id/pre.js | 29 +++++++++++++++++------------ src/components/YulioID/index.js | 6 ++++++ src/components/YulioID/index.less | 13 ++++++++++--- 5 files changed, 48 insertions(+), 34 deletions(-) diff --git a/globals/endpoints.js b/globals/endpoints.js index 5ac54a39..8e963851 100644 --- a/globals/endpoints.js +++ b/globals/endpoints.js @@ -1,22 +1,17 @@ module.exports = { Endpoints: { - action_post: "https://api.ragestudio.net/RS-YIBTP/yid/post-actions?access_token=", - get_posts: "https://api.ragestudio.net/RS-YIBTP/yid/posts?access_token=", - find_user: "https://api.ragestudio.net/RS-YIBTP/yid/find_user?access_token=", - search_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/search?access_token=", - get_sessions: "https://api.ragestudio.net/RS-YIBTP/yid/session_id?access_token=", - auth_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/auth", - new_post: "https://api.ragestudio.net/RS-YIBTP/yid/new_post?access_token=", - get_servicesHandler: 'https://api.ragestudio.net/RS-YIBTP/rs/servicesHandler', - get_modhandler: "https://api.ragestudio.net/RS-YIBTP/rs/modHandler", - get_subscriptionHandler: "https://api.ragestudio.net/RS-YIBTP/rs/subscriptionHandler", - get_marketplace_global: "https://api.ragestudio.net/RS-YIBTP/rs/marketplaceHandler?access_token=", - get_config_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-site-settings?access_token=", - get_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-user-data?access_token=", - update_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/update-user-data?access_token=", - removeToken: "https://api.ragestudio.net/RS-YIBTP/yid/delete-access-token?access_token=", - register_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/create-account", - resetPassword_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/send-reset-password-email?access_token=", - logotype_uri: 'https://api.ragestudio.net/branding/svg/STUDIO-JETBLACK-Generic_template.png', + action_post: "https://api.ragestudio.net/RSA-COMTY/yid/post-actions?access_token=", + get_posts: "https://api.ragestudio.net/RSA-COMTY/yid/posts?access_token=", + find_user: "https://api.ragestudio.net/RSA-COMTY/yid/find_user?access_token=", + search_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/search?access_token=", + get_sessions: "https://api.ragestudio.net/RSA-COMTY/yid/session_id?access_token=", + auth_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/auth", + new_post: "https://api.ragestudio.net/RSA-COMTY/yid/new_post?access_token=", + get_config_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/get-site-settings?access_token=", + get_userData_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/get-user-data?access_token=", + update_userData_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/update-user-data?access_token=", + removeToken: "https://api.ragestudio.net/RSA-COMTY/yid/delete-access-token?access_token=", + register_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/create-account", + resetPassword_endpoint: "https://api.ragestudio.net/RSA-COMTY/yid/send-reset-password-email?access_token=", } } \ No newline at end of file diff --git a/package.json b/package.json index c8c0b2d0..b9b95a51 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "comty-development", "title": "Comty™", "DevBuild": true, - "version": "0.1.27", + "version": "0.2.02", "description": "", "main": "index.js", "author": "RageStudio", @@ -63,6 +63,7 @@ "react-sound": "^1.2.0", "react-transition-group": "^4.3.0", "recompose": "^0.30.0", + "sqlite": "^3.0.3", "store": "^2.0.12", "ts-cookies": "^1.0.0", "umi-plugin-datahub": "^4.1.0", diff --git a/src/@ycore/libs/yulio_id/pre.js b/src/@ycore/libs/yulio_id/pre.js index b6d10062..1303a76d 100644 --- a/src/@ycore/libs/yulio_id/pre.js +++ b/src/@ycore/libs/yulio_id/pre.js @@ -138,18 +138,23 @@ export function GetAuth(EncUsername, EncPassword, callback) { }; jquery.ajax(settings) .done(function (response) { - console.log(prefix, 'Server response... Dispathing data to login API...'); - var identState = JSON.parse(response)['api_status']; - if (identState == 200) { - const UserID = JSON.parse(response)['user_id']; - const UserToken = JSON.parse(response)['access_token']; - let FramePayload = { UserID, UserToken } - ycore.DevOptions.ShowFunctionsLogs ? console.log(FramePayload) : null - callback(null, '200') - ycore.InitSDCP(FramePayload, (done) => done? __API__User(FramePayload) : null ) - } - if (identState == 400) { - callback(null, '400') + console.log(prefix, 'Server response... Dispathing data to login API...', response); + try { + var identState = JSON.parse(response)['api_status']; + if (identState == 200) { + const UserID = JSON.parse(response)['user_id']; + const UserToken = JSON.parse(response)['access_token']; + let FramePayload = { UserID, UserToken } + ycore.DevOptions.ShowFunctionsLogs ? console.log(FramePayload) : null + callback(null, '200') + ycore.InitSDCP(FramePayload, (done) => done? __API__User(FramePayload) : null ) + } + if (identState == 400) { + callback(null, '400') + } + } catch (error) { + callback(true, '500') + ycore.notifyError('Server bad response') } return; }) diff --git a/src/components/YulioID/index.js b/src/components/YulioID/index.js index 9aa899d2..f4a1306e 100644 --- a/src/components/YulioID/index.js +++ b/src/components/YulioID/index.js @@ -66,6 +66,12 @@ class YulioID extends Component { if (response == '400') { this.setState({ StateIcon: 'exclamation-circle', StateMessage: 'Invalid credentials', StateException: true }) } + if (response == '404') { + this.setState({ StateIcon: 'exclamation-circle', StateMessage: 'Invalid Data', StateException: true }) + } + if (response == '500') { + this.setState({ StateIcon: 'cluster', StateMessage: 'Server Error', StateException: true }) + } } diff --git a/src/components/YulioID/index.less b/src/components/YulioID/index.less index 54449239..4f6a3591 100644 --- a/src/components/YulioID/index.less +++ b/src/components/YulioID/index.less @@ -33,9 +33,16 @@ margin: 13px; } .StateIcon_exception { - color: red; - font-size: 24px; - margin: 13px; + font-size: 24px; + margin: 13px; + color: red !important; + + :global{ + i { + color: red !important; + + } + } } .mainlp { flex-direction: column;