2 files changed, 44 insertions, 17 deletions
diff --git a/src/app/services/friend.service.ts b/src/app/services/friend.service.ts
new file mode 100644
index 0000000..6821606
--- /dev/null
+++ b/src/app/services/friend.service.ts
@@ -0,0 +1,44 @@
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Guid } from 'guid-typescript';
+import { Observable } from 'rxjs';
+import { AppConstants } from '../app-constants.module';
+import { TokenService } from './token.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FriendService {
+  constructor(private _http: HttpClient, private _tokenService: TokenService)
+  { }
+
+  postFriendWithSessionStorageRequest(friendUsername: string): Observable<object> {
+    const userId = this._tokenService.getUserIdFromSessionStorageToken();
+    const token = this._tokenService.getTokenFromSessionStorage();
+
+    return this.postFriendRequest(userId, token, friendUsername);
+  }
+
+  deleteFriendWithSessionStorageRequest(friendUsername: string): Observable<object> {
+    const userId = this._tokenService.getUserIdFromSessionStorageToken();
+    const token = this._tokenService.getTokenFromSessionStorage();
+
+    return this.deleteFriendRequest(userId, token, friendUsername);
+  }
+
+  postFriendRequest(userId: Guid, authToken: string, friendUsername: string): Observable<object> {
+    const options = {
+      params: new HttpParams().set('UserId', userId.toString()).set('FriendUsername', friendUsername),
+      headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken)
+    };
+    return this._http.post(AppConstants.API_FRIENDS_URL, {}, options);
+  }
+
+  deleteFriendRequest(userId: Guid, authToken: string, friendUsername: string): Observable<object> {
+    const options = {
+      params: new HttpParams().set('UserId', userId.toString()).set('FriendUsername', friendUsername),
+      headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken)
+    };
+    return this._http.delete(AppConstants.API_FRIENDS_URL, options);
+  }
+}
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index e910ada..690fff5 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -45,13 +45,6 @@ export class UserService {
     return this.putUserRequest(userId, token, updateUserFormGroup, languages, technologies, userRoles, userFriends);
   }
 
-  putBareUserFromSessionStorageRequest(user: User, password: string): Observable<object> {
-    const userId = this._tokenService.getUserIdFromSessionStorageToken();
-    const token = this._tokenService.getTokenFromSessionStorage();
-
-    return this.putBareUserRequest(userId, token, user, password);
-  }
-
   deleteUserFromSessionStorageRequest(): Observable<object> {
     const userId = this._tokenService.getUserIdFromSessionStorageToken();
     const token = this._tokenService.getTokenFromSessionStorage();
@@ -133,16 +126,6 @@ export class UserService {
     return this._http.put(AppConstants.API_USER_URL, body, options);
   }
 
-  putBareUserRequest(userId: Guid, authToken: string, user: User, password: string): Observable<object> {
-    const body: object = user;
-    Object.assign(body, { password: password });
-    const options = {
-      params: new HttpParams().set('Id', userId.toString()),
-      headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken)
-    };
-    return this._http.put(AppConstants.API_USER_URL, body, options);
-  }
-
   deleteUserRequest(userId: Guid, authToken: string): Observable<object> {
     const options = {
       params: new HttpParams().set('Id', userId.toString()),