From 715b91ab967e6aca2182dd3d3cccc77033a1bac1 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 21 Mar 2017 23:05:14 -0400
Subject: [PATCH] update all the things

---
 gulpfile.js         |  4 ++--
 package.json        | 55 ++++++++++++++++++++++-----------------------
 src/app/config.js   | 19 ++++++++++------
 src/index.html      | 10 ++++-----
 src/less/theme.less |  2 +-
 src/less/vault.less |  7 ++++--
 6 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 5469d62476..1aee077b4d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -108,8 +108,8 @@ gulp.task('lib', ['clean:lib'], function () {
             dest: paths.libDir + 'angular'
         },
         {
-            src: paths.npmDir + 'angular-bootstrap-npm/dist/*tpls*.js',
-            dest: paths.libDir + 'angular-bootstrap'
+            src: paths.npmDir + 'angular-ui-bootstrap/dist/*tpls*.js',
+            dest: paths.libDir + 'angular-ui-bootstrap'
         },
         {
             src: paths.npmDir + 'angular-bootstrap-show-errors/src/*.js',
diff --git a/package.json b/package.json
index 5d7b4d8fe2..e64fa6e1db 100644
--- a/package.json
+++ b/package.json
@@ -3,45 +3,44 @@
   "version": "1.9.1",
   "production": true,
   "devDependencies": {
-    "connect": "3.4.1",
-    "lodash": "4.13.1",
+    "connect": "3.6.0",
+    "lodash": "4.17.4",
     "gulp": "3.9.1",
-    "gulp-concat": "2.6.0",
+    "gulp-concat": "2.6.1",
     "gulp-cssmin": "0.1.7",
-    "gulp-less": "3.1.0",
+    "gulp-less": "3.3.0",
     "gulp-rename": "1.2.2",
-    "gulp-uglify": "1.5.3",
+    "gulp-uglify": "2.1.2",
     "gulp-gh-pages": "0.5.4",
     "gulp-preprocess": "2.0.0",
     "gulp-ng-annotate": "2.0.0",
-    "gulp-ng-config": "1.3.1",
+    "gulp-ng-config": "1.4.0",
     "gulp-connect": "5.0.0",
-    "jshint": "2.9.2",
-    "gulp-jshint": "2.0.1",
-    "rimraf": "2.5.2",
-    "run-sequence": "1.2.1",
-    "merge-stream": "1.0.0",
+    "jshint": "2.9.4",
+    "gulp-jshint": "2.0.4",
+    "rimraf": "2.6.1",
+    "run-sequence": "1.2.2",
+    "merge-stream": "1.0.1",
     "jquery": "2.2.4",
-    "font-awesome": "4.6.3",
-    "bootstrap": "3.3.6",
-    "angular": "1.5.6",
-    "angular-resource": "1.5.6",
-    "angular-bootstrap-npm": "0.14.3",
-    "angular-ui-router": "0.3.1",
-    "angular-jwt": "0.0.9",
-    "angular-cookies": "1.5.6",
-    "admin-lte": "2.3.5",
+    "font-awesome": "4.7.0",
+    "bootstrap": "3.3.7",
+    "angular": "1.6.3",
+    "angular-resource": "1.6.3",
+    "angular-ui-bootstrap": "2.5.0",
+    "angular-ui-router": "0.4.2",
+    "angular-jwt": "0.1.9",
+    "angular-cookies": "1.6.3",
+    "admin-lte": "2.3.11",
     "angular-md5": "0.1.10",
-    "angular-toastr": "1.7.0",
+    "angular-toastr": "2.1.1",
     "angular-bootstrap-show-errors": "2.3.0",
-    "angular-messages": "1.5.6",
-    "ngstorage": "0.3.10",
-    "papaparse": "4.1.2",
-    "toastr": "2.1.2",
-    "clipboard": "1.5.12",
+    "angular-messages": "1.6.3",
+    "ngstorage": "0.3.11",
+    "papaparse": "4.2.0",
+    "clipboard": "1.6.1",
     "ngclipboard": "1.1.1",
-    "angulartics": "1.1.2",
-    "angulartics-google-analytics": "0.2.1",
+    "angulartics": "1.4.0",
+    "angulartics-google-analytics": "0.4.0",
     "node-forge": "0.7.0",
     "webpack-stream": "3.2.0"
   }
diff --git a/src/app/config.js b/src/app/config.js
index d208ed797a..d7815d51df 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -1,12 +1,17 @@
 angular
     .module('bit')
 
-    .config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, $uibTooltipProvider,
-        toastrConfig) {
-        jwtInterceptorProvider.urlParam = 'access_token2';
+    .config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider,
+        $uibTooltipProvider, toastrConfig, $locationProvider, $qProvider) {
+        $qProvider.errorOnUnhandledRejections(false);
+        $locationProvider.hashPrefix('');
+        jwtOptionsProvider.config({
+            urlParam: 'access_token2',
+            whiteListedDomains: ['api.bitwarden.com', 'localhost']
+        });
         var refreshPromise;
-        jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (config, appSettings, tokenService, apiService, jwtHelper, $q) {
-            if (config.url.indexOf(appSettings.apiUri) !== 0) {
+        jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, appSettings, tokenService, apiService, jwtHelper, $q) {
+            if (options.url.indexOf(appSettings.apiUri) !== 0) {
                 return;
             }
 
@@ -68,7 +73,7 @@ angular
         $urlRouterProvider.otherwise('/');
 
         $stateProvider
-        // Backend
+            // Backend
             .state('backend', {
                 templateUrl: 'app/views/backendLayout.html',
                 abstract: true,
@@ -133,7 +138,7 @@ angular
                 data: { pageTitle: 'Subvaults' }
             })
 
-        // Frontend
+            // Frontend
             .state('frontend', {
                 templateUrl: 'app/views/frontendLayout.html',
                 abstract: true,
diff --git a/src/index.html b/src/index.html
index 098ff4a6c0..a236aa78be 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,11 +8,11 @@
     <title page-title>bitwarden.com Password Manager</title>
 
     <!-- @if true !>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
     <meta name="x-stylesheet-test-bs" content="" class="invisible" />
     <script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName('SCRIPT'),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}('visibility','hidden',['lib\/bootstrap\/css\/bootstrap.min.css?v=<!-- @echo cacheTag !>']);</script>
 
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" />
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
     <meta name="x-stylesheet-test-fa" content="" class="fa" />
     <script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName('SCRIPT'),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}('font-family','FontAwesome',['lib\/font-awesome\/css\/font-awesome.min.css?v=<!-- @echo cacheTag !>']);</script>
 
@@ -32,10 +32,10 @@
     <script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
     <script>(window.jQuery||document.write('<script src="lib\/jquery\/jquery.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
 
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script>((window.jQuery&&window.jQuery.fn&&window.jQuery.fn.modal)||document.write('<script src="lib\/bootstrap\/js\/bootstrap.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
 
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"></script>
     <script>(window.angular||document.write('<script src="lib\/angular\/angular.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
 
     <script src="js/lib.min.js?v=<!-- @echo cacheTag !>"></script>
@@ -65,7 +65,7 @@
     <script src="lib/angular-jwt/angular-jwt.js"></script>
     <script src="lib/angular-resource/angular-resource.js"></script>
     <script src="lib/angular-ui-router/angular-ui-router.js"></script>
-    <script src="lib/angular-bootstrap/angular-bootstrap-tpls.js"></script>
+    <script src="lib/angular-ui-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="lib/angular-md5/angular-md5.js"></script>
     <script src="lib/angular-toastr/angular-toastr.tpls.js"></script>
     <script src="lib/angular-bootstrap-show-errors/showErrors.js"></script>
diff --git a/src/less/theme.less b/src/less/theme.less
index 12f53a69a7..d136932c9c 100644
--- a/src/less/theme.less
+++ b/src/less/theme.less
@@ -1,5 +1,5 @@
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,300italic,400italic,600italic);
-@import "../../node_modules/toastr/toastr.less";
+@import "../../node_modules/angular-toastr/src/toastr.less";
 
 /* Start AdminLTE */
 
diff --git a/src/less/vault.less b/src/less/vault.less
index 5f77146881..7978e8074a 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -187,8 +187,7 @@ form .btn .loading-icon {
         }
     }
 
-    > .toast {
-        background-image: none !important;
+    .toast {
         .border-radius(0);
         .boxShadow(0 0 8px rgba(0, 0, 0, 0.5));
 
@@ -197,6 +196,7 @@ form .btn .loading-icon {
         }
 
         &.toast-danger, &.toast-error {
+            background-image: none !important;
             &:extend(.bg-red);
 
             &:before {
@@ -205,6 +205,7 @@ form .btn .loading-icon {
         }
 
         &.toast-warning {
+            background-image: none !important;
             &:extend(.bg-yellow);
 
             &:before {
@@ -213,6 +214,7 @@ form .btn .loading-icon {
         }
 
         &.toast-info {
+            background-image: none !important;
             &:extend(.bg-aqua);
 
             &:before {
@@ -221,6 +223,7 @@ form .btn .loading-icon {
         }
 
         &.toast-success {
+            background-image: none !important;
             &:extend(.bg-green);
 
             &:before {