Skip to content

Commit d4f81a4

Browse files
[TECH] Suppression de l'utilisation de la dependency RSVP partout où on peut immédiatement la remplacer par Promise (PIX-15814)
#10841
2 parents fa5773b + 4404721 commit d4f81a4

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

Diff for: admin/app/authenticators/oidc.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
44
import fetch from 'fetch';
55
import ENV from 'pix-admin/config/environment';
66
import { decodeToken } from 'pix-admin/helpers/jwt';
7-
import RSVP from 'rsvp';
87

98
export default class OidcAuthenticator extends BaseAuthenticator {
109
@service session;
@@ -47,7 +46,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
4746

4847
const data = await response.json();
4948
if (!response.ok) {
50-
return RSVP.reject(data);
49+
return Promise.reject(data);
5150
}
5251

5352
const decodedAccessToken = decodeToken(data.access_token);
@@ -61,7 +60,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
6160
}
6261

6362
restore(data) {
64-
return new RSVP.Promise((resolve, reject) => {
63+
return new Promise((resolve, reject) => {
6564
if (!isEmpty(data['access_token'])) {
6665
resolve(data);
6766
}

Diff for: mon-pix/app/authenticators/anonymous.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
44
import fetch from 'fetch';
55
import ENV from 'mon-pix/config/environment';
66
import { decodeToken } from 'mon-pix/helpers/jwt';
7-
import RSVP from 'rsvp';
87

98
export default BaseAuthenticator.extend({
109
intl: service(),
@@ -31,7 +30,7 @@ export default BaseAuthenticator.extend({
3130

3231
const data = await response.json();
3332
if (!response.ok) {
34-
return RSVP.reject(data);
33+
return Promise.reject(data);
3534
}
3635

3736
const decodedAccessToken = decodeToken(data.access_token);
@@ -43,7 +42,7 @@ export default BaseAuthenticator.extend({
4342
},
4443

4544
restore(data) {
46-
return new RSVP.Promise((resolve, reject) => {
45+
return new Promise((resolve, reject) => {
4746
if (!isEmpty(data['access_token'])) {
4847
resolve(data);
4948
}

Diff for: mon-pix/app/authenticators/gar.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { isEmpty } from '@ember/utils';
22
import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
33
import { decodeToken } from 'mon-pix/helpers/jwt';
4-
import RSVP from 'rsvp';
54

65
export default class GarAuthenticator extends BaseAuthenticator {
76
authenticate(token, tokenDecoder = decodeToken) {
87
const token_type = 'bearer';
98
const { user_id, source } = tokenDecoder(token);
10-
return RSVP.resolve({
9+
return Promise.resolve({
1110
token_type,
1211
access_token: token,
1312
user_id,
@@ -16,7 +15,7 @@ export default class GarAuthenticator extends BaseAuthenticator {
1615
}
1716

1817
restore(data) {
19-
return new RSVP.Promise((resolve, reject) => {
18+
return new Promise((resolve, reject) => {
2019
if (!isEmpty(data['access_token'])) {
2120
resolve(data);
2221
}

Diff for: mon-pix/app/authenticators/oauth2.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant';
22
import ENV from 'mon-pix/config/environment';
33
import { decodeToken } from 'mon-pix/helpers/jwt';
4-
import RSVP from 'rsvp';
54

65
export default class OAuth2 extends OAuth2PasswordGrant {
76
serverTokenEndpoint = `${ENV.APP.API_HOST}/api/token`;
@@ -14,7 +13,7 @@ export default class OAuth2 extends OAuth2PasswordGrant {
1413
const decodedAccessToken = decodeToken(token);
1514
const user_id = decodedAccessToken.user_id;
1615
const source = decodedAccessToken.source;
17-
return RSVP.resolve({
16+
return Promise.resolve({
1817
token_type,
1918
access_token: token,
2019
user_id,

Diff for: mon-pix/app/authenticators/oidc.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
44
import fetch from 'fetch';
55
import ENV from 'mon-pix/config/environment';
66
import { decodeToken } from 'mon-pix/helpers/jwt';
7-
import RSVP from 'rsvp';
87

98
export default class OidcAuthenticator extends BaseAuthenticator {
109
@service intl;
@@ -49,7 +48,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
4948

5049
const data = await response.json();
5150
if (!response.ok) {
52-
return RSVP.reject(data);
51+
return Promise.reject(data);
5352
}
5453

5554
const decodedAccessToken = decodeToken(data.access_token);
@@ -65,7 +64,7 @@ export default class OidcAuthenticator extends BaseAuthenticator {
6564
}
6665

6766
restore(data) {
68-
return new RSVP.Promise((resolve, reject) => {
67+
return new Promise((resolve, reject) => {
6968
if (!isEmpty(data['access_token'])) {
7069
resolve(data);
7170
}

0 commit comments

Comments
 (0)