(this.emailInput = input)}
+ ref={(input) => (this.emailInput = input)}
type="text"
style={{fontSize: 16}}
id="email"
diff --git a/plugins/coral-plugin-auth/client/components/SignInButton.js b/plugins/coral-plugin-auth/client/components/SignInButton.js
index b54cbfedd..881233c83 100644
--- a/plugins/coral-plugin-auth/client/components/SignInButton.js
+++ b/plugins/coral-plugin-auth/client/components/SignInButton.js
@@ -18,7 +18,7 @@ const mapStateToProps = ({auth}) => ({
loggedIn: auth.toJS().loggedIn
});
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
bindActionCreators({showSignInDialog}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(SignInButton);
diff --git a/plugins/coral-plugin-auth/client/components/SignInContainer.js b/plugins/coral-plugin-auth/client/components/SignInContainer.js
index cbff000ee..523f343ed 100644
--- a/plugins/coral-plugin-auth/client/components/SignInContainer.js
+++ b/plugins/coral-plugin-auth/client/components/SignInContainer.js
@@ -61,7 +61,8 @@ class SignInContainer extends React.Component {
window.removeEventListener('storage', this.handleAuth);
}
- handleAuth = e => {
+ handleAuth = (e) => {
+
// Listening to FB changes
// FB localStorage key is 'auth'
const authCallback = this.props.facebookCallback;
@@ -72,10 +73,10 @@ class SignInContainer extends React.Component {
}
};
- handleChange = e => {
+ handleChange = (e) => {
const {name, value} = e.target;
this.setState(
- state => ({
+ (state) => ({
...state,
formData: {
...state.formData,
@@ -88,12 +89,12 @@ class SignInContainer extends React.Component {
);
};
- handleChangeEmail = e => {
+ handleChangeEmail = (e) => {
const {value} = e.target;
this.setState({emailToBeResent: value});
};
- handleResendVerification = e => {
+ handleResendVerification = (e) => {
e.preventDefault();
this.props
.requestConfirmEmail(
@@ -102,6 +103,7 @@ class SignInContainer extends React.Component {
)
.then(() => {
setTimeout(() => {
+
// allow success UI to be shown for a second, and then close the modal
this.props.hideSignInDialog();
}, 2500);
@@ -109,7 +111,7 @@ class SignInContainer extends React.Component {
};
addError = (name, error) => {
- return this.setState(state => ({
+ return this.setState((state) => ({
errors: {
...state.errors,
[name]: error
@@ -133,20 +135,20 @@ class SignInContainer extends React.Component {
} else {
const {[name]: prop, ...errors} = this.state.errors; // eslint-disable-line
// Removes Error
- this.setState(state => ({...state, errors}));
+ this.setState((state) => ({...state, errors}));
}
};
isCompleted = () => {
const {formData} = this.state;
- return !Object.keys(formData).filter(prop => !formData[prop].length).length;
+ return !Object.keys(formData).filter((prop) => !formData[prop].length).length;
};
displayErrors = (show = true) => {
this.setState({showErrors: show});
};
- handleSignUp = e => {
+ handleSignUp = (e) => {
e.preventDefault();
const {errors} = this.state;
const {fetchSignUp, validForm, invalidForm} = this.props;
@@ -159,7 +161,7 @@ class SignInContainer extends React.Component {
}
};
- handleSignIn = e => {
+ handleSignIn = (e) => {
e.preventDefault();
this.props.fetchSignIn(this.state.formData);
};
@@ -183,17 +185,16 @@ class SignInContainer extends React.Component {
}
}
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
auth: state.auth.toJS()
});
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
bindActionCreators(
{
checkLogin,
facebookCallback,
fetchSignUp,
- fetchSignUp,
fetchSignIn,
fetchSignInFacebook,
fetchSignUpFacebook,
diff --git a/plugins/coral-plugin-auth/client/components/SignUpContent.js b/plugins/coral-plugin-auth/client/components/SignUpContent.js
index 5f2dd36ea..2c0cf1f31 100644
--- a/plugins/coral-plugin-auth/client/components/SignUpContent.js
+++ b/plugins/coral-plugin-auth/client/components/SignUpContent.js
@@ -1,5 +1,5 @@
import styles from './styles.css';
-import React, {PropTypes} from 'react';
+import React from 'react';
import translations from '../translations';
import I18n from 'coral-framework/modules/i18n/i18n';
import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
@@ -7,12 +7,17 @@ import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
const lang = new I18n(translations);
class SignUpContent extends React.Component {
- constructor() {
- super();
- this.state = {
- successfulSignup: false
- };
+ componentWillReceiveProps(next) {
+ if (
+ !this.props.emailVerificationEnabled &&
+ !this.props.auth.successSignUp &&
+ next.auth.successSignUp
+ ) {
+ setTimeout(() => {
+ this.props.changeView('SIGNIN');
+ }, 2000);
+ }
}
render() {
@@ -28,19 +33,6 @@ class SignUpContent extends React.Component {
fetchSignUpFacebook
} = this.props;
- const beforeSignup = !auth.isLoading && !auth.successSignUp;
- const successfulSignup = !auth.isLoading && auth.successSignUp;
-
- // the first time we render a successfulSignup, trigger a timer
- if (this.successfulSignup ^ successfulSignup && !emailVerificationEnabled) {
- setTimeout(() => {
- changeView('SIGNIN');
- }, 1000);
- this.setState({
- successfulSignup: true
- });
- }
-
return (
@@ -50,7 +42,7 @@ class SignUpContent extends React.Component {
{auth.error &&
{auth.error}}
- {beforeSignup &&
+ {!auth.successSignUp &&
}
- {successfulSignup &&
+ {auth.successSignUp &&
{emailVerificationEnabled &&
diff --git a/plugins/coral-plugin-auth/client/components/UserBox.js b/plugins/coral-plugin-auth/client/components/UserBox.js
index a4a0e1c99..cfd0fc9d2 100644
--- a/plugins/coral-plugin-auth/client/components/UserBox.js
+++ b/plugins/coral-plugin-auth/client/components/UserBox.js
@@ -4,7 +4,7 @@ import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import translations from '../translations';
import I18n from 'coral-framework/modules/i18n/i18n';
-import {showSignInDialog, logout} from 'coral-framework/actions/auth';
+import {logout} from 'coral-framework/actions/auth';
const lang = new I18n(translations);
const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
@@ -23,12 +23,12 @@ const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
);
-const mapStateToProps = ({auth, user}) => ({
+const mapStateToProps = ({auth}) => ({
loggedIn: auth.toJS().loggedIn,
- user: user.toJS()
+ user: auth.toJS().user
});
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
bindActionCreators({logout}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(UserBox);
diff --git a/plugins/coral-plugin-auth/client/index.js b/plugins/coral-plugin-auth/client/index.js
index 41fa3adbe..c41c097bd 100644
--- a/plugins/coral-plugin-auth/client/index.js
+++ b/plugins/coral-plugin-auth/client/index.js
@@ -8,4 +8,5 @@ export default {
stream: [UserBox, SignInButton, ChangeUserNameContainer],
login: [SignInContainer]
}
-};
\ No newline at end of file
+};
+
diff --git a/plugins/coral-plugin-auth/index.js b/plugins/coral-plugin-auth/index.js
index a09954537..85dfb349b 100644
--- a/plugins/coral-plugin-auth/index.js
+++ b/plugins/coral-plugin-auth/index.js
@@ -1 +1,2 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
+
diff --git a/plugins/coral-plugin-like/client/components/LikeButton.js b/plugins/coral-plugin-like/client/components/LikeButton.js
index b91ffd42a..0a88d35a4 100644
--- a/plugins/coral-plugin-like/client/components/LikeButton.js
+++ b/plugins/coral-plugin-like/client/components/LikeButton.js
@@ -1,19 +1,18 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import styles from './style.css';
-import Icon from './Icon';
-import { I18n } from 'coral-framework';
+import {I18n} from 'coral-framework';
import cn from 'classnames';
import translations from '../translations.json';
-import { getMyActionSummary, getTotalActionCount } from 'coral-framework/utils';
+import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
const lang = new I18n(translations);
const name = 'coral-plugin-like';
class LikeButton extends Component {
handleClick = () => {
- const { postLike, showSignInDialog, deleteAction } = this.props;
- const { root: { me }, comment } = this.props;
+ const {postLike, showSignInDialog, deleteAction} = this.props;
+ const {root: {me}, comment} = this.props;
const myLikeActionSummary = getMyActionSummary(
'LikeActionSummary',
@@ -42,7 +41,7 @@ class LikeButton extends Component {
};
render() {
- const { comment } = this.props;
+ const {comment} = this.props;
if (!comment) {
return null;
@@ -56,7 +55,7 @@ class LikeButton extends Component {
- )
+ );
}
}
-
const mapStateToProps = ({commentBox}) => ({commentBox});
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
bindActionCreators({addTag, removeTag}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index 73e2372ed..0bd0fb1c2 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -2,8 +2,8 @@ import React from 'react';
import styles from './styles.css';
const isOffTopic = (tags) => {
- return !!tags.filter(tag => tag.name === 'OFF_TOPIC').length
-}
+ return !!tags.filter((tag) => tag.name === 'OFF_TOPIC').length;
+};
export default (props) => (
diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js
index 6f610e2b0..392b04e9b 100644
--- a/routes/api/auth/index.js
+++ b/routes/api/auth/index.js
@@ -22,9 +22,10 @@ router.get('/', (req, res, next) => {
/**
* This blacklists the token used to authenticate.
*/
+
router.delete('/', HandleLogout);
-//==============================================================================
+// =============================================================================
// PASSPORT ROUTES
//==============================================================================
diff --git a/services/passport.js b/services/passport.js
index c64bb2334..4f5a8fb8d 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -9,6 +9,7 @@ const errors = require('../errors');
const uuid = require('uuid');
const debug = require('debug')('talk:passport');
const {createClient} = require('./redis');
+const bowser = require('bowser');
// Create a redis client to use for authentication.
const client = createClient();
@@ -32,6 +33,17 @@ const GenerateToken = (user) => JWT.sign({}, JWT_SECRET, {
audience: JWT_AUDIENCE
});
+// SetTokenForSafari sends the token in a cookie for Safari clients.
+const SetTokenForSafari = (req, res, token) => {
+ const browser = bowser._detect(req.headers['user-agent']);
+ if (browser.ios || browser.safari) {
+ res.cookie('authorization', token, {
+ httpOnly: true,
+ expires: new Date(Date.now() + 900000)
+ });
+ }
+};
+
// HandleGenerateCredentials validates that an authentication scheme did indeed
// return a user, if it did, then sign and return the user and token to be used
// by the frontend to display and update the UI.
@@ -47,6 +59,8 @@ const HandleGenerateCredentials = (req, res, next) => (err, user) => {
// Generate the token to re-issue to the frontend.
const token = GenerateToken(user);
+ SetTokenForSafari(req, res, token);
+
// Send back the details!
res.json({user, token});
};
@@ -66,6 +80,8 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
// Generate the token to re-issue to the frontend.
const token = GenerateToken(user);
+ SetTokenForSafari(req, res, token);
+
// We logged in the user! Let's send back the user data.
res.render('auth-callback', {auth: JSON.stringify({err: null, data: {user, token}})});
};
@@ -134,6 +150,7 @@ const HandleLogout = (req, res, next) => {
return next(err);
}
+ res.clearCookie('authorization');
res.status(204).end();
});
};
@@ -158,11 +175,24 @@ const CheckBlacklisted = (jwt) => new Promise((resolve, reject) => {
const JwtStrategy = require('passport-jwt').Strategy;
const ExtractJwt = require('passport-jwt').ExtractJwt;
+let cookieExtractor = function(req) {
+ let token = null;
+
+ if (req && req.cookies) {
+ token = req.cookies['authorization'];
+ }
+
+ return token;
+};
+
// Extract the JWT from the 'Authorization' header with the 'Bearer' scheme.
passport.use(new JwtStrategy({
// Prepare the extractor from the header.
- jwtFromRequest: ExtractJwt.fromAuthHeaderWithScheme('Bearer'),
+ jwtFromRequest: ExtractJwt.fromExtractors([
+ cookieExtractor,
+ ExtractJwt.fromAuthHeaderWithScheme('Bearer')
+ ]),
// Use the secret passed in which is loaded from the environment. This can be
// a certificate (loaded) or a HMAC key.
diff --git a/yarn.lock b/yarn.lock
index 728687248..3d01f098e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1262,6 +1262,10 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"
+bowser@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.7.0.tgz#169de4018711f994242bff9a8009e77a1f35e003"
+
brace-expansion@^1.0.0:
version "1.1.7"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
@@ -1395,6 +1399,10 @@ builtin-status-codes@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+bytes@2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+
bytes@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
@@ -1815,6 +1823,12 @@ component-emitter@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+compressible@~2.0.8:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
+ dependencies:
+ mime-db ">= 1.27.0 < 2"
+
compression-webpack-plugin@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-0.4.0.tgz#811de04215f811ea6a12d4d8aed8457d758f13ac"
@@ -1824,6 +1838,17 @@ compression-webpack-plugin@^0.4.0:
optionalDependencies:
node-zopfli "^2.0.0"
+compression@^1.6.2:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+ dependencies:
+ accepts "~1.3.3"
+ bytes "2.3.0"
+ compressible "~2.0.8"
+ debug "~2.2.0"
+ on-headers "~1.0.1"
+ vary "~1.1.0"
+
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1925,6 +1950,13 @@ convert-source-map@^1.1.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+cookie-parser@^1.4.3:
+ version "1.4.3"
+ resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz#0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"
+ dependencies:
+ cookie "0.3.1"
+ cookie-signature "1.0.6"
+
cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -5143,14 +5175,14 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
+"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0:
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+
mime-db@~1.12.0:
version "1.12.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7"
-mime-db@~1.27.0:
- version "1.27.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
-
mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
version "2.1.15"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"