fix: make sure pro connected user return also the name

Author: JeromeBu

api/src/core/usecases/auth/handleAuthCallback.ts

@@ -44,7 +44,7 @@ export const makeHandleAuthCallback = ({
                 sub: userInfoFromProvider.sub,
                 email: userInfoFromProvider.email,
                 firstName: userInfoFromProvider.given_name,
-                lastName: userInfoFromProvider.family_name,
+                lastName: userInfoFromProvider.family_name ?? userInfoFromProvider.usual_name,
                 organization: null,
                 isPublic: false,
                 about: undefined
@@ -57,7 +57,7 @@ export const makeHandleAuthCallback = ({
                 sub: userInfoFromProvider.sub,
                 email: userInfoFromProvider.email,
                 firstName: userInfoFromProvider.given_name,
-                lastName: userInfoFromProvider.family_name
+                lastName: userInfoFromProvider.family_name ?? userInfoFromProvider.usual_name
             });
         }
 

api/src/core/usecases/auth/initiateAuth.ts

@@ -33,7 +33,7 @@ export const makeInitiateAuth = ({ sessionRepository, oidcClient }: InitiateAuth
             client_id: oidcClient.clientId,
             redirect_uri: oidcClient.redirectUri,
             state,
-            scope: "openid email profile"
+            scope: oidcClient.scope
         }).toString();
 
         return { sessionId, authUrl: authUrl.toString() };

api/src/core/usecases/auth/oidcClient.ts

@@ -22,11 +22,14 @@ type OidcUserInfo = {
     name?: string;
     given_name?: string;
     family_name?: string;
+    // following is not standard, it is just for ProConnect
+    usual_name?: string;
 };
 
 export interface OidcClient {
     clientId: string;
     redirectUri: string;
+    scope: string;
     getAuthorizationEndpoint(): string;
     exchangeCodeForTokens(code: string): Promise<{
         access_token: string;
@@ -39,12 +42,23 @@ export interface OidcClient {
     logout(idToken: string | null): Promise<string>;
 }
 
+const standardOidcScope = ["openid", "email", "profile"];
+
+const getScope = (oidcIssuerUri: string): string => {
+    if (oidcIssuerUri.includes("agentconnect") || oidcIssuerUri.includes("proconnect"))
+        return [...standardOidcScope, "given_name", "usual_name"].join(" ");
+    return standardOidcScope.join(" ");
+};
+
 export class HttpOidcClient implements OidcClient {
     #config!: OidcConfiguration;
     #oidcParams: OidcParams;
 
+    public scope: string;
+
     private constructor(oidcParams: OidcParams) {
         this.#oidcParams = oidcParams;
+        this.scope = getScope(oidcParams.issuerUri);
     }
 
     static async create(oidcParams: OidcParams): Promise<HttpOidcClient> {
@@ -123,8 +137,6 @@ export class HttpOidcClient implements OidcClient {
 
         const userInfoAsString = responseBody.startsWith("ey") ? atob(responseBody.split(".")[1]) : responseBody;
 
-        console.log("\n \n userInfoAsString : ", userInfoAsString);
-
         return JSON.parse(userInfoAsString);
     }
 
@@ -152,9 +164,11 @@ export class TestOidcClient implements OidcClient {
     #config: OidcConfiguration;
     #oidcParams: OidcParams;
     #calls: TestOidcClientCall[] = [];
+    scope: string;
 
     constructor(oidcParams: OidcParams) {
         this.#oidcParams = oidcParams;
+        this.scope = getScope(oidcParams.issuerUri);
         this.#config = {
             authorization_endpoint: `${oidcParams.issuerUri}/auth`,
             token_endpoint: `${oidcParams.issuerUri}/token`,