Merge pull request #46 from CreateThrive/feature/microsoft-auth

Feature: Microsoft authentication

Author: TOPOFGR

database.rules.json

@@ -2,11 +2,11 @@
   "rules": {
     "users": {
       "$user": {
-        ".write": "auth !== null && (auth.token.email_verified === true || auth.provider === 'facebook') && ((auth.token.isAdmin === true && data.child('isAdmin').val() === false) || auth.uid === $user)",
-        ".read": "auth !== null && (auth.token.email_verified === true || auth.provider === 'facebook') && ((auth.token.isAdmin === true && data.child('isAdmin').val() === false) || auth.uid === $user)"
+        ".write": "auth !== null && ((auth.token.isAdmin === true && data.child('isAdmin').val() === false) || auth.uid === $user)",
+        ".read": "auth !== null && ((auth.token.isAdmin === true && data.child('isAdmin').val() === false) || auth.uid === $user)"
       },
-      ".write": "auth !== null && (auth.token.email_verified === true || auth.provider === 'facebook') && auth.token.isAdmin === true",
-      ".read": "auth !== null && (auth.token.email_verified === true || auth.provider === 'facebook') && auth.token.isAdmin === true"
+      ".write": "auth !== null && auth.token.isAdmin === true",
+      ".read": "auth !== null && auth.token.isAdmin === true"
     }
   }
 }

src/pages/Login/Login.test.js

@@ -47,6 +47,7 @@ beforeEach(() => {
   jest.spyOn(reactRedux, 'useDispatch').mockImplementation(() => dispatchMock);
   jest.spyOn(authActions, 'authFacebook').mockImplementation(jest.fn);
   jest.spyOn(authActions, 'authGoogle').mockImplementation(jest.fn);
+  jest.spyOn(authActions, 'authMicrosoft').mockImplementation(jest.fn);
 });
 
 it('should dispatch authFacebook action when the user tries to log in with Facebook', () => {
@@ -72,3 +73,15 @@ it('should dispatch authGoogle action when the user tries to log in with Google'
 
   expect(authActions.authGoogle).toHaveBeenCalled();
 });
+
+it('should dispatch authMicrosoft action when the user tries to log in with Microsoft', () => {
+  const { component } = mountWithProviders(<Login />)({
+    auth: {
+      userData: {}
+    }
+  });
+
+  component.find('#microsoft').simulate('click');
+
+  expect(authActions.authMicrosoft).toHaveBeenCalled();
+});

src/pages/Login/index.jsx

@@ -12,7 +12,8 @@ import {
   setPassword,
   authCleanUp,
   authFacebook,
-  authGoogle
+  authGoogle,
+  authMicrosoft
 } from 'state/actions/auth';
 import { useChangeHandler, useFormatMessage } from 'hooks';
 import { inputValidations } from 'utils';
@@ -80,7 +81,7 @@ const Login = () => {
   };
 
   const onMicrosoftHandler = () => {
-    alert('Coming soon');
+    dispatch(authMicrosoft());
   };
 
   const inputs = isEmailLink

src/state/actions/auth.js

@@ -314,3 +314,8 @@ export const authGoogle = () => {
   provider.addScope('https://www.googleapis.com/auth/userinfo.email');
   return authWithProvider(provider);
 };
+
+export const authMicrosoft = () => {
+  const provider = new firebase.auth.OAuthProvider('microsoft.com');
+  return authWithProvider(provider);
+};