Merge pull request #287 from ianmcorvidae/trim-prefs-errors

Trim the :error key in preferences when other keys are present

src/terrain/routes/schemas/bootstrap.clj

@@ -35,8 +35,7 @@
 
 (defschema UserPreferencesResponse
   (doc-only (conditional :error BootstrapServiceError
-                         :else Any)
-                         ;; :else user-prefs-schema/UserPreferencesResponse) ;; wasn't working for some reason
+                         :else user-prefs-schema/UserPreferencesResponse)
             user-prefs-schema/UserPreferencesResponseDocs))
 
 (defschema UserSessionResponse
@@ -49,5 +48,4 @@
    :session     UserSessionResponse
    :apps_info   AppsBootstrapResponse
    :data_info   DataInfoResponse
-   :preferences (conditional :error BootstrapServiceError
-                             :else Any)}) ;; I don't know why but UserPreferencesResponse isn't working
+   :preferences UserPreferencesResponse})

src/terrain/services/bootstrap.clj

@@ -50,7 +50,10 @@
 (defn- get-user-prefs
   [username]
   (trap-bootstrap-request
-   #(prefs/user-prefs username)))
+   #(let [prefs (prefs/user-prefs username)]
+      (if (and (:error prefs) (:default_output_folder prefs)) ;; if we've got both, there's an error stored in preferences. remove it so schema validation works right
+        (dissoc prefs :error)
+        prefs))))
 
 (defn bootstrap
   "This service obtains information about and initializes the workspace for the authenticated user.