File tree 5 files changed +9
-14
lines changed
mon-pix/app/authenticators
5 files changed +9
-14
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
4
4
import fetch from 'fetch' ;
5
5
import ENV from 'pix-admin/config/environment' ;
6
6
import { decodeToken } from 'pix-admin/helpers/jwt' ;
7
- import RSVP from 'rsvp' ;
8
7
9
8
export default class OidcAuthenticator extends BaseAuthenticator {
10
9
@service session ;
@@ -47,7 +46,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
47
46
48
47
const data = await response . json ( ) ;
49
48
if ( ! response . ok ) {
50
- return RSVP . reject ( data ) ;
49
+ return Promise . reject ( data ) ;
51
50
}
52
51
53
52
const decodedAccessToken = decodeToken ( data . access_token ) ;
@@ -61,7 +60,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
61
60
}
62
61
63
62
restore ( data ) {
64
- return new RSVP . Promise ( ( resolve , reject ) => {
63
+ return new Promise ( ( resolve , reject ) => {
65
64
if ( ! isEmpty ( data [ 'access_token' ] ) ) {
66
65
resolve ( data ) ;
67
66
}
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
4
4
import fetch from 'fetch' ;
5
5
import ENV from 'mon-pix/config/environment' ;
6
6
import { decodeToken } from 'mon-pix/helpers/jwt' ;
7
- import RSVP from 'rsvp' ;
8
7
9
8
export default BaseAuthenticator . extend ( {
10
9
intl : service ( ) ,
@@ -31,7 +30,7 @@ export default BaseAuthenticator.extend({
31
30
32
31
const data = await response . json ( ) ;
33
32
if ( ! response . ok ) {
34
- return RSVP . reject ( data ) ;
33
+ return Promise . reject ( data ) ;
35
34
}
36
35
37
36
const decodedAccessToken = decodeToken ( data . access_token ) ;
@@ -43,7 +42,7 @@ export default BaseAuthenticator.extend({
43
42
} ,
44
43
45
44
restore ( data ) {
46
- return new RSVP . Promise ( ( resolve , reject ) => {
45
+ return new Promise ( ( resolve , reject ) => {
47
46
if ( ! isEmpty ( data [ 'access_token' ] ) ) {
48
47
resolve ( data ) ;
49
48
}
Original file line number Diff line number Diff line change 1
1
import { isEmpty } from '@ember/utils' ;
2
2
import BaseAuthenticator from 'ember-simple-auth/authenticators/base' ;
3
3
import { decodeToken } from 'mon-pix/helpers/jwt' ;
4
- import RSVP from 'rsvp' ;
5
4
6
5
export default class GarAuthenticator extends BaseAuthenticator {
7
6
authenticate ( token , tokenDecoder = decodeToken ) {
8
7
const token_type = 'bearer' ;
9
8
const { user_id, source } = tokenDecoder ( token ) ;
10
- return RSVP . resolve ( {
9
+ return Promise . resolve ( {
11
10
token_type,
12
11
access_token : token ,
13
12
user_id,
@@ -16,7 +15,7 @@ export default class GarAuthenticator extends BaseAuthenticator {
16
15
}
17
16
18
17
restore ( data ) {
19
- return new RSVP . Promise ( ( resolve , reject ) => {
18
+ return new Promise ( ( resolve , reject ) => {
20
19
if ( ! isEmpty ( data [ 'access_token' ] ) ) {
21
20
resolve ( data ) ;
22
21
}
Original file line number Diff line number Diff line change 1
1
import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant' ;
2
2
import ENV from 'mon-pix/config/environment' ;
3
3
import { decodeToken } from 'mon-pix/helpers/jwt' ;
4
- import RSVP from 'rsvp' ;
5
4
6
5
export default class OAuth2 extends OAuth2PasswordGrant {
7
6
serverTokenEndpoint = `${ ENV . APP . API_HOST } /api/token` ;
@@ -14,7 +13,7 @@ export default class OAuth2 extends OAuth2PasswordGrant {
14
13
const decodedAccessToken = decodeToken ( token ) ;
15
14
const user_id = decodedAccessToken . user_id ;
16
15
const source = decodedAccessToken . source ;
17
- return RSVP . resolve ( {
16
+ return Promise . resolve ( {
18
17
token_type,
19
18
access_token : token ,
20
19
user_id,
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
4
4
import fetch from 'fetch' ;
5
5
import ENV from 'mon-pix/config/environment' ;
6
6
import { decodeToken } from 'mon-pix/helpers/jwt' ;
7
- import RSVP from 'rsvp' ;
8
7
9
8
export default class OidcAuthenticator extends BaseAuthenticator {
10
9
@service intl ;
@@ -49,7 +48,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
49
48
50
49
const data = await response . json ( ) ;
51
50
if ( ! response . ok ) {
52
- return RSVP . reject ( data ) ;
51
+ return Promise . reject ( data ) ;
53
52
}
54
53
55
54
const decodedAccessToken = decodeToken ( data . access_token ) ;
@@ -65,7 +64,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
65
64
}
66
65
67
66
restore ( data ) {
68
- return new RSVP . Promise ( ( resolve , reject ) => {
67
+ return new Promise ( ( resolve , reject ) => {
69
68
if ( ! isEmpty ( data [ 'access_token' ] ) ) {
70
69
resolve ( data ) ;
71
70
}
You can’t perform that action at this time.
0 commit comments