improve error handling

Trott · Mar 22, 2013 · c6ed84e · c6ed84e
1 parent bfacfa4
commit c6ed84e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/server.js b/server.js
@@ -18,10 +18,14 @@ app.use(function (req, res, next) {
     "use strict";
 
     var apikeyMatches = false;
+
     if(req.headers.origin && req.query.apikey) {
-        //TODO: look up host in couchdb and only send the A-OK if it matches the origin header
         db.get(req.query.apikey, function (err, doc) {
+            if (err) return next(err);
+            console.log(doc.host);
+            console.log(req.headers.origin);
             if (doc.host === req.headers.origin) {
+                console.log('allowed');
                 res.header('Access-Control-Allow-Origin', req.headers.origin);
                 apikeyMatches = true;
 

diff --git a/static/UCSF.Person.js b/static/UCSF.Person.js
diff --git a/static/UCSF.Person.src.js b/static/UCSF.Person.src.js
@@ -36,7 +36,7 @@ var UCSF = (function () {
                                 if (XHRobj.status === 200 && success) {
                                     success(JSON.parse(XHRobj.responseText));
                                 } else {
-                                    failure(XHRobj.statusText);
+                                    failure(XHRobj);
                                 }
                             }
                         },
@@ -57,7 +57,7 @@ var UCSF = (function () {
 
         Person: {
             search: function (options, success, failure ) {
-                failure = failure || function (msg) {window.alert(msg);};
+                failure = failure || function (obj) {window.alert(obj.statusText||'An error occurred. Please try again.');};
                 var reqString = UCSF.createRequestString('http://apis.ucsf.edu/person/search', options);
                 var xhr = UCSF.createCORSRequest('GET', reqString, success, failure);
                 if (! xhr) {