File tree 3 files changed +20
-17
lines changed
3 files changed +20
-17
lines changed Original file line number Diff line number Diff line change 36
36
< script src ="node_modules/angularjs-color-picker/dist/angularjs-color-picker.min.js "> </ script >
37
37
<!-- main app file -->
38
38
< script src ="js/app.js "> </ script >
39
- <!-- constance -->
39
+ <!-- http config -->
40
40
< script src ="js/httpConfig.js "> </ script >
41
41
<!-- controllers -->
42
42
< script src ="js/controllers/mainCtrl.js "> </ script >
46
46
< script src ="js/services/colorChangerService.js "> </ script >
47
47
< script src ="js/services/stateService.js "> </ script >
48
48
< script src ="js/services/registerService.js "> </ script >
49
+ < script src ="js/services/authInterceptorService.js "> </ script >
50
+ < script src ="js/services/authService.js "> </ script >
49
51
<!-- directives -->
50
52
< script src ="js/directives/topbar.js "> </ script >
51
53
< script src ="js/directives/modalOverlay.js "> </ script >
Original file line number Diff line number Diff line change 5
5
baseUrl : 'http://localhost:3000/api'
6
6
} ;
7
7
8
+ Configure . $inject = [ '$httpProvider' ] ;
9
+
10
+ function Configure ( $httpProvider ) {
11
+ $httpProvider . interceptors . push ( 'authInterceptorService' ) ;
12
+ }
13
+
8
14
angular
9
15
. module ( 'app' )
10
- . constant ( 'httpConfig' , Constant ) ;
16
+ . constant ( 'httpConfig' , Constant )
17
+ . config ( Configure ) ;
18
+
11
19
} ) ( ) ;
Original file line number Diff line number Diff line change 5
5
. module ( 'app' )
6
6
. factory ( 'authInterceptorService' , Factory ) ;
7
7
8
- Factory . $inject = [ '$q' , '$injector' , '$ localForage'] ;
8
+ Factory . $inject = [ '$q' , '$localForage' ] ;
9
9
10
- function Factory ( $q , $injector , $ localForage) {
10
+ function Factory ( $q , $localForage ) {
11
11
return {
12
- request : function ( config ) {
12
+ request : config => {
13
13
14
14
config . headers = config . headers || { } ;
15
- let deferred = $q . defer ( ) ;
16
-
17
- if ( config . url === 'https://api.cloudinary.com/v1_1/ingametrade/upload' ) {
18
- deferred . resolve ( config ) ;
19
- }
15
+ const deferred = $q . defer ( ) ;
20
16
21
17
if ( config . url . indexOf ( 'api' ) !== - 1 ) {
22
18
$localForage . getItem ( 'authorization' )
23
- . then ( function ( authData ) {
24
- if ( authData ) {
19
+ . then ( authData => {
20
+ if ( authData ) {
25
21
config . headers . Authorization = authData . token ;
26
22
deferred . resolve ( config ) ;
27
23
} else {
28
24
console . log ( 'there is no token yet' ) ;
29
25
deferred . resolve ( config ) ;
30
26
}
31
- } , function ( ) {
32
- console . log ( "error with getting authorization localForage in interceptor" ) ;
33
- deferred . resolve ( config ) ;
34
- }
35
- ) ;
27
+ } )
28
+ . catch ( ( ) => { deferred . resolve ( config ) } ) ;
36
29
} else {
37
30
deferred . resolve ( config ) ;
38
31
}
You can’t perform that action at this time.
0 commit comments