From bb04de4b38e747a06be42d9da010375715194d6d Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Wed, 13 Apr 2022 14:50:08 +0200
Subject: Dodao express server za buildovan angular projekat, promenio
 konfiguraciju aplikacije na json fajl.

---
 frontend/src/app/_services/auth.service.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'frontend/src/app/_services/auth.service.ts')

diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index a108f8db..d5a16b5b 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
 import shared from '../Shared';
 
 const jwtHelper = new JwtHelperService();
@@ -24,17 +24,17 @@ export class AuthService {
     return this.http.post(`${API_SETTINGS.apiURL}/auth/register`, { ...user }, { responseType: 'text' });
   }
 
-  getGuestToken(){
+  getGuestToken() {
     return this.http.post(`${API_SETTINGS.apiURL}/auth/guestToken`, {}, { responseType: 'text' });
   }
 
   isAuthenticated(): boolean {
     if (this.cookie.check('token')) {
       var token = this.cookie.get('token');
-      var property=jwtHelper.decodeToken(this.cookie.get('token'));
-      var username=property['name'];
+      var property = jwtHelper.decodeToken(this.cookie.get('token'));
+      var username = property['name'];
       var userId = property['id'];
-      return !jwtHelper.isTokenExpired(token) && username!="";
+      return !jwtHelper.isTokenExpired(token) && username != "";
     }
     return false;
   }
@@ -48,9 +48,9 @@ export class AuthService {
     if (!exp) {
       exp = new Date();
     }
-    var property=jwtHelper.decodeToken(this.cookie.get('token'));
-    var username=property['name'];
-    if(username!=""){
+    var property = jwtHelper.decodeToken(this.cookie.get('token'));
+    var username = property['name'];
+    if (username != "") {
       this.refresher = setTimeout(() => {
         console.log('refreshing token!');
         this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
@@ -58,7 +58,7 @@ export class AuthService {
         });
       }, exp.getTime() - new Date().getTime() - 60000);
     }
-    else{
+    else {
       this.refresher = setTimeout(() => {
         console.log('refreshing token!');
         this.getGuestToken().subscribe((response) => {
@@ -68,8 +68,8 @@ export class AuthService {
     }
   }
 
-  addGuestToken(){
-    this.getGuestToken().subscribe((token)=>{
+  addGuestToken() {
+    this.getGuestToken().subscribe((token) => {
       this.authenticate(token);
     });
   }
-- 
cgit v1.2.3