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

Note logout action as well for onAuthChanged event.

Browse Source
This commit is contained in:
Max Eddy
2017-06-16 13:04:27 -04:00
parent 4982d8a9ad
commit fe0c581ea9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed/src/index.js
+8 -4
View File
@@ -54,11 +54,15 @@ function configurePymParent(pymParent, opts) {
pymParent.sendMessage('config', JSON.stringify(config));
}
pymParent.onMessage('coral-check-login', function(result) {
if (opts.onCheckLogin) {
opts.onCheckLogin(JSON.parse(result));
function onAuthChanged(message) {
if (opts.onAuthChanged) {
opts.onAuthChanged(message ? JSON.parse(message) : null);
}
});
}
pymParent.onMessage('coral-login', onAuthChanged);
pymParent.onMessage('coral-logout', onAuthChanged);
// Sends config to the child
pymParent.onMessage('getConfig', function() {
client/coral-framework/actions/auth.js
+2 -1
View File
@@ -285,6 +285,7 @@ export const logout = () => (dispatch) => {
resetWebsocket();
dispatch({type: actions.LOGOUT});
pym.sendMessage('coral-logout');
});
};
@@ -305,7 +306,6 @@ export const checkLogin = () => (dispatch) => {
dispatch(checkLoginRequest());
coralApi('/auth')
.then((result) => {
pym.sendMessage('coral-check-login', JSON.stringify(result));
if (!result.user) {
if (!bowser.safari && !bowser.ios) {
@@ -318,6 +318,7 @@ export const checkLogin = () => (dispatch) => {
resetWebsocket();
dispatch(checkLoginSuccess(result.user));
pym.sendMessage('coral-login', JSON.stringify(result.user));
// Display create username dialog if necessary.
if (result.user.canEditName && result.user.status !== 'BANNED') {