wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-14 11:18:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into events

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-06 14:31:07 -07:00
parent 5815d869b5 2b2a762623
commit 26cba9af63
13 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/actions/auth.js
+3
View File
@@ -33,6 +33,7 @@ export const handleLogin = (email, password, recaptchaResponse) => (
if (!user) {
if (!bowser.safari && !bowser.ios && storage) {
storage.removeItem('token');
storage.removeItem('exp');
}
return dispatch(checkLoginFailure('not logged in'));
}
@@ -128,6 +129,7 @@ export const checkLogin = () => (dispatch, _, { rest, client, storage }) => {
if (!user) {
if (!bowser.safari && !bowser.ios && storage) {
storage.removeItem('token');
storage.removeItem('exp');
}
return dispatch(checkLoginFailure('not logged in'));
}
@@ -152,6 +154,7 @@ export const logout = () => (dispatch, _, { rest, client, storage }) => {
return rest('/auth', { method: 'DELETE' }).then(() => {
if (storage) {
storage.removeItem('token');
storage.removeItem('exp');
}
// Reset the websocket.
client/coral-admin/src/components/Drawer.js
+1 -1
View File
@@ -44,7 +44,7 @@ const CoralDrawer = ({ handleLogout, auth = {} }) => (
{t('configure.configure')}
</Link>
)}
<a onClick={handleLogout}>Sign Out</a>
<a onClick={handleLogout}>{t('configure.sign_out')}</a>
<span>{`v${process.env.VERSION}`}</span>
</Navigation>
</div>
client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+8 -1
View File
@@ -397,6 +397,13 @@ class ModerationQueue extends React.Component {
const index = comments.findIndex(
comment => comment.id === selectedCommentId
);
// This can happen temporarily when we call redux to change the selected comment
// but it didn't fully take effect yet.
if (index === -1) {
return null;
}
const comment = comments[index];
return (
<div className={styles.root}>
@@ -414,7 +421,7 @@ class ModerationQueue extends React.Component {
dangling={
!this.props.commentBelongToQueue(this.props.activeTab, comment)
}
/>;
/>
</div>
);
}
client/coral-admin/src/routes/Stories/components/Stories.css
+1
View File
@@ -56,6 +56,7 @@
width: 100%;
border-left: none;
border-right: none;
white-space: pre-wrap;
a {
color: rgb(44, 44, 44);
client/coral-embed-stream/src/actions/auth.js
+3
View File
@@ -266,6 +266,7 @@ export const logout = () => async (
if (storage) {
storage.removeItem('token');
storage.removeItem('exp');
}
// Reset the websocket.
@@ -304,6 +305,7 @@ export const checkLogin = () => (
if (!result.user) {
if (storage) {
storage.removeItem('token');
storage.removeItem('exp');
}
throw ErrNotLoggedIn;
}
@@ -329,6 +331,7 @@ export const checkLogin = () => (
if (error.status && error.status === 401 && storage) {
// Unauthorized.
storage.removeItem('token');
storage.removeItem('exp');
}
const errorMessage = error.translation_key
? t(`error.${error.translation_key}`)
client/coral-embed-stream/src/components/Embed.js
+1 -1
View File
@@ -43,7 +43,7 @@ export default class Embed extends React.Component {
{t('framework.my_profile')}
</Tab>,
];
if (can(user, 'UPDATE_CONFIG')) {
if (can(user, 'UPDATE_ASSET_CONFIG')) {
tabs.push(
<Tab
key="config"
client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
+16 -3
View File
@@ -8,6 +8,7 @@ import ClickOutside from 'coral-framework/components/ClickOutside';
import cn from 'classnames';
import styles from './FlagButton.css';
import * as REASONS from 'coral-framework/graphql/flagReasons';
import PropTypes from 'prop-types';
import { getErrorMessages, forEachError } from 'coral-framework/utils';
@@ -77,9 +78,10 @@ export default class FlagButton extends Component {
return;
}
break;
case this.props.getPopupMenu.length:
this.closeMenu();
return;
case 2:
return this.closeMenu();
default:
throw new Error(`Unexpected step ${step}`);
}
// If itemType and reason are both set, post the action
@@ -92,6 +94,8 @@ export default class FlagButton extends Component {
case 'USERS':
item_id = author_id;
break;
default:
throw new Error(`Unexpected itemType ${itemType}`);
}
let action = {
@@ -272,3 +276,12 @@ export default class FlagButton extends Component {
);
}
}
FlagButton.propTypes = {
currentUser: PropTypes.object,
showSignInDialog: PropTypes.func,
notify: PropTypes.func,
getPopupMenu: PropTypes.array,
flaggedByCurrentUser: PropTypes.bool,
banned: PropTypes.bool,
};
client/coral-framework/services/perms.js
+1
View File
@@ -33,6 +33,7 @@ const basicRoles = {
};
const queryRoles = {
UPDATE_ASSET_CONFIG: [ADMIN, MODERATOR],
UPDATE_CONFIG: [ADMIN],
ACCESS_ADMIN: [ADMIN, MODERATOR],
VIEW_USER_EMAILS: [ADMIN],
package.json
+1 -1
View File
@@ -218,7 +218,7 @@
"yaml-lint": "^1.0.0"
},
"engines": {
"node": "^8"
"node": ">=8"
},
"pre-commit": {
"silent": false,
plugins/talk-plugin-auth/client/components/SignInContainer.js
+11 -2
View File
@@ -38,8 +38,7 @@ class SignInContainer extends React.Component {
}
componentDidMount() {
window.addEventListener('storage', this.handleAuth);
this.listenToStorageChanges();
const { formData } = this.state;
const errors = Object.keys(formData).reduce((map, prop) => {
map[prop] = t('sign_in.required_field');
@@ -49,6 +48,14 @@ class SignInContainer extends React.Component {
}
componentWillUnmount() {
this.unlisten();
}
listenToStorageChanges() {
window.addEventListener('storage', this.handleAuth);
}
unlisten() {
window.removeEventListener('storage', this.handleAuth);
}
@@ -60,6 +67,8 @@ class SignInContainer extends React.Component {
if (e.key === 'auth') {
const { err, data } = JSON.parse(e.newValue);
authCallback(err, data);
this.unlisten();
localStorage.removeItem('auth');
}
};
services/users.js
+1 -1
View File
@@ -13,7 +13,7 @@ const debug = require('debug')('talk:services:users');
const UserModel = require('../models/user');
const RECAPTCHA_WINDOW = '10m'; // 10 minutes.
const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha will be required.
const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 5 incorrect attempts, recaptcha will be required.
const ActionsService = require('./actions');
const mailer = require('./mailer');
views/admin/confirm-email.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Email Verification</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="/public/css/admin.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
views/admin/password-reset.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Password Reset</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="/public/css/admin.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>