Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Fix sign up; Add confirmations to sign up and log in

This commit is contained in:
Robbie Antenesse 2018-06-24 23:03:37 -06:00
parent 0f6b5deb1a
commit 095b8051be
4 changed files with 150 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/api/User.php
View File

@ -13,7 +13,7 @@ class User {
} }
public function logIn ($email, $password) { public function logIn ($email, $password) {
$query = 'SELECT * FROM users WHERE email=:email OR username=:email'; $query = 'SELECT * FROM users WHERE email=:email';
$user = $this->db->query($query, array(':email' => $email))->fetch(); $user = $this->db->query($query, array(':email' => $email))->fetch();
if ($user) { if ($user) {
if ($user['old_password'] !== null) { if ($user['old_password'] !== null) {
@ -39,22 +39,15 @@ class User {
return $user->rowCount() > 0; return $user->rowCount() > 0;
} }
public function usernameExists ($username) {
$query = 'SELECT * FROM users WHERE username=?';
$user = $this->db->query($query, array($username));
return $user->rowCount() > 0;
}
public function create ($email, $password, $user_data) { public function create ($email, $password, $user_data) {
$insert_user_query = 'INSERT INTO users (email, password, public_name, username, allow_email, created_on) $insert_user_query = 'INSERT INTO users (email, password, public_name, allow_email, created_on)
VALUES (?, ?, ?, ?, ?, ?)'; VALUES (?, ?, ?, ?, ?)';
$password_hash = password_hash($password, PASSWORD_DEFAULT); $password_hash = password_hash($password, PASSWORD_DEFAULT);
$insert_user = $this->db->execute($insert_user_query, array( $insert_user = $this->db->execute($insert_user_query, array(
$email, $email,
$password_hash, $password_hash,
$user_data['publicName'] !== '' ? $user_data['publicName'] : null, $user_data['publicName'] !== '' ? $user_data['publicName'] : null,
$user_data['username'] !== '' ? $user_data['username'] : null,
$user_data['allowEmail'] ? 1 : 0, $user_data['allowEmail'] ? 1 : 0,
time(), time(),
)); ));
@ -108,7 +101,6 @@ VALUES (?, ?, ?, ?, ?, ?)';
if ($stmt && $user) { if ($stmt && $user) {
return array( return array(
'email' => $user['email'], 'email' => $user['email'],
'username' => $user['username'],
'publicName' => $user['public_name'], 'publicName' => $user['public_name'],
'allowEmails' => $user['allow_email'] == 1 ? true : false, 'allowEmails' => $user['allow_email'] == 1 ? true : false,
); );

81
src/components/management/AccountManager/LoginForm.jsx
View File

@ -1,11 +1,6 @@
import Inferno from 'inferno'; import Inferno from 'inferno';
import { Component } from 'inferno'; import { Component } from 'inferno';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import marked from 'marked';
import store from 'store';
import { Modal } from '../../structure/Modal';
import { SearchBox } from '../../management/SearchBox';
import { request } from '../../../Helpers'; import { request } from '../../../Helpers';
@ -26,19 +21,15 @@ export class LoginForm extends Component {
loginPasswordError: '', loginPasswordError: '',
loginFormIsValid: true, loginFormIsValid: true,
signupEmail: '', signupEmail: '',
// signupUsername: '',
signupPublicName: '', signupPublicName: '',
signupPassword: '', signupPassword: '',
signupConfirm: '', signupConfirm: '',
signupAllowEmail: true, signupAllowEmail: true,
signupEmailError: '', signupEmailError: '',
// signupUsernameError: '',
signupPasswordError: '', signupPasswordError: '',
signupConfirmError: '', signupConfirmError: '',
signupEmailChecking: false, signupEmailChecking: false,
// signupUsernameChecking: false,
signupEmailIsUnique: true, signupEmailIsUnique: true,
// signupUsernameIsUnique: true,
signupFormIsValid: true, signupFormIsValid: true,
}; };
} }
@ -56,15 +47,11 @@ export class LoginForm extends Component {
signupEmailError, signupEmailError,
signupEmailChecking, signupEmailChecking,
signupEmailIsUnique, signupEmailIsUnique,
// signupUsernameError,
// signupUsernameChecking,
// signupUsernameIsUnique,
signupPasswordError, signupPasswordError,
signupConfirmError, signupConfirmError,
} = this.state; } = this.state;
return !signupEmailChecking && !signupUsernameChecking return !signupEmailChecking
&& signupEmailIsUnique && signupEmailError === '' && signupEmailIsUnique && signupEmailError === ''
// && signupUsernameIsUnique && signupUsernameError === ''
&& signupPasswordError === '' && signupConfirmError === ''; && signupPasswordError === '' && signupConfirmError === '';
} }
@ -101,13 +88,6 @@ export class LoginForm extends Component {
} }
} }
// if (field === 'signupUsername') {
// if (value !== '' && /[^a-zA-Z0-9]+/g.test(value)) {
// isValid = false;
// fieldErrors[errorFieldName] = 'Please use only letters and numbers';
// }
// }
if (isValid) { if (isValid) {
fieldErrors[errorFieldName] = ''; fieldErrors[errorFieldName] = '';
} }
@ -118,12 +98,9 @@ export class LoginForm extends Component {
const { const {
signupEmailChecking, signupEmailChecking,
signupEmailIsUnique, signupEmailIsUnique,
// signupUsernameChecking,
// signupUsernameIsUnique,
} = this.state; } = this.state;
const fields = [ const fields = [
'signupEmail', 'signupEmail',
// 'signupUsername',
'signupPassword', 'signupPassword',
'signupConfirm' 'signupConfirm'
]; ];
@ -133,7 +110,6 @@ export class LoginForm extends Component {
errors = Object.assign(errors, fieldErrors); errors = Object.assign(errors, fieldErrors);
}); });
errors.signupFormIsValid = !signupEmailChecking && signupEmailIsUnique errors.signupFormIsValid = !signupEmailChecking && signupEmailIsUnique
// && !signupUsernameChecking && signupUsernameIsUnique
&& Object.keys(errors).every(field => errors[field] === ''); && Object.keys(errors).every(field => errors[field] === '');
this.setState(errors, callback); this.setState(errors, callback);
} }
@ -169,21 +145,6 @@ export class LoginForm extends Component {
}); });
}); });
} }
// else if (field === 'signupUsername') {
// this.setState({ signupUsernameChecking: true }, () => {
// request('check-username', { username: value }, (response) => {
// const { data, error } = response;
// fieldUpdate['signupUsernameChecking'] = false;
// if (error) {
// console.error(data);
// } else {
// fieldUpdate['signupUsernameIsUnique'] = !data;
// }
// }).then(() => {
// this.setState(fieldUpdate);
// });
// });
// }
} }
logIn () { logIn () {
@ -200,13 +161,11 @@ export class LoginForm extends Component {
if (this.signupFormIsValid) { if (this.signupFormIsValid) {
const { const {
signupEmail, signupEmail,
// signupUsername,
signupPublicName, signupPublicName,
signupPassword, signupPassword,
signupAllowEmail signupAllowEmail
} = this.state; } = this.state;
this.props.signUp(signupEmail, signupPassword, { this.props.signUp(signupEmail, signupPassword, {
// username: signupUsername,
publicName: signupPublicName, publicName: signupPublicName,
allowEmail: signupAllowEmail, allowEmail: signupAllowEmail,
}); });
@ -216,7 +175,7 @@ export class LoginForm extends Component {
render () { render () {
return ( return (
<div className='columns'> <div className='columns has-text-left'>
<div className='column'> <div className='column'>
<div className='tabs is-boxed'> <div className='tabs is-boxed'>
<ul> <ul>
@ -274,10 +233,10 @@ export class LoginForm extends Component {
</div> </div>
</div> </div>
<div className='field'> <div className='field'>
<a className='button is-success' <button className='button is-success'
onClick={this.logIn.bind(this)}> onClick={this.logIn.bind(this)}>
Log In Log In
</a> </button>
</div> </div>
</div> </div>
) : ( ) : (
@ -326,29 +285,7 @@ export class LoginForm extends Component {
} }
</div> </div>
</div> </div>
{/* <div className='field'>
<label className='label'>
Username
</label>
<div className='help'>
This is your unique identifier that appears in the URL if you ever decide to share your dictionaries publicly.
</div>
<div className={`control ${this.state.signupUsernameChecking && 'is-loading'}`}>
<input className={`input ${!this.state.signupUsernameIsUnique && 'is-danger'}`}
type='text' value={this.state.signupUsername}
onInput={(event) => this.updateField('signupUsername', event)}
onBlur={(event) => this.checkFieldUnique('signupUsername', event)} />
{
(this.state.signupUsernameError !== '' || !this.state.signupUsernameIsUnique)
? (
<div className='help is-danger'>
{!this.state.signupUsernameIsUnique && <p>This username address is already in use</p>}
{this.state.signupUsernameError}
</div>
) : null
}
</div>
</div> */}
<div className='field'> <div className='field'>
<label className='label'> <label className='label'>
Public Name Public Name
@ -362,6 +299,7 @@ export class LoginForm extends Component {
onInput={(event) => this.updateField('signupPublicName', event)} /> onInput={(event) => this.updateField('signupPublicName', event)} />
</div> </div>
</div> </div>
<div className='field'> <div className='field'>
<label className='label'> <label className='label'>
Password<sup>*</sup> Password<sup>*</sup>
@ -380,6 +318,7 @@ export class LoginForm extends Component {
} }
</div> </div>
</div> </div>
<div className='field'> <div className='field'>
<label className='label'> <label className='label'>
Confirm Password<sup>*</sup> Confirm Password<sup>*</sup>
@ -398,6 +337,7 @@ export class LoginForm extends Component {
} }
</div> </div>
</div> </div>
<div className='field'> <div className='field'>
<div className='control'> <div className='control'>
<input className='is-checkradio' id='signupAllowEmail' type='checkbox' <input className='is-checkradio' id='signupAllowEmail' type='checkbox'
@ -411,12 +351,13 @@ export class LoginForm extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className='field'> <div className='field'>
<div className='control'> <div className='control'>
<a className='button is-success' <button className='button is-success'
onClick={this.createAccount.bind(this)}> onClick={this.createAccount.bind(this)}>
Create Account Create Account
</a> </button>
</div> </div>
</div> </div>
</div> </div>

6
src/components/management/AccountManager/MyAccount.jsx
View File

@ -2,8 +2,6 @@ import Inferno from 'inferno';
import { Component } from 'inferno'; import { Component } from 'inferno';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { request } from '../../../Helpers';
export class MyAccount extends Component { export class MyAccount extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -69,8 +67,7 @@ export class MyAccount extends Component {
render() { render() {
return ( return (
<div> <div className='columns has-text-left'>
<div className='columns'>
<div className='column'> <div className='column'>
<h2 className='title'>Account Details</h2> <h2 className='title'>Account Details</h2>
@ -197,7 +194,6 @@ export class MyAccount extends Component {
</div> </div>
</div> </div>
</div>
); );
} }
} }

26
src/components/management/AccountManager/index.jsx
View File

@ -1,7 +1,6 @@
import Inferno from 'inferno'; import Inferno from 'inferno';
import { Component } from 'inferno'; import { Component } from 'inferno';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import marked from 'marked';
import store from 'store'; import store from 'store';
import swal from 'sweetalert2'; import swal from 'sweetalert2';
@ -36,7 +35,16 @@ export class AccountManager extends Component {
} }
logIn (email, password) { logIn (email, password) {
return request('login', { email, password }, this.handleResponse.bind(this)); return request('login', { email, password }, response => this.handleResponse(response, userData => {
const nameGreeting = userData.hasOwnProperty('publicName') && userData.publicName !== '' ? ', ' + userData.publicName : '';
swal({
title: `Welcome back${nameGreeting}!`,
text: 'You have been logged in successfully.',
type: 'success',
confirmButtonClass: 'button',
buttonsStyling: false,
});
}));
} }
logOut () { logOut () {
@ -62,7 +70,16 @@ export class AccountManager extends Component {
email, email,
password, password,
userData, userData,
}, this.handleResponse.bind(this)); }, response => this.handleResponse(response, () => {
const nameGreeting = userData.hasOwnProperty('publicName') && userData.publicName !== '' ? ', ' + userData.publicName : '';
swal({
title: `Welcome${nameGreeting}!`,
text: 'Your account was created successfully! We hope you enjoy what a Lexiconga account can provide for you!',
type: 'success',
confirmButtonClass: 'button',
buttonsStyling: false,
});
}));
} }
updateUserData (token, userData, callback = () => {}) { updateUserData (token, userData, callback = () => {}) {
@ -76,12 +93,13 @@ export class AccountManager extends Component {
}); });
} }
handleResponse (response) { handleResponse (response, successCallback = () => {}) {
const { data, error } = response; const { data, error } = response;
if (error) { if (error) {
console.error(data); console.error(data);
} else { } else {
this.updateUserData(data.token, data.user, () => { this.updateUserData(data.token, data.user, () => {
successCallback(data.user);
this.getDictionaryNames(); this.getDictionaryNames();
this.props.updater.sync(); this.props.updater.sync();
}); });