Merge pull request #6 from Share-Code-Development/develop

Develop

Author: the-vv

src/app/pages/code/view-snippet/view-snippet.component.ts

@@ -37,13 +37,13 @@ export class ViewSnippetComponent implements OnInit, OnDestroy {
       });
       this.sub.add(
         this.snippetService.onSnippetMessages(this.codeId).subscribe({
-        next: (res) => {
+          next: (res) => {
             this.processMessage(res);
-        },
-        error: (err) => {
-          console.error(err);
-        }
-      }))
+          },
+          error: (err) => {
+            console.error(err);
+          }
+        }))
     }
   }
 

src/app/services/snippet.service.ts

@@ -7,6 +7,7 @@ import * as signalR from '@microsoft/signalr';
 import { environment } from '@environment';
 import { ELocalStorage } from 'src/app/models/common.enum';
 import { ESnippetSignalREvents } from '@app/models/snippet.enum';
+import { UserService } from './user.service';
 
 @Injectable({
   providedIn: 'root'
@@ -19,17 +20,21 @@ export class SnippetService {
 
   constructor(
     private http: HttpService,
+    private userService: UserService
   ) {
   }
 
 
   private startConnection(snippetId: string) {
     return new Observable<void>(observer => {
+      const signalROptions: signalR.IHttpConnectionOptions = {
+        withCredentials: true
+      }
+      if (this.userService.isLoggedIn) {
+        signalROptions.accessTokenFactory = () => `Bearer ${localStorage.getItem(ELocalStorage.token)}`;
+      }
       this.connection = new signalR.HubConnectionBuilder()
-        .withUrl(`${environment.apiLiveUrl}/snippet?snippetId=${snippetId}`, {
-          withCredentials: true,
-          accessTokenFactory: () => 'Bearer ' + localStorage.getItem(ELocalStorage.token) || '',
-        })
+        .withUrl(`${environment.apiLiveUrl}/snippet?snippetId=${snippetId}`, signalROptions)
         .build();
       this.connection.start().then(() => {
         observer.next();

src/app/services/user.service.ts

@@ -117,7 +117,7 @@ export class UserService {
     if (options?.recentSnippets) {
       urlParams.recentSnippets = true;
     }
-    return this.http.getAsync(`${this.userEndPoint}/${userId}/snippets`, params);
+    return this.http.getAsync(`${this.userEndPoint}/${userId}/snippets`, urlParams);
   }
 
 }

src/environments/environment.prod.ts

@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
   apiUrl: 'https://api-sc.alenalex.me/v1/api',
+  apiLiveUrl: 'https://api-sc.alenalex.me/v1/live',
   googleClientId: '939503022711-9m2d1ejrp8ufj52m52iab1klqeqdk37k.apps.googleusercontent.com'
 };