From 9b925712cbdedacdf8af947e929ca3975b56e3fa Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Sat, 5 Mar 2022 19:46:16 +0100
Subject: Added auth and auth guard services, included ngx-cookie-service and
 angular-jwt. Made a configuration file.

---
 frontend/src/config.ts | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 frontend/src/config.ts

(limited to 'frontend/src/config.ts')

diff --git a/frontend/src/config.ts b/frontend/src/config.ts
new file mode 100644
index 00000000..b14670ea
--- /dev/null
+++ b/frontend/src/config.ts
@@ -0,0 +1,3 @@
+export const API_SETTINGS = {
+    apiURL: 'http://localhost:5000/api'
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 7ce6eb09b198e796301dbd7c3e4b23441e2d46ae Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Mon, 7 Mar 2022 19:25:58 +0100
Subject: Linked frontend to backend, but backend needs to enable CORS.

---
 frontend/src/app/_pages/login-page/login-page.component.ts | 10 +++++-----
 frontend/src/app/_services/auth.service.ts                 |  4 ++--
 frontend/src/config.ts                                     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'frontend/src/config.ts')

diff --git a/frontend/src/app/_pages/login-page/login-page.component.ts b/frontend/src/app/_pages/login-page/login-page.component.ts
index fec5e16e..f8b429e3 100644
--- a/frontend/src/app/_pages/login-page/login-page.component.ts
+++ b/frontend/src/app/_pages/login-page/login-page.component.ts
@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { response } from 'express';
+import { CookieService } from 'ngx-cookie-service';
 import { AuthService } from 'src/app/_services/auth.service';
-//import { LoginService } from 'src/app/_services/login.service';
 
 @Component({
   selector: 'app-login-page',
@@ -19,7 +17,8 @@ export class LoginPageComponent implements OnInit {
   pattEmail: RegExp = /^[a-zA-Z0-9]+([\.\-\+][a-zA-Z0-9]+)*\@([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}$/;
 
   constructor(
-    private authService: AuthService
+    private authService: AuthService,
+    private cookie: CookieService
   ) { }
 
   ngOnInit(): void {
@@ -32,7 +31,8 @@ export class LoginPageComponent implements OnInit {
     }
     else {
       this.authService.login(this.email, this.password).subscribe((response) => {
-        console.log(response)
+        console.log(response);
+        this.cookie.set('token', response);
       })
     }
   }
diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index d1012d37..7129b95b 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -14,11 +14,11 @@ export class AuthService {
   constructor(private http: HttpClient, private cookie: CookieService) { }
 
   login(username: string, password: string) {
-    return this.http.post(`${API_SETTINGS.apiURL}/login`, { username, password });
+    return this.http.post(`${API_SETTINGS.apiURL}/auth/login`, { username, password }, { responseType: 'text' });
   }
 
   register(user: any) {
-    return this.http.post(`${API_SETTINGS.apiURL}/register`, user);
+    return this.http.post(`${API_SETTINGS.apiURL}/auth/register`, user);
   }
 
   isAuthenticated(): boolean {
diff --git a/frontend/src/config.ts b/frontend/src/config.ts
index b14670ea..8c48672e 100644
--- a/frontend/src/config.ts
+++ b/frontend/src/config.ts
@@ -1,3 +1,3 @@
 export const API_SETTINGS = {
-    apiURL: 'http://localhost:5000/api'
+    apiURL: 'http://localhost:5283/api'
 }
\ No newline at end of file
-- 
cgit v1.2.3