@@ -511,13 +498,7 @@ export const Preset_description = ({preset, rule_clicked})=>{
export const Ext_tooltip = with_www_api(props=>
);
export const debug = str=>{
@@ -536,14 +517,9 @@ export const No_zones = with_www_api(class No_zones extends Pure_component {
render(){
if (!this.state.settings)
return null;
- const link_props = this.state.settings.zagent && window.parent ?
- {onClick: ()=>CP_ipc.post('no_zones')} :
- {target: '_blank', rel: 'noopener noreferrer',
- href: `${this.props.www_api}/cp/zones`};
return
-
No active zones found. You can activate them {' '}
-
here .
+
No active zones found.
;
}
diff --git a/src/pub/login.js b/src/pub/login.js
index 8a353570..6c948cb3 100755
--- a/src/pub/login.js
+++ b/src/pub/login.js
@@ -3,127 +3,28 @@
import React from 'react';
import {withRouter} from 'react-router-dom';
import Pure_component from '/www/util/pub/pure_component.js';
-import {Typeahead} from 'react-bootstrap-typeahead';
import etask from '../../util/etask.js';
import setdb from '../../util/setdb.js';
-import zurl from '../../util/url.js';
-import {Loader, Logo, with_www_api} from './common.js';
-import {get_location_port} from './util.js';
+import {Loader, Logo} from './common.js';
import {main as Api} from './api.js';
-import {T} from './common/i18n.js';
import './css/login.less';
-const token_err_msg = {
- 'bad_token': 'Invalid token',
- 'token_expired': 'Expired token. A new token has been sent',
- default: 'Something went wrong'
-};
-
const Login = withRouter(class Login extends Pure_component {
state = {
- password: '',
- username: '',
- loading: false,
- two_step: false,
- two_step_verified: false,
- customer_selected: false,
- sending_email: false,
+ loading: true,
+ error_message: '',
};
componentDidMount(){
- this.setdb_on('head.argv', argv=>{
- if (argv)
- this.setState({argv});
- });
- this.setdb_on('head.ver_node', ver_node=>this.setState({ver_node}));
- const url_o = zurl.parse(document.location.href);
- const qs_o = zurl.qs_parse((url_o.search||'').substr(1));
- if (qs_o.t)
- {
- this.token = qs_o.t.replace(/\s+/g, '+');
- this.save_user();
- }
+ this.get_in();
}
- update_password = ({target: {value}})=>this.setState({password: value});
- update_username = ({target: {value}})=>this.setState({username: value});
- select_customer = customer=>this.setState({customer});
- select_final_customer = ()=>{
- if (this.state.customer)
- this.setState({customer_selected: true});
- this.save_user();
- };
- save_user = ()=>{
- const creds = {};
- if (this.token)
- creds.token = this.token;
- else
- {
- creds.username = this.state.username;
- creds.password = this.state.password;
- }
- // XXX krzysztof: move to using customer.id once API is ready
- if (this.state.customer)
- creds.customer = this.state.customer.cname;
- const _this = this;
- this.etask(function*(){
- this.on('uncaught', e=>{
- const update = {loading: false};
- if (e.message=='Unauthorized')
- update.error_message = 'Unauthorized';
- else
- {
- update.error_message = 'Something went wrong: '
- +(e.message||'could not connect');
- }
- _this.setState(update);
- });
- this.on('finally', ()=>_this.setState({loading: false}));
- _this.setState({loading: true});
- const res = yield Api.json.post('creds_user', creds,
- {timeout: 60000});
- if (res.error)
- {
- _this.setState({
- customer: null,
- user_customer_ids: null,
- customer_selected: false,
- error_message: res.error.message||'Something went wrong',
- });
- }
- else if (res.customer_ids || res.ask_two_step)
- {
- _this.setState({
- user_customer_ids: res.customer_ids,
- error_message: '',
- two_step: res.ask_two_step,
- });
- }
- else
- yield _this.get_in();
- });
- };
- verify_two_step = two_step_token=>{
- const _this = this;
- this.etask(function*(){
- _this.setState({loading: true});
- const creds = {two_step_token,
- two_step_pending: !_this.state.two_step_verified};
- if (_this.token)
- creds.token = _this.token;
- const res = yield Api.json.post('creds_user', creds, {safe: true});
- if (res && res.error)
- {
- _this.setState({loading: false, error_message:
- token_err_msg[res.error.message]||token_err_msg.default});
- }
- else
- _this.setState({two_step_verified: true}, _this.get_in);
- });
- };
get_in = ()=>{
const _this = this;
return this.etask(function*(){
this.on('uncaught', e=>{
- _this.setState({error_message: 'Cannot sign in: '+e.message});
+ _this.setState({
+ loading: false,
+ error_message: 'Cannot sign in: '+e.message,
+ });
});
const ets = [];
ets.push(etask(function*_get_settings(){
@@ -158,264 +59,12 @@ const Login = withRouter(class Login extends Pure_component {
return
-
;
- }
-});
-
-const parse_arguments = argv=>
- argv.replace(/(--password )(.+?)( --|$)/, '$1|||$2|||$3').split('|||');
-
-const Messages = ({error_message, argv, ver_node})=>
-
- {argv &&
-
-
- The application is running with the following arguments:
- {parse_arguments(argv).map(a=>
{a} )}
-
- }
- {error_message &&
-
- }
-
- ;
-
-const Node_message = ({ver_node})=>{
- if (!ver_node || ver_node.is_electron || ver_node.satisfied)
- return null;
- return
-
-
-
- The recommended version of node.js is
- {ver_node.recommended} .
- You are using version
- {ver_node.current && ver_node.current.raw} .
-
-
- Please upgrade your node using nvm, nave or visit
-
node.js and download a newer
- version.
-
-
- After node upgrade you should uninstall and then reinstall this
- tool using:
-
-
- npm uninstall -g @luminati-io/luminati-proxy
-
- npm install -g @luminati-io/luminati-proxy
-
-
;
-};
-
-const Header = ()=>{
- return
-
Login with your Bright Data account
- ;
-};
-
-const Form = props=>{
- const google_login_url = 'https://accounts.google.com/o/oauth2/v2/auth?'
- +'client_id=943425271003-8ibddns3o1ftp59t2su8c3psocph9v1d.apps.'
- +'googleusercontent.com&response_type=code&redirect_uri='
- +'https%3A%2F%2Fluminati.io%2Fcp%2Flum_local_google&scope=https%3A%2F%2F'
- +'www.googleapis.com%2Fauth%2Fuserinfo.email&prompt=select_account';
- const google_click = e=>{
- const l = window.location;
- const href = google_login_url+'&state='+encodeURIComponent(l.protocol
- +'//'+l.hostname+':'+get_location_port()+'?api_version=3');
- window.location = href;
- };
- if (props.user_customer_ids && !props.customer_selected)
- {
- return
;
- }
- if (props.two_step)
- {
- return
;
- }
- return
;
-};
-
-const filter_by = (option, props)=>{
- return option.id && option.id.includes(props.text)
- || option.cname && option.cname.includes(props.text);
-};
-
-class Customers_form extends Pure_component {
- state = {cur_customer: []};
- on_change = e=>{
- this.setState({cur_customer: e});
- this.props.select_customer(e&&e[0]);
- };
- render(){
- const opt = this.props.user_customer_ids
- .map(e=>({id: e[0], cname: e[1]}));
- return
-
- Please choose a customer
-
- Customer
-
-
- {this.props.saving_user ? 'Logging in' : 'Sign in'}
-
-
;
- }
-}
-
-class Two_step_form extends Pure_component {
- state = {token: ''};
- on_key_up = e=>{
- if (e.keyCode==13)
- this.submit();
- };
- submit = ()=>{
- this.props.verify_two_step(this.state.token);
- };
- on_token_change = e=>this.setState({token: e.target.value});
- render(){
- const {verifying_token} = this.props;
- return
{t=>
-
- 2-Step Verification
-
- {t('A Bright Data 2-Step Verification email containing'
- +' a token was sent to ')}
- {this.props.email}
- {t('. The token is valid for ')+'15 '+ t('minutes.')}
-
-
- {this.props.sending_email ?
- t('Sending email...') :
- t('Can\'t find it? Check your spam folder')
- }
-
- {verifying_token ? t('Verifying...') : t('Verify')}
-
-
;
- }
-}
-
-const First_form = with_www_api(class First_form extends Pure_component {
- on_key_up = e=>{
- if (e.keyCode==13)
- this.props.save_user();
- };
- render(){
- const {google_click, saving_user, password, username} = this.props;
- return
-
{t=>
-
-
-
-
- {t('Email')}
-
-
- {t('Password')}
-
-
- {saving_user ? t('Logging in...') : t('Sign in')}
-
-
-
Or
+ {this.state.error_message &&
+
-
-
- }
;
}
});