Merge pull request #18 from microsoftgraph/patch-17

Refactored error code

Author: jasonjoh

demos/02-add-aad-auth/graph-tutorial/src/App.js

@@ -81,11 +81,24 @@ class App extends Component {
       await this.getUserProfile();
     }
     catch(err) {
-      var errParts = err.split('|');
+      var error = {};
+
+      if (typeof(err) === 'string') {
+        var errParts = err.split('|');
+        error = errParts.length > 1 ?
+          { message: errParts[1], debug: errParts[0] } :
+          { message: err };
+      } else {
+        error = {
+          message: err.message,
+          debug: JSON.stringify(err)
+        };
+      }
+
       this.setState({
         isAuthenticated: false,
         user: {},
-        error: { message: errParts[1], debug: errParts[0] }
+        error: error
       });
     }
   }

demos/03-add-msgraph/graph-tutorial/src/App.js

@@ -87,11 +87,24 @@ class App extends Component {
       await this.getUserProfile();
     }
     catch(err) {
-      var errParts = err.split('|');
+      var error = {};
+
+      if (typeof(err) === 'string') {
+        var errParts = err.split('|');
+        error = errParts.length > 1 ?
+          { message: errParts[1], debug: errParts[0] } :
+          { message: err };
+      } else {
+        error = {
+          message: err.message,
+          debug: JSON.stringify(err)
+        };
+      }
+
       this.setState({
         isAuthenticated: false,
         user: {},
-        error: { message: errParts[1], debug: errParts[0] }
+        error: error
       });
     }
   }

tutorial/04-add-aad-auth.md

@@ -74,11 +74,24 @@ async login() {
     await this.getUserProfile();
   }
   catch(err) {
-    var errParts = err.split('|');
+    var error = {};
+
+    if (typeof(err) === 'string') {
+      var errParts = err.split('|');
+      error = errParts.length > 1 ?
+        { message: errParts[1], debug: errParts[0] } :
+        { message: err };
+    } else {
+      error = {
+        message: err.message,
+        debug: JSON.stringify(err)
+      };
+    }
+
     this.setState({
       isAuthenticated: false,
       user: {},
-      error: { message: errParts[1], debug: errParts[0] }
+      error: error
     });
   }
 }