Merge pull request #9 from KevinAst/next5

streamline index.js, complete auth service mock, and misc

.eslintrc

@@ -1,5 +1,8 @@
 {
   "extends": ["expo", "plugin:react/recommended"],
+  "env": {
+    "browser": true, // 1/25/2019 added this to eliminate complaints about setTimeout() not being defined
+  },
   "rules": {
     "react/prop-types":              "off",  // relax react prop-types validation
     "babel/object-curly-spacing":    "off",  // relax spacing inside braces

src/features/index.js

@@ -1,22 +1,65 @@
-import init        from './init';
-import views       from './views';
-import services    from './services';
-import support     from './support';
-import diag        from './diag';
-
-/**
- * The **eatery-nod** application is composed of the following **features**:
- *
- * - **init**:         a collection of **"Initialization Related"** features
- * - **views**:        a collection of **"UI Related"** features
- * - **services**:     a collection of **"Service Related"** features _(some of which are "mockable")_
- * - **support**:      a collection of **"Support Utility"** features
- * - **diag**:         a collection of **"Diagnostic Related"** features
- */
+import device                        from './init/device/feature';
+import auth                          from './init/auth/feature';
+
+import eateries                      from './views/eateries/feature';
+import discovery                     from './views/discovery/feature';
+import leftNav                       from './views/leftNav/feature';
+import currentView                   from './views/currentView/feature';
+
+import deviceService                 from './services/deviceService/feature';
+
+import authService                   from './services/authService/feature';
+import authServiceFirebase           from './services/authService/authServiceFirebase/feature';
+import authServiceMock               from './services/authService/authServiceMock/feature';
+
+import eateryService                 from './services/eateryService/feature';
+import eateryServiceFirebase         from './services/eateryService/eateryServiceFirebase/feature';
+import eateryServiceMock             from './services/eateryService/eateryServiceMock/feature';
+
+import discoveryService              from './services/discoveryService/feature';
+import discoveryServiceGooglePlaces  from './services/discoveryService/discoveryServiceGooglePlaces/feature';
+import discoveryServiceMock          from './services/discoveryService/discoveryServiceMock/feature';
+
+import bootstrap                     from './support/bootstrap/feature';
+import firebaseInit                  from './support/firebaseInit/feature';
+
+import logActions                    from './diag/logActions/feature';
+import sandbox                       from './diag/sandbox/feature';
+
+// accumulate ALL features
+// ... see README.md for details
 export default [
-  ...init,
-  ...views,
-  ...services,
-  ...support,
-  ...diag,
+
+  // ... init
+  device,
+  auth,
+
+  // ... views
+  eateries,
+  discovery,
+  leftNav,
+  currentView,
+
+  // ... services
+  deviceService,
+
+  authService,
+  authServiceFirebase,
+  authServiceMock,
+
+  eateryService,
+  eateryServiceFirebase,
+  eateryServiceMock,
+
+  discoveryService,
+  discoveryServiceGooglePlaces,
+  discoveryServiceMock,
+
+  // ... support
+  bootstrap,
+  firebaseInit,
+
+  // ... diag
+  logActions,
+  sandbox,
 ];

src/features/init/auth/logic.js

@@ -4,6 +4,7 @@ import _auth                from './featureName';
 import _authAct             from './actions';
 import signInFormMeta       from './signInFormMeta';
 import discloseError        from '../../../util/discloseError';
+import {toast}              from '../../../util/notify';
 
 /**
  * Start our authorization process, once the bootstrap initialization process is complete.
@@ -197,6 +198,7 @@ export const checkEmailVerified = createLogic({
 
   transform({getState, action, fassets}, next, reject) {
 
+    toast({ msg:`verifying your email: ${fassets.sel.curUser(getState()).email}` });
     // fetch the most up-to-date user
     fassets.authService.refreshUser()
            .then( user => {
@@ -225,6 +227,7 @@ export const resendEmailVerification = createLogic({
   type: String(_authAct.signIn.resendEmailVerification),
 
   transform({getState, action, fassets}, next) {
+    toast({ msg:`resending email to: ${fassets.sel.curUser(getState()).email}` });
     fassets.authService.resendEmailVerification()
     next(action);
   },

src/features/services/authService/User.js

@@ -45,7 +45,7 @@ export default class User {
     // ... unrecognized named parameter
     const unknownArgKeys = Object.keys(unknownArgs);
     check(unknownArgKeys.length === 0,  `unrecognized named parameter(s): ${unknownArgKeys}`);
-    // ... unrecognized positional parameter (NOTE: when defaulting entire struct, arguents.length is 0)
+    // ... unrecognized positional parameter (NOTE: when defaulting entire struct, arguments.length is 0)
     check(arguments.length === 0 || arguments.length === 1, 'unrecognized positional parameters (only named parameters can be specified)');
 
     // retain supplied state in self
@@ -119,4 +119,13 @@ export default class User {
     };
   }
 
+  /**
+   * Clone self into a new User object
+   * 
+   * @returns {User} the new cloned User object.
+   */
+  clone() {
+    return new User(this.toStruct());
+  }
+
 };

src/features/services/authService/authServiceFirebase/AuthServiceFirebase.js

@@ -82,7 +82,7 @@ export default class AuthServiceFirebase extends AuthServiceAPI {
                 if (err.code) { // expected condition
                   err.defineUserMsg('Invalid SignIn credentials.'); // make generic ... do NOT expose err.code to the user
                 }
-                else { // unexpected conition
+                else { // unexpected condition
                   err.defineAttemptingToMsg('sign in to eatery-nod');
                 }
                 return reject(err);

src/features/services/authService/authServiceMock/AuthServiceMock.js

@@ -21,28 +21,36 @@ export default class AuthServiceMock extends AuthServiceAPI {
     return new Promise( (resolve, reject) => {
 
       // stimulate various errors with variations in email/pass
-      if (pass === 'unexpect') { // <<< unexpected condition
+      if (pass === 'unexpect') { // ... unexpected condition
         return reject(
           new Error(`***ERROR*** Simulated Unexpected Condition`)
             .defineAttemptingToMsg('sign in to eatery-nod')
         );
       }
 
-      if (pass === 'expect') { // <<< expected condition
+      if (pass === 'expect') { // ... expected condition
         return reject(
           new Error(`***ERROR*** Invalid Password`) // do NOT expose details to the user (e.g. Invalid Password)
             .defineUserMsg('Invalid SignIn credentials.') // keep generic
             .defineAttemptingToMsg('sign in to eatery-nod')
         );
       }
 
-      // very simple mock ... sign in the supplied user
+      // define our mock user
       this.currentAppUser = new User({
-        "name": "MockGuy",
-        "email": email,
-        "emailVerified": true,
-        "pool": "mock"
+        "name":          "MockGuy",
+        email,
+        "emailVerified": false,
+        "pool":          "mock"
       });
+
+      // sign in the supplied user
+      if (pass === 'unverify') { // ... simulate user unverified
+        return resolve(this.currentAppUser);
+      }
+
+      // ... all other cases: user is verified
+      this.currentAppUser.emailVerified = true;
       return resolve(this.currentAppUser);
 
     });
@@ -51,14 +59,9 @@ export default class AuthServiceMock extends AuthServiceAPI {
 
   refreshUser() { // ... see AuthServiceAPI
     return new Promise( (resolve, reject) => {
-
-      // very simple mock ... sign in the supplied user
-      this.currentAppUser = new User({
-        "name": "MockGuy",
-        "email": email,
-        "emailVerified": true,
-        "pool": "mock"
-      });
+      // very simple mock ... assume they have now been verified
+      this.currentAppUser = this.currentAppUser.clone();
+      this.currentAppUser.emailVerified = true;
       return resolve(this.currentAppUser);
 
     });

src/features/services/deviceService/DeviceService.js

@@ -21,30 +21,8 @@ export default class DeviceService {
    * Instantiate the DeviceService service object.
    */
   constructor() {
-
-    // conditionally mock getCurPos(), as directed by featureFlags
-    if (featureFlags.mockGPS) {
-
-      const GlenCarbonIL = {lat: 38.752209, lng: -89.986610};
-      const defaultLoc   = GlenCarbonIL;
-      const mockLoc      = featureFlags.mockGPS.lat ? featureFlags.mockGPS : defaultLoc;
-
-      this.getCurPos = () => { // override method with our mock
-        // console.log(`xx DeviceService.getCurPos() request ... mocked to: `, mockLoc);
-        return new Promise( (resolve, reject) => {
-        //setTimeout(() => { // TEMPORARY: for testing delay just a bit
-
-            // TEMPORARY: for testing, simulate error condition
-            //            ... NOTE: reject() passes error into .catch(), throw does NOT
-            // return reject(new Error('Simulated Error in Expo GPS Location acquisition') );
-
-            // communicate device location
-            return resolve(mockLoc);
-        //}, 10000); // TEMPORARY: for testing delay just a bit
-        });
-      };
-    }
-
+    // conditionally mock various service methods, as directed by featureFlags
+    mock_getCurPos_asNeeded(this);
   }
 
 
@@ -64,7 +42,7 @@ export default class DeviceService {
         //            ... NOTE: reject() passes error into .catch(), throw does NOT
         // return reject( new Error('Simulated Error in Expo Font.loadAsync()') );
 
-        // load needed custome fonts for NativeBase UI
+        // load needed custom fonts for NativeBase UI
         Font.loadAsync({'Roboto':        require('native-base/Fonts/Roboto.ttf'),
                         'Roboto_medium': require('native-base/Fonts/Roboto_medium.ttf'),
                       })
@@ -199,4 +177,32 @@ export default class DeviceService {
     });
   }
 
-};
+}
+
+
+// conditionally mock getCurPos(), as directed by featureFlags
+function mock_getCurPos_asNeeded(deviceService) {
+
+  if (featureFlags.mockGPS) { // ... if requested by featureFlags
+
+    const GlenCarbonIL = {lat: 38.752209, lng: -89.986610};
+    const defaultLoc   = GlenCarbonIL;
+    const mockLoc      = featureFlags.mockGPS.lat ? featureFlags.mockGPS : defaultLoc;
+
+    deviceService.getCurPos = () => { // override method with our mock
+      // console.log(`xx DeviceService.getCurPos() request ... mocked to: `, mockLoc);
+      return new Promise( (resolve, reject) => {
+        //setTimeout(() => { // TEMPORARY: for testing delay just a bit
+
+        // TEMPORARY: for testing, simulate error condition
+        //            ... NOTE: reject() passes error into .catch(), throw does NOT
+        // return reject(new Error('Simulated Error in Expo GPS Location acquisition') );
+
+        // communicate device location
+        return resolve(mockLoc);
+        //}, 10000); // TEMPORARY: for testing delay just a bit
+      });
+    };
+  }
+
+}