Merge branch 'email-domain'

Author: sivakb

ReactJS-Project-CardinalKit/src/components/Firebase/firebase.js

@@ -11,8 +11,7 @@ const config = {
   storageBucket: process.env.REACT_APP_STORAGE_BUCKET || 'cs342-master-sample.appspot.com',
   messagingSenderId: process.env.REACT_APP_MESSAGING_SENDER_ID || '267563013930',
   appId: process.env.REACT_APP_ID || '1:267563013930:web:99eeeff653b0f07accb053',
-  // iOSAppBundleId: process.env.IOS_APP_ID || 'edu.stanford.cs342.sample-study', // as setup on your iOS project
-  iOSAppBundleId: process.env.IOS_APP_ID || 'com.siva.cardinalkit-example', // as setup on your iOS project
+  iOSAppBundleId: process.env.REACT_APP_IOS_APP_ID || 'edu.stanford.cs342.sample-study', // as setup on your iOS project
 };
 const firebaseApp = app.initializeApp(config);
 const db = firebaseApp.firestore();

ReactJS-Project-CardinalKit/src/components/LoginPage.jsx

@@ -3,15 +3,16 @@ import * as PropTypes from 'prop-types';
 
 import { connect } from 'react-redux';
 
+import app from 'firebase/app';
 import { loginUser } from '../actions/loginActions';
 import { getLoginState, isAuthenticated } from '../selectors/loginSelectors';
-import app from 'firebase/app';
-
 
 import { Button, ButtonColor } from '../ui/Button';
 import Firebase from './Firebase';
 import logo from '../images/login-office.jpeg';
 import logo2 from '../images/cardinal_logo.svg';
+import { toast } from 'react-toastify';
+toast.configure();
 
 
 export class LoginPage extends React.Component {
@@ -30,20 +31,22 @@ export class LoginPage extends React.Component {
   };
 
   setVerificationCode = () => {
-    var verifyCode = Math.floor(Math.random() * 9999 + 1);
+    var verifyCode = Math.floor(1000 + Math.random() * 9000);
     localStorage.setItem('verify-code', verifyCode);
     this.props.history.push('/verify_code');
-    return verifyCode
-  }
+    return verifyCode;
+  };
 
   sendMail = (email, code) => {
     window.Email.send({
-      SecureToken: process.env.REACT_APP_EMAIL_TOKEN,
+      Host : process.env.REACT_APP_EMAIL_HOST,
+      Username : process.env.REACT_APP_EMAIL_USER_NAME,
+      Password : process.env.REACT_APP_EMAIL_PASSWORD,
       To: email,
-      From: process.env.REACT_APP_FROM_EMAIL,
-      Subject: 'Verfication code',
-      Body: 'Your verification code ' + code,
-    })
+      From: process.env.REACT_APP_EMAIL_USER_NAME,
+      Subject: 'Two factor authentication code',
+      Body: `Your two factor authentication code ${code}`,
+    });
   };
 
   signInWithEmailAndPasswordHandler = (event, email, password) => {
@@ -52,28 +55,35 @@ export class LoginPage extends React.Component {
     firebase
       .doSignInWithEmailAndPassword(email, password)
       .then(() => {
-        const verifyCode = this.setVerificationCode()
+        const verifyCode = this.setVerificationCode();
         this.sendMail(email, verifyCode);
         this.setState({
-          loggedIn: true
-        })
+          loggedIn: true,
+        });
       })
       .catch(error => {
         this.setState({ erroMsg: 'Error signing in with password and email!' });
         console.error('Error signing in with password and email', error);
       });
   };
 
-
+  validateUser = email => email.includes(
+    process.env.REACT_APP_VERIFIED_EMAIL_SUBDOMAIN
+  );
 
   handleSubmit = () => {
     const firebase = new Firebase();
-    firebase.doSignInWithGoogle()
-      .then(() => {
-        const verifyCode = this.setVerificationCode()
-        this.sendMail(app.auth().currentUser.email, verifyCode)
-        this.props.history.push('/verify_code')
-      })
+    firebase.doSignInWithGoogle().then(data => {
+      if (this.validateUser(data.user.email)) {
+        const verifyCode = this.setVerificationCode();
+        this.sendMail(app.auth().currentUser.email, verifyCode);
+        this.props.history.push('/verify_code');
+      } else {
+        const error_msg = 'email sub-domain not allowed, only '+ process.env.REACT_APP_VERIFIED_EMAIL_SUBDOMAIN + ' allowed to login with Google.';
+        toast.error(error_msg);
+        this.props.history.push('/login');
+      }
+    });
   };
 
   render() {
@@ -88,13 +98,13 @@ export class LoginPage extends React.Component {
                 <img
                   aria-hidden="true"
                   className="object-cover w-full h-full dark:hidden"
-                  src={logo}
+                  src={ logo }
                   alt="Office"
                 />
                 <img
                   aria-hidden="true"
                   className="hidden object-cover w-full h-full dark:block"
-                  src={logo2}
+                  src={ logo2 }
                   alt="Office"
                 />
               </div>
@@ -109,10 +119,10 @@ export class LoginPage extends React.Component {
                       className="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
                       type="email"
                       name="userEmail"
-                      value={this.state.userEmail}
+                      value={ this.state.userEmail }
                       placeholder="E.g: faruq123@gmail.com"
                       id="userEmail"
-                      onChange={event => this.handleChange(event)}
+                      onChange={ event => this.handleChange(event) }
                     />
                   </label>
                   <label className="block mt-4 text-sm">
@@ -121,33 +131,35 @@ export class LoginPage extends React.Component {
                       className="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
                       type="password"
                       name="userPassword"
-                      value={this.state.userPassword}
+                      value={ this.state.userPassword }
                       placeholder="Your Password"
                       id="userPassword"
-                      onChange={event => this.handleChange(event)}
+                      onChange={ event => this.handleChange(event) }
                     />
                   </label>
 
                   <a
                     className="block w-full px-4 py-2 mt-4 text-sm font-medium leading-5 text-center text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-lg active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
                     href="../index.html"
-                    onClick={event => {
+                    onClick={ event => {
                       this.signInWithEmailAndPasswordHandler(
                         event,
                         this.state.userEmail,
                         this.state.userPassword
                       );
-                    }}
+                    } }
                   >
                     Log in
                   </a>
 
                   <hr className="my-8" />
                   <Button
                     className="flex items-center justify-center w-full px-4 py-2 mt-4 text-sm font-medium leading-5 text-white text-gray-700 transition-colors duration-150 border border-gray-300 rounded-lg dark:text-gray-400 active:bg-transparent hover:border-gray-500 focus:border-gray-500 active:text-gray-500 focus:outline-none focus:shadow-outline-gray"
-                    onClick={() => { this.handleSubmit() }}
-                    selected={loading}
-                    color={ButtonColor.Blue}
+                    onClick={ () => {
+                      this.handleSubmit();
+                    } }
+                    selected={ loading }
+                    color={ ButtonColor.Blue }
                   >
                     Login with Google
                   </Button>