TTA-180: fixing endpoints to send credentials

proxy.conf.js

@@ -0,0 +1,16 @@
+const PROXY_CONFIG = [
+  {
+    context: [
+      '/api',
+    ],
+    target: 'http://127.0.0.1:7071',
+    changeOrigin: true,
+    withCredentials: true,
+    secure: false,
+    headers: {
+      'Connection': 'keep-alive'
+    }
+  }
+]
+
+module.exports = PROXY_CONFIG;

src/app/modules/activities-management/services/activity.service.ts

@@ -14,7 +14,7 @@ export class ActivityService {
   constructor(private http: HttpClient) {}
 
   getActivities(): Observable<Activity[]> {
-    return this.http.get<Activity[]>(this.baseUrl);
+    return this.http.get<Activity[]>(this.baseUrl, { withCredentials: true });
   }
 
   createActivity(activityData): Observable<any> {
@@ -23,12 +23,12 @@ export class ActivityService {
       tenant_id: '4225ab1e-1033-4a5f-8650-0dd4950f38c8',
     };
 
-    return this.http.post(this.baseUrl, body);
+    return this.http.post(this.baseUrl, body, { withCredentials: true });
   }
 
   deleteActivity(acitivityId: string): Observable<any> {
     const url = `${this.baseUrl}/${acitivityId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   updateActivity(activityData): Observable<any> {
@@ -38,6 +38,6 @@ export class ActivityService {
       ...activityData,
     };
 
-    return this.http.put(url, body);
+    return this.http.put(url, body, { withCredentials: true });
   }
 }

src/app/modules/customer-management/components/projects-type/services/project-type.service.ts

@@ -15,20 +15,20 @@ export class ProjectTypeService {
 
   getProjectTypes(customerId: any): Observable<ProjectType[]> {
     const params = new HttpParams().set('customer_id', customerId.customerId);
-    return this.http.get<ProjectType[]>(this.baseUrl, { params });
+    return this.http.get<ProjectType[]>(this.baseUrl, { params, withCredentials: true });
   }
 
   createProjectType(projectTypeData): Observable<any> {
-    return this.http.post(this.baseUrl, projectTypeData);
+    return this.http.post(this.baseUrl, projectTypeData, { withCredentials: true });
   }
 
   deleteProjectType(projectTypeId: string): Observable<any> {
     const url = `${this.baseUrl}/${projectTypeId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   updateProjectType(projectTypeData): Observable<any> {
     const url = `${this.baseUrl}/${projectTypeData.id}`;
-    return this.http.put(url, projectTypeData);
+    return this.http.put(url, projectTypeData, { withCredentials: true });
   }
 }

src/app/modules/customer-management/components/projects/components/services/project.service.ts

@@ -17,19 +17,19 @@ export class ProjectService {
 
   getProjects(customerId: any): Observable<Project[]> {
     const params = new HttpParams().set('customer_id', customerId.customerId);
-    return this.http.get<Project[]>(this.url, { params });
+    return this.http.get<Project[]>(this.url, { params, withCredentials: true });
   }
 
   getAllProjects(): Observable<Project[]> {
-    return this.http.get<Project[]>(this.url);
+    return this.http.get<Project[]>(this.url, { withCredentials: true });
   }
 
   getRecentProjects(): Observable<Project[]> {
-    return this.http.get<Project[]>(`${this.url}/recent`);
+    return this.http.get<Project[]>(`${this.url}/recent`, { withCredentials: true });
   }
 
   createProject(projectData): Observable<any> {
-    return this.http.post<Project[]>(this.url, projectData);
+    return this.http.post<Project[]>(this.url, projectData, { withCredentials: true });
   }
 
   updateProject(projectData): Observable<any> {
@@ -39,12 +39,12 @@ export class ProjectService {
         projectData.status = 1;
       }
     }
-    return this.http.put(`${this.url}/${id}`, projectData);
+    return this.http.put(`${this.url}/${id}`, projectData, { withCredentials: true });
   }
 
   deleteProject(projectId: string): Observable<any> {
     return this.isDevelopmentOrProd
       ? this.http.put(`${this.url}/${projectId}`, { status: 0 })
-      : this.http.delete(`${this.url}/${projectId}`);
+      : this.http.delete(`${this.url}/${projectId}`, { withCredentials: true });
   }
 }

src/app/modules/customer-management/services/customer.service.ts

@@ -13,20 +13,20 @@ export class CustomerService {
   constructor(private http: HttpClient) {}
 
   createCustomer(customerData): Observable<any> {
-    return this.http.post(this.baseUrl, customerData);
+    return this.http.post(this.baseUrl, customerData, { withCredentials: true });
   }
 
   getCustomers(): Observable<any> {
-    return this.http.get(this.baseUrl);
+    return this.http.get(this.baseUrl, { withCredentials: true });
   }
 
   deleteCustomer(customerId: string): Observable<any> {
     const url = `${this.baseUrl}/${customerId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   updateCustomer(customerData): Observable<any> {
     const url = `${this.baseUrl}/${customerData.id}`;
-    return this.http.put(url, customerData);
+    return this.http.put(url, customerData, { withCredentials: true });
   }
 }

src/app/modules/login/login.component.html

@@ -11,6 +11,6 @@ <h3>Please log in</h3>
     <button (click)="login() " class="btn btn-primary">login</button>
   </div>
   <div *ngIf="!isProduction">
-    <a ng-href="{cliendId}}">Login</a>
+    <a href="https://uat-backend.auth.ioet.com/authn/login/timeTracker">Login</a>
   </div>
 </div>

src/app/modules/login/login.component.ts

@@ -85,6 +85,14 @@ export class LoginComponent implements OnInit {
           this.ngZone.run(() => this.router.navigate(['']));
       });
     };
+    this.loginService.getUser('test').subscribe((resp) => {
+      this.loginService.setCookies();
+      const tokenObject = JSON.stringify(resp);
+      console.log(tokenObject)
+      const tokenJson = JSON.parse(tokenObject);
+      this.loginService.setLocalStorage('user', tokenJson.token);
+      this.ngZone.run(() => this.router.navigate(['']));
+  });
   }
 
   login(): void {
@@ -107,7 +115,7 @@ export class LoginComponent implements OnInit {
   }
 
   loginAuth(): void {
-    
+
   }
 
 }

src/app/modules/login/services/login.service.ts

@@ -1,4 +1,4 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { CookieService } from 'ngx-cookie-service';
 import { EnvironmentType, UserEnum } from 'src/environments/enum';
@@ -92,7 +92,7 @@ export class LoginService {
       token: tokenString,
     };
 
-    return this.http.post(`${this.baseUrl}/login`, body);
+    return this.http.post(`${this.baseUrl}/login`, body, { withCredentials: true });
   }
 
   setCookies() {
@@ -109,7 +109,7 @@ export class LoginService {
 
   isValidToken(token: string) {
     const body = { token };
-    return this.http.post(`${this.baseUrl}/validate-token`, body).pipe(
+    return this.http.post(`${this.baseUrl}/validate-token`, body, { withCredentials: true }).pipe(
       map((response) => {
         const responseString = JSON.stringify(response);
         const responseJson = JSON.parse(responseString);

src/app/modules/time-clock/services/entry.service.ts

@@ -23,49 +23,49 @@ export class EntryService {
   urlInProductionLegacy = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   loadActiveEntry(): Observable<any> {
-    return this.http.get(`${this.baseUrl}/running`);
+    return this.http.get(`${this.baseUrl}/running`, { withCredentials: true });
   }
 
   loadEntries(date): Observable<any> {
     const timezoneOffset = new Date().getTimezoneOffset();
-    return this.http.get(`${this.baseUrl}?month=${date.month}&year=${date.year}&timezone_offset=${timezoneOffset}`);
+    return this.http.get(`${this.baseUrl}?month=${date.month}&year=${date.year}&timezone_offset=${timezoneOffset}`, { withCredentials: true });
   }
 
   createEntry(entryData): Observable<any> {
-    return this.http.post(this.baseUrl, entryData);
+    return this.http.post(this.baseUrl, entryData, { withCredentials: true });
   }
 
   updateEntry(entryData): Observable<any> {
     const {id} = entryData;
-    return this.http.put(`${this.baseUrl}/${id}`, entryData);
+    return this.http.put(`${this.baseUrl}/${id}`, entryData, { withCredentials: true });
   }
 
   deleteEntry(entryId: string): Observable<any> {
     const url = `${this.baseUrl}/${entryId}`;
-    return this.http.delete(url);
+    return this.http.delete(url, { withCredentials: true });
   }
 
   stopEntryRunning(idEntry: string): Observable<any> {
     return (this.urlInProductionLegacy ?
-      this.http.post(`${this.baseUrl}/${idEntry}/stop`, null) : this.http.put(`${this.baseUrl}/stop`, null) );
+      this.http.post(`${this.baseUrl}/${idEntry}/stop`, null, { withCredentials: true }) : this.http.put(`${this.baseUrl}/stop`, null, { withCredentials: true }) );
   }
 
   restartEntry(idEntry: string): Observable<Entry> {
     const url = `${this.baseUrl}/${idEntry}/restart`;
-    return this.http.post<Entry>(url, null);
+    return this.http.post<Entry>(url, null, { withCredentials: true });
   }
 
   summary(): Observable<TimeEntriesSummary> {
     const timeOffset = new Date().getTimezoneOffset();
     const summaryUrl = `${this.baseUrl}/summary?time_offset=${timeOffset}`;
-    return this.http.get<TimeEntriesSummary>(summaryUrl);
+    return this.http.get<TimeEntriesSummary>(summaryUrl, { withCredentials: true });
   }
 
   findEntriesByProjectId(projectId: string): Observable<Entry[]> {
     const startDate = this.getDateLastMonth();
     const endDate = this.getCurrentDate();
     const findEntriesByProjectURL = `${this.baseUrl}?limit=2&project_id=${projectId}&start_date=${startDate}&end_date=${endDate}`;
-    return this.http.get<Entry[]>(findEntriesByProjectURL);
+    return this.http.get<Entry[]>(findEntriesByProjectURL, { withCredentials: true });
   }
 
   loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
@@ -79,7 +79,8 @@ export class EntryService {
           user_id: userId,
           limit: `${MAX_NUMBER_OF_ENTRIES_FOR_REPORTS}`,
           timezone_offset : new Date().getTimezoneOffset().toString(),
-        }
+        },
+        withCredentials: true
       }
     );
   }

src/app/modules/user/services/user.service.ts

@@ -16,6 +16,6 @@ export class UserService {
 
   loadUser(userId: any): Observable<User> {
     const url = `${this.baseUrl}/${userId}`;
-    return this.http.get<User>(url);
+    return this.http.get<User>(url, { withCredentials: true });
   }
 }

src/app/modules/users/services/users.service.ts

@@ -15,30 +15,30 @@ export class UsersService {
   baseUrl = `${environment.timeTrackerApiUrl}/users`;
 
   loadUsers(): Observable<any> {
-    return this.http.get(this.baseUrl);
+    return this.http.get(this.baseUrl, { withCredentials: true });
   }
 
   grantRole(userId: string, roleId: string): Observable<any> {
     const url = this.isProductionLegacy ? `${this.baseUrl}/${userId}/roles/${roleId}/grant`
     : `${this.baseUrl}/${userId}/${roleId}/grant`;
-    return this.http.post(url, null);
+    return this.http.post(url, null, { withCredentials: true });
   }
 
   revokeRole(userId: string, roleId: string): Observable<any> {
     const url = this.isProductionLegacy ? `${this.baseUrl}/${userId}/roles/${roleId}/revoke`
     : `${this.baseUrl}/${userId}/${roleId}/revoke`;
-    return this.http.post(url, null);
+    return this.http.post(url, null, { withCredentials: true });
   }
 
   addUserToGroup(userId: string, group: string): Observable<User> {
     return this.http.post<User>(`${this.baseUrl}/${userId}/groups/add`, {
       group_name: group,
-    });
+    }, { withCredentials: true });
   }
 
   removeUserFromGroup(userId: string, group: string): Observable<User> {
     return this.http.post<User>(`${this.baseUrl}/${userId}/groups/remove`, {
       group_name: group,
-    });
+    }, { withCredentials: true });
   }
 }

src/environments/environment.ts

@@ -6,7 +6,7 @@ import { EnvironmentType } from './enum';
 /* tslint:disable:no-string-literal */
 export const environment = {
   production: EnvironmentType.TT_DEV,
-  timeTrackerApiUrl: process.env['API_URL'],
+  timeTrackerApiUrl: 'http://timetracker-dev.ioet.com:7071/api',
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };