From f4bac9cffb13a1229adb10b34bec9ac77b2f184f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin <kyle.spearrin@gmail.com> Date: Wed, 21 Sep 2016 12:04:40 -0400 Subject: [PATCH] remove angular jwt lib --- gulpfile.js | 4 ---- package.json | 1 - src/popup/app/config.js | 20 +------------------- src/popup/index.html | 1 - 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index d5b778aa7e..e662ba0d10 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -73,10 +73,6 @@ gulp.task('lib', ['clean:lib'], function () { src: paths.npmDir + 'angular-ui-bootstrap/dist/*tpls*.js', dest: paths.libDir + 'angular-ui-bootstrap' }, - { - src: paths.npmDir + 'angular-jwt/dist/*.js', - dest: paths.libDir + 'angular-jwt' - }, { src: paths.npmDir + 'angular-ui-router/release/*.js', dest: paths.libDir + 'angular-ui-router' diff --git a/package.json b/package.json index 18119ce176..7c2210495e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "0.0.1", "devDependencies": { "sjcl": "1.0.3", - "angular-jwt": "0.0.9", "jquery": "2.2.4", "bootstrap": "3.3.7", "font-awesome": "4.6.3", diff --git a/src/popup/app/config.js b/src/popup/app/config.js index 20db55133c..cd88583b19 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -1,16 +1,7 @@ angular .module('bit') - .config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, toastrConfig) { - jwtInterceptorProvider.urlParam = 'access_token'; - jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (config, appSettings, tokenService) { - if (config.url.indexOf(appSettings.apiUri) === 0) { - tokenService.getToken(function (token) { - return token; - }); - } - }; - + .config(function ($stateProvider, $urlRouterProvider, toastrConfig) { angular.extend(toastrConfig, { closeButton: true, progressBar: true, @@ -18,15 +9,6 @@ positionClass: 'toast-bottom-center' }); - if ($httpProvider.defaults.headers.post) { - $httpProvider.defaults.headers.post = {}; - } - - $httpProvider.defaults.headers.post['Content-Type'] = 'text/plain; charset=utf-8'; - - //$httpProvider.interceptors.push('apiInterceptor'); - $httpProvider.interceptors.push('jwtInterceptor'); - $urlRouterProvider.otherwise(function ($injector, $location) { var $state = $injector.get('$state'); $state.go('home'); diff --git a/src/popup/index.html b/src/popup/index.html index 85711fbaa3..916c3a35a9 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -20,7 +20,6 @@ <script src="../lib/angular/angular.js"></script> <script src="../lib/angular-animate/angular-animate.js"></script> <script src="../lib/angular-ui-router/angular-ui-router.js"></script> - <script src="../lib/angular-jwt/angular-jwt.js"></script> <script src="../lib/angular-toastr/angular-toastr.tpls.js"></script> <script src="../lib/ngclipboard/ngclipboard.js"></script> <script src="../lib/sweetalert/SweetAlert.js"></script>