Skip to content

Commit 97db2b7

Browse files
P-JeremyP-Jeremy
committed
feat(mon-pix): display add more oidc userInfo
1 parent 8bb3739 commit 97db2b7

File tree

11 files changed

+79
-68
lines changed

11 files changed

+79
-68
lines changed

‎mon-pix/app/components/authentication/login-or-register-oidc.hbs

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
</p>
1111
<div class="login-or-register-oidc-form__information">
1212
<ul>
13-
<li>{{t "pages.login-or-register-oidc.register-form.information.given-name" givenName=this.givenName}}</li>
14-
<li>{{t "pages.login-or-register-oidc.register-form.information.family-name" familyName=this.familyName}}</li>
13+
{{#each this.oidcInfolist as |data|}}
14+
<li>{{data}}</li>
15+
{{/each}}
1516
</ul>
1617
</div>
1718
</div>

‎mon-pix/app/components/authentication/login-or-register-oidc.js

+21-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ export default class LoginOrRegisterOidcComponent extends Component {
3535
return this.oidcIdentityProviders[this.args.identityProviderSlug]?.organizationName;
3636
}
3737

38-
get givenName() {
39-
return this.args.givenName;
40-
}
41-
42-
get familyName() {
43-
return this.args.familyName;
44-
}
45-
4638
get currentLanguage() {
4739
return this.intl.primaryLocale;
4840
}
@@ -55,6 +47,27 @@ export default class LoginOrRegisterOidcComponent extends Component {
5547
return this.url.dataProtectionPolicyUrl;
5648
}
5749

50+
get oidcInfolist() {
51+
const { userClaims } = this.args;
52+
53+
const result = [];
54+
55+
if (userClaims) {
56+
Object.entries(userClaims).map(([key, value]) => {
57+
let label = key;
58+
const translation = `${this.intl.t(`pages.login-or-register-oidc.register-form.information.${key}`)}`;
59+
60+
if (!translation.includes('Missing translation')) {
61+
label = translation;
62+
}
63+
64+
return result.push(`${label} ${value}`);
65+
});
66+
}
67+
68+
return result;
69+
}
70+
5871
@action
5972
async login(event) {
6073
event.preventDefault();

‎mon-pix/app/controllers/authentication/login-or-register-oidc.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ import { action } from '@ember/object';
33
import { service } from '@ember/service';
44
import { tracked } from '@glimmer/tracking';
55

6+
import { SessionStorageEntry } from '../../utils/session-storage-entry';
7+
8+
const oidcUserAuthenticationStorage = new SessionStorageEntry('oidcUserAuthentication');
9+
610
export default class LoginOrRegisterOidcController extends Controller {
7-
queryParams = ['authenticationKey', 'identityProviderSlug', 'givenName', 'familyName'];
11+
queryParams = ['identityProviderSlug'];
812

913
@service url;
1014
@service oidcIdentityProviders;
@@ -27,6 +31,14 @@ export default class LoginOrRegisterOidcController extends Controller {
2731
return this.url.showcase;
2832
}
2933

34+
get oidcUserAuthenticationStorage() {
35+
return oidcUserAuthenticationStorage.get();
36+
}
37+
38+
get userClaims() {
39+
return this.oidcUserAuthenticationStorage.userClaims ?? null;
40+
}
41+
3042
get isInternationalDomain() {
3143
return !this.currentDomain.isFranceDomain;
3244
}
@@ -47,7 +59,7 @@ export default class LoginOrRegisterOidcController extends Controller {
4759

4860
@action
4961
async onLogin({ enteredEmail, enteredPassword }) {
50-
const identityProvider = this.oidcIdentityProviders[this.identityProviderSlug].code;
62+
const identityProvider = this.oidcIdentityProviders[this.oidcUserAuthenticationStorage.identityProviderSlug].code;
5163

5264
const authenticationRequest = this.store.createRecord('user-oidc-authentication-request', {
5365
password: enteredPassword,

‎mon-pix/app/routes/authentication/login-oidc.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import ENV from 'mon-pix/config/environment';
66
import { createTranslatedApplicationError } from 'mon-pix/errors/factories/create-application-error';
77
import JSONApiError from 'mon-pix/errors/json-api-error';
88

9+
import { SessionStorageEntry } from '../../utils/session-storage-entry';
10+
11+
const oidcUserAuthenticationStorage = new SessionStorageEntry('oidcUserAuthentication');
12+
913
export default class LoginOidcRoute extends Route {
1014
@service intl;
1115
@service location;
@@ -37,23 +41,21 @@ export default class LoginOidcRoute extends Route {
3741

3842
async model(params, transition) {
3943
const queryParams = transition.to.queryParams;
44+
4045
const identityProviderSlug = params.identity_provider_slug;
4146
if (queryParams.code) {
4247
return this._handleCallbackRequest(queryParams.code, queryParams.state, queryParams.iss, identityProviderSlug);
4348
}
4449
}
4550

46-
afterModel({ shouldValidateCgu, authenticationKey, identityProviderSlug, givenName, familyName } = {}) {
47-
const shouldCreateAnAccountForUser = shouldValidateCgu && authenticationKey;
51+
afterModel({ shouldValidateCgu, identityProviderSlug } = {}) {
52+
const shouldCreateAnAccountForUser = shouldValidateCgu && oidcUserAuthenticationStorage.get().authenticationKey;
4853

4954
if (!shouldCreateAnAccountForUser) return;
5055

5156
return this.router.replaceWith('authentication.login-or-register-oidc', {
5257
queryParams: {
53-
authenticationKey,
5458
identityProviderSlug,
55-
givenName,
56-
familyName,
5759
},
5860
});
5961
}
@@ -76,9 +78,10 @@ export default class LoginOidcRoute extends Route {
7678
const error = new JSONApiError(apiError.detail, apiError);
7779

7880
const shouldValidateCgu = error.code === 'SHOULD_VALIDATE_CGU';
79-
const { authenticationKey, givenName, familyName } = error.meta ?? {};
80-
if (shouldValidateCgu && authenticationKey) {
81-
return { shouldValidateCgu, authenticationKey, identityProviderSlug, givenName, familyName };
81+
82+
if (shouldValidateCgu && error.meta.authenticationKey) {
83+
oidcUserAuthenticationStorage.set(error.meta);
84+
return { shouldValidateCgu, identityProviderSlug };
8285
}
8386

8487
throw error;

‎mon-pix/app/templates/authentication/login-or-register-oidc.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Authentication::LoginOrRegisterOidc
2222
@identityProviderSlug={{this.identityProviderSlug}}
2323
@authenticationKey={{this.authenticationKey}}
24-
@givenName={{this.givenName}}
25-
@familyName={{this.familyName}}
24+
@userClaims={{this.userClaims}}
2625
@onLogin={{this.onLogin}}
2726
/>
2827
{{/if}}

‎mon-pix/mirage/routes/authentication/oidc/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function (config) {
88
{},
99
{
1010
errors: [
11-
{ code: 'SHOULD_VALIDATE_CGU', meta: { authenticationKey: 'key', familyName: 'PIX', givenName: 'test' } },
11+
{ code: 'SHOULD_VALIDATE_CGU', meta: { authenticationKey: 'key', lastName: 'PIX', firstName: 'test' } },
1212
],
1313
},
1414
);

‎mon-pix/tests/acceptance/authentication/login-or-register-oidc-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module('Acceptance | Login or register oidc', function (hooks) {
2121
// then
2222
assert.strictEqual(
2323
currentURL(),
24-
'/connexion/oidc?authenticationKey=key&familyName=PIX&givenName=test&identityProviderSlug=oidc-partner',
24+
'/connexion/oidc?authenticationKey=key&firstName=test&identityProviderSlug=oidc-partner&lastName=PIX',
2525
);
2626
assert.dom(screen.getByRole('button', { name: 'Sélectionnez une langue' })).exists();
2727
});

‎mon-pix/tests/integration/components/authentication/login-or-register-oidc-test.js

+15-35
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,20 @@ module('Integration | Component | authentication | login-or-register-oidc', func
2626
}
2727
this.owner.register('service:oidcIdentityProviders', OidcIdentityProvidersStub);
2828

29-
this.set('givenName', 'Mélusine');
30-
this.set('familyName', 'TITEGOUTTE');
29+
const userInfo = {
30+
firstName: 'Mélusine',
31+
lastName: 'TITEGOUTTE',
32+
};
33+
34+
this.set('userInfo', userInfo);
3135
});
3236

3337
test('should display heading', async function (assert) {
3438
// given & when
3539
const screen = await render(
36-
hbs`<Authentication::LoginOrRegisterOidc @identityProviderSlug={{this.identityProviderSlug}} />`,
40+
hbs`<Authentication::LoginOrRegisterOidc @identityProviderSlug={{this.identityProviderSlug}}
41+
@userInfo={{this.userInfo}}
42+
/>`,
3743
);
3844

3945
// then
@@ -51,8 +57,7 @@ module('Integration | Component | authentication | login-or-register-oidc', func
5157
const screen = await render(
5258
hbs`<Authentication::LoginOrRegisterOidc
5359
@identityProviderSlug={{this.identityProviderSlug}}
54-
@givenName={{this.givenName}}
55-
@familyName={{this.familyName}}
60+
@userInfo={{this.userInfo}}
5661
/>`,
5762
);
5863

@@ -65,20 +70,8 @@ module('Integration | Component | authentication | login-or-register-oidc', func
6570
);
6671
assert.ok(screen.getByRole('button', { name: t('pages.login-or-register-oidc.register-form.button') }));
6772
assert.ok(screen.getByText('Partenaire OIDC'));
68-
assert.ok(
69-
screen.getByText(
70-
t('pages.login-or-register-oidc.register-form.information.given-name', {
71-
givenName: 'Mélusine',
72-
}),
73-
),
74-
);
75-
assert.ok(
76-
screen.getByText(
77-
t('pages.login-or-register-oidc.register-form.information.family-name', {
78-
familyName: 'TITEGOUTTE',
79-
}),
80-
),
81-
);
73+
assert.ok(screen.getByText(`${t('pages.login-or-register-oidc.register-form.information.firstName')} Mélusine`));
74+
assert.ok(screen.getByText(`${t('pages.login-or-register-oidc.register-form.information.lastName')} TITEGOUTTE`));
8275
assert.ok(screen.getByRole('checkbox', { name: t('common.cgu.label') }));
8376
assert.ok(screen.getByRole('link', { name: t('common.cgu.cgu') }));
8477
assert.ok(screen.getByRole('link', { name: t('common.cgu.data-protection-policy') }));
@@ -91,8 +84,7 @@ module('Integration | Component | authentication | login-or-register-oidc', func
9184
const screen = await render(
9285
hbs`<Authentication::LoginOrRegisterOidc
9386
@identityProviderSlug={{this.identityProviderSlug}}
94-
@givenName={{this.givenName}}
95-
@familyName={{this.familyName}}
87+
@userInfo={{this.userInfo}}
9688
/>`,
9789
);
9890

@@ -106,20 +98,8 @@ module('Integration | Component | authentication | login-or-register-oidc', func
10698
assert.ok(screen.getByRole('textbox', { name: t('pages.login-or-register-oidc.login-form.email') }));
10799
assert.ok(screen.getByRole('link', { name: t('pages.sign-in.forgotten-password') }));
108100
assert.ok(screen.getByRole('button', { name: t('pages.login-or-register-oidc.login-form.button') }));
109-
assert.ok(
110-
screen.getByText(
111-
t('pages.login-or-register-oidc.register-form.information.given-name', {
112-
givenName: 'Mélusine',
113-
}),
114-
),
115-
);
116-
assert.ok(
117-
screen.getByText(
118-
t('pages.login-or-register-oidc.register-form.information.family-name', {
119-
familyName: 'TITEGOUTTE',
120-
}),
121-
),
122-
);
101+
assert.ok(screen.getByText(`${t('pages.login-or-register-oidc.register-form.information.firstName')} Mélusine`));
102+
assert.ok(screen.getByText(`${t('pages.login-or-register-oidc.register-form.information.lastName')} TITEGOUTTE`));
123103
});
124104
});
125105
});

‎mon-pix/tests/unit/routes/authentication/login-oidc-test.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ module('Unit | Route | login-oidc', function (hooks) {
150150
queryParams: {
151151
authenticationKey: '123',
152152
identityProviderSlug,
153-
givenName: undefined,
154-
familyName: undefined,
153+
firstName: undefined,
154+
lastName: undefined,
155+
employeeNumber: undefined,
155156
},
156157
});
157158
assert.ok(true);
@@ -203,7 +204,7 @@ module('Unit | Route | login-oidc', function (hooks) {
203204
errors: [
204205
{
205206
code: 'SHOULD_VALIDATE_CGU',
206-
meta: { authenticationKey: 'key', givenName: 'Mélusine', familyName: 'TITEGOUTTE' },
207+
meta: { authenticationKey: 'key', firstName: 'Mélusine', lastName: 'TITEGOUTTE' },
207208
},
208209
],
209210
});
@@ -227,8 +228,8 @@ module('Unit | Route | login-oidc', function (hooks) {
227228
shouldValidateCgu: true,
228229
authenticationKey: 'key',
229230
identityProviderSlug: 'oidc-partner',
230-
givenName: 'Mélusine',
231-
familyName: 'TITEGOUTTE',
231+
firstName: 'Mélusine',
232+
lastName: 'TITEGOUTTE',
232233
});
233234
assert.ok(true);
234235
});

‎mon-pix/translations/en.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1539,8 +1539,9 @@
15391539
"button": "Create my account",
15401540
"description": "An account will be created based on the information sent by the organisation",
15411541
"information": {
1542-
"family-name": "Last name : {familyName}",
1543-
"given-name": "First name : {givenName}"
1542+
"employeeNumber": "Employee number :",
1543+
"firstName": "First name :",
1544+
"lastName": "Last name :"
15441545
},
15451546
"title": "Sign up"
15461547
},

‎mon-pix/translations/fr.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1539,8 +1539,9 @@
15391539
"button": "Je crée mon compte",
15401540
"description": "Un compte va être créé à partir des éléments transmis par l'organisme",
15411541
"information": {
1542-
"family-name": "Nom : {familyName}",
1543-
"given-name": "Prénom : {givenName}"
1542+
"employeeNumber": "Numéro d'employé :",
1543+
"firstName": "Prénom :",
1544+
"lastName": "Nom :"
15441545
},
15451546
"title": "Je n’ai pas de compte Pix"
15461547
},

0 commit comments

Comments
 (0)