fix(Authorization): check if debug info exist

web-pal · Mar 19, 2018 · df86f22 · df86f22
1 parent 406c726
commit df86f22
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/app/sagas/auth.js b/app/sagas/auth.js
@@ -217,19 +217,21 @@ export function* basicAuthLoginForm(): Generator<*, void, *> {
       trackMixpanel('Jira login');
       incrementMixpanel('Jira login', 1);
     } catch (err) {
-      err.debug.options.auth.password = '***';
-      err.debug.request.headers.authorization = '***';
-      yield put(authActions.addAuthDebugMessage([
-        {
-          json: err.debug,
-        },
-      ]));
+      if (err.debug) {
+        err.debug.options.auth.password = '***';
+        err.debug.request.headers.authorization = '***';
+        yield put(authActions.addAuthDebugMessage([
+          {
+            json: err.debug,
+          },
+        ]));
+      }
       yield put(uiActions.setUiState('loginRequestInProcess', false));
       yield put(uiActions.setUiState(
         'loginError',
         'Can not authenticate user. Please try again',
       ));
-      yield call(throwError, err.result);
+      yield call(throwError, err.result ? err.result : err);
     }
   }
 }

diff --git a/yarn.lock b/yarn.lock
@@ -1604,16 +1604,16 @@ better-assert@~1.0.0:
     callsite "1.0.0"
 
 bfj-node4@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.2.1.tgz#3a6aa2730cf6911ba2afb836c2f88f015d718f3f"
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
   dependencies:
     bluebird "^3.5.1"
     check-types "^7.3.0"
     tryer "^1.0.0"
 
 big-integer@^1.6.17:
-  version "1.6.26"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.26.tgz#3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"
+  version "1.6.27"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.27.tgz#8e56c6f8b2dd6c4fe8d32102b83d4f25868e4b3a"
 
 big.js@^3.1.3:
   version "3.2.0"
@@ -1878,7 +1878,16 @@ builder-util-runtime@4.0.3:
     fs-extra-p "^4.5.0"
     sax "^1.2.4"
 
-builder-util-runtime@^4.0.3, builder-util-runtime@^4.0.5, builder-util-runtime@~4.0.3:
+builder-util-runtime@^4.0.3, builder-util-runtime@^4.0.5:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.1.0.tgz#7dcd042d555d2f161a5538d7a0ea8c292daa0683"
+  dependencies:
+    bluebird-lst "^1.0.5"
+    debug "^3.1.0"
+    fs-extra-p "^4.5.2"
+    sax "^1.2.4"
+
+builder-util-runtime@~4.0.3:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
   dependencies:
@@ -4248,7 +4257,7 @@ fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
-fs-extra-p@^4.5.0:
+fs-extra-p@^4.5.0, fs-extra-p@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.2.tgz#0a22aba489284d17f375d5dc5139aa777fe2df51"
   dependencies:
@@ -4890,8 +4899,8 @@ icss-utils@^2.1.0:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.9.tgz#13acbc76462de80959be14b2d4ac93b96761b195"
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.10.tgz#719a6f7b026831e64bdb838b0de1bb0029bbf716"
 
 ignore-by-default@^1.0.1:
   version "1.0.1"