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

Merge branch 'master' into csp

Browse Source
This commit is contained in:
Wyatt Johnson
2018-05-17 18:43:12 -06:00
committed by GitHub
parent c84a9716a1 cd6aacbc76
commit 2822a2dddd
12 changed files with 150 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-facebook-auth/client/actions.js
+3 -1
View File
@@ -1,3 +1,5 @@
import { handlePopupAuth } from 'plugin-api/beta/client/utils';
export const loginWithFacebook = () => (dispatch, _, { rest }) => {
window.location = `${rest.uri}/auth/facebook`;
handlePopupAuth(`${rest.uri}/auth/facebook`);
};
plugins/talk-plugin-facebook-auth/client/index.js
+1
View File
@@ -5,6 +5,7 @@ import translations from './translations.yml';
export default {
translations,
slots: {
authExternalAdminSignIn: [SignIn],
authExternalSignIn: [SignIn],
authExternalSignUp: [SignUp],
},
plugins/talk-plugin-google-auth/client/actions.js
+3 -1
View File
@@ -1,3 +1,5 @@
import { handlePopupAuth } from 'plugin-api/beta/client/utils';
export const loginWithGoogle = () => (dispatch, _, { rest }) => {
window.location = `${rest.uri}/auth/google`;
handlePopupAuth(`${rest.uri}/auth/google`);
};
plugins/talk-plugin-google-auth/client/index.js
+1
View File
@@ -5,6 +5,7 @@ import translations from './translations.yml';
export default {
translations,
slots: {
authExternalAdminSignIn: [SignIn],
authExternalSignIn: [SignIn],
authExternalSignUp: [SignUp],
},