wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-12 13:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pat

Browse Source
This commit is contained in:
Wyatt Johnson
2017-06-19 09:40:25 -06:00
committed by GitHub
parent 393ad8530a 9ef7544788
commit 2a2ca86263
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/cli-users
+7 -6
View File
@@ -8,6 +8,7 @@ const program = require('./commander');
const inquirer = require('inquirer'); const inquirer = require('inquirer');
const UsersService = require('../services/users'); const UsersService = require('../services/users');
const UserModel = require('../models/user'); const UserModel = require('../models/user');
const USER_ROLES = require('../models/enum/user_roles');
const mongoose = require('../services/mongoose'); const mongoose = require('../services/mongoose');
const util = require('./util'); const util = require('./util');
const Table = require('cli-table'); const Table = require('cli-table');
@@ -36,7 +37,7 @@ function getUserCreateAnswers(options) {
roles: [] roles: []
}; };
if (options.role && UserModel.USER_ROLES.indexOf(options.role) > -1) { if (options.role && USER_ROLES.indexOf(options.role) > -1) {
user.roles = [options.role]; user.roles = [options.role];
} }
@@ -89,7 +90,7 @@ function getUserCreateAnswers(options) {
name: 'roles', name: 'roles',
message: 'User Role', message: 'User Role',
type: 'checkbox', type: 'checkbox',
choices: UserModel.USER_ROLES choices: USER_ROLES
} }
]); ]);
} }
@@ -291,8 +292,8 @@ function mergeUsers(dstUserID, srcUserID) {
*/ */
function addRole(userID, role) { function addRole(userID, role) {
if (UserModel.USER_ROLES.indexOf(role) === -1) { if (USER_ROLES.indexOf(role) === -1) {
console.error(`Role '${role}' is not supported. Supported roles are ${UserModel.USER_ROLES.join(', ')}.`); console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`);
util.shutdown(1); util.shutdown(1);
return; return;
} }
@@ -316,8 +317,8 @@ function addRole(userID, role) {
*/ */
function removeRole(userID, role) { function removeRole(userID, role) {
if (UserModel.USER_ROLES.indexOf(role) === -1) { if (USER_ROLES.indexOf(role) === -1) {
console.error(`Role '${role}' is not supported. Supported roles are ${UserModel.USER_ROLES.join(', ')}.`); console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`);
util.shutdown(1); util.shutdown(1);
return; return;
} }
client/coral-embed/src/index.js
+6
View File
@@ -54,6 +54,12 @@ function configurePymParent(pymParent, opts) {
pymParent.sendMessage('config', JSON.stringify(config)); pymParent.sendMessage('config', JSON.stringify(config));
} }
pymParent.onMessage('coral-auth-changed', function(message) {
if (opts.onAuthChanged) {
opts.onAuthChanged(message ? JSON.parse(message) : null);
}
});
// Sends config to the child // Sends config to the child
pymParent.onMessage('getConfig', function() { pymParent.onMessage('getConfig', function() {
sendConfig(opts || {}); sendConfig(opts || {});
client/coral-framework/actions/auth.js
+3
View File
@@ -3,6 +3,7 @@ import bowser from 'bowser';
import * as actions from '../constants/auth'; import * as actions from '../constants/auth';
import * as Storage from '../helpers/storage'; import * as Storage from '../helpers/storage';
import coralApi, {base} from '../helpers/request'; import coralApi, {base} from '../helpers/request';
import pym from '../services/PymConnection';
import {resetWebsocket} from 'coral-framework/services/client'; import {resetWebsocket} from 'coral-framework/services/client';
import t from 'coral-framework/services/i18n'; import t from 'coral-framework/services/i18n';
@@ -284,6 +285,7 @@ export const logout = () => (dispatch) => {
resetWebsocket(); resetWebsocket();
dispatch({type: actions.LOGOUT}); dispatch({type: actions.LOGOUT});
pym.sendMessage('coral-auth-changed');
}); });
}; };
@@ -315,6 +317,7 @@ export const checkLogin = () => (dispatch) => {
resetWebsocket(); resetWebsocket();
dispatch(checkLoginSuccess(result.user)); dispatch(checkLoginSuccess(result.user));
pym.sendMessage('coral-auth-changed', JSON.stringify(result.user));
// Display create username dialog if necessary. // Display create username dialog if necessary.
if (result.user.canEditName && result.user.status !== 'BANNED') { if (result.user.canEditName && result.user.status !== 'BANNED') {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "talk", "name": "talk",
"version": "2.0.0", "version": "2.0.1",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net", "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js", "main": "app.js",
"scripts": { "scripts": {