Merge pull request #1564 from thecodingmachine/HotFixAuthenticationManager

Hot fix authentication manager

front/src/Components/Menu/AboutRoomSubMenu.svelte

@@ -40,7 +40,9 @@
     })
 
     function copyLink() {
-        HTMLShareLink.select();
+        const input: HTMLInputElement = document.getElementById('input-share-link') as HTMLInputElement;
+        input.focus();
+        input.select();
         document.execCommand('copy');
     }
 
@@ -59,12 +61,12 @@
 <div class="about-room-main">
     <section class="share-url not-mobile">
         <h3>Share the link of the room !</h3>
-        <input type="text" readonly bind:this={HTMLShareLink} value={location.toString()}>
+        <input type="text" readonly id="input-share-link" bind:this={HTMLShareLink} value={location.toString()}>
         <button type="button" class="nes-btn is-primary" on:click={copyLink}>Copy</button>
     </section>
     <section class="is-mobile">
         <h3>Share the link of the room !</h3>
-        <input type="hidden" readonly bind:this={HTMLShareLink} value={location.toString()}>
+        <input type="hidden" readonly id="input-share-link" bind:this={HTMLShareLink} value={location.toString()}>
         <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
     </section>
     <h2>Information on the map</h2>

front/src/Components/Menu/GuestSubMenu.svelte

@@ -2,7 +2,9 @@
     let HTMLShareLink: HTMLInputElement;
 
     function copyLink() {
-        HTMLShareLink.select();
+        const input: HTMLInputElement = document.getElementById('input-share-link') as HTMLInputElement;
+        input.focus();
+        input.select();
         document.execCommand('copy');
     }
 
@@ -22,12 +24,12 @@
     <section class="container-overflow">
         <section class="share-url not-mobile">
             <h3>Share the link of the room !</h3>
-            <input type="text" readonly bind:this={HTMLShareLink} value={location.toString()}>
+            <input type="text" readonly id="input-share-link" bind:this={HTMLShareLink} value={location.toString()}>
             <button type="button" class="nes-btn is-primary" on:click={copyLink}>Copy</button>
         </section>
         <section class="is-mobile">
             <h3>Share the link of the room !</h3>
-            <input type="hidden" readonly bind:this={HTMLShareLink} value={location.toString()}>
+            <input type="hidden" readonly id="input-share-link" bind:this={HTMLShareLink} value={location.toString()}>
             <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
         </section>
     </section>

front/src/Connexion/ConnectionManager.ts

@@ -226,7 +226,7 @@ class ConnectionManager {
 
     public async anonymousLogin(isBenchmark: boolean = false): Promise<void> {
         const data = await Axios.post(`${PUSHER_URL}/anonymLogin`).then((res) => res.data);
-        this.localUser = new LocalUser(data.userUuid, []);
+        this.localUser = new LocalUser(data.userUuid, [], data.email);
         this.authToken = data.authToken;
         if (!isBenchmark) {
             // In benchmark, we don't have a local storage.

pusher/src/Controller/AuthenticateController.ts

@@ -63,25 +63,30 @@ export class AuthenticateController extends BaseController {
                 if (token != undefined) {
                     try {
                         const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
-                        if (authTokenData.accessToken == undefined) {
+
-                            //if not nonce and code, user connected in anonymous
+                        //Get user data from Admin Back Office
-                            //get data with identifier and return token
+                        //This is very important to create User Local in LocalStorage in WorkAdventure
-                            if (!code && !nonce) {
+                        const resUserData = await this.getUserByUserIdentifier(
-                                const data = await this.getUserByUserIdentifier(
                             authTokenData.identifier,
                             playUri as string,
                             IPAddress
                         );
+
+                        if (authTokenData.accessToken == undefined) {
+                            //if not nonce and code, user connected in anonymous
+                            //get data with identifier and return token
+                            if (!code && !nonce) {
                                 res.writeStatus("200");
                                 this.addCorsHeaders(res);
-                                return res.end(JSON.stringify({ ...data, authToken: token }));
+                                return res.end(JSON.stringify({ ...resUserData, authToken: token }));
                             }
                             throw Error("Token cannot to be check on Hydra");
                         }
+
                         const resCheckTokenAuth = await openIDClient.checkTokenAuth(authTokenData.accessToken);
                         res.writeStatus("200");
                         this.addCorsHeaders(res);
-                        return res.end(JSON.stringify({ ...resCheckTokenAuth, authToken: token }));
+                        return res.end(JSON.stringify({ ...resCheckTokenAuth, ...resUserData, authToken: token }));
                     } catch (err) {
                         console.info("User was not connected", err);
                     }
@@ -261,7 +266,14 @@ export class AuthenticateController extends BaseController {
         playUri: string,
         IPAddress: string
     ): Promise<FetchMemberDataByUuidResponse | object> {
-        let data: FetchMemberDataByUuidResponse | object = {};
+        let data: FetchMemberDataByUuidResponse = {
+            email: email,
+            userUuid: email,
+            tags: [],
+            messages: [],
+            visitCardUrl: null,
+            textures: [],
+        };
         try {
             data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress);
         } catch (err) {

pusher/src/Controller/IoSocketController.ts

@@ -189,6 +189,7 @@ export class IoSocketController {
                         let memberTextures: CharacterTexture[] = [];
                         const room = await socketManager.getOrCreateRoom(roomId);
                         let userData: FetchMemberDataByUuidResponse = {
+                            email: userIdentifier,
                             userUuid: userIdentifier,
                             tags: [],
                             visitCardUrl: null,

pusher/src/Services/AdminApi.ts

@@ -22,6 +22,7 @@ export interface AdminBannedData {
 }
 
 export interface FetchMemberDataByUuidResponse {
+    email: string;
     userUuid: string;
     tags: string[];
     visitCardUrl: string | null;