aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_services
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/app/_services')
-rw-r--r--frontend/src/app/_services/auth.service.ts22
-rw-r--r--frontend/src/app/_services/datasets.service.ts2
-rw-r--r--frontend/src/app/_services/experiments.service.ts2
-rw-r--r--frontend/src/app/_services/models.service.ts2
-rw-r--r--frontend/src/app/_services/predictors.service.ts8
-rw-r--r--frontend/src/app/_services/user-info.service.ts2
6 files changed, 19 insertions, 19 deletions
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);
});
}
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index da0c4dc5..9a718e7c 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
import Dataset from '../_data/Dataset';
import { AuthService } from './auth.service';
diff --git a/frontend/src/app/_services/experiments.service.ts b/frontend/src/app/_services/experiments.service.ts
index ecb3e262..7462cd14 100644
--- a/frontend/src/app/_services/experiments.service.ts
+++ b/frontend/src/app/_services/experiments.service.ts
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
import Experiment from '../_data/Experiment';
import { AuthService } from './auth.service';
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 9a1e71da..1314589a 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import Model from '../_data/Model';
import { AuthService } from './auth.service';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
import { Observable } from 'rxjs';
import Dataset from '../_data/Dataset';
diff --git a/frontend/src/app/_services/predictors.service.ts b/frontend/src/app/_services/predictors.service.ts
index 844cd706..909d1a49 100644
--- a/frontend/src/app/_services/predictors.service.ts
+++ b/frontend/src/app/_services/predictors.service.ts
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
import Predictor from '../_data/Predictor';
import { Column } from '../_pages/predict/predict.component';
import { AuthService } from './auth.service';
@@ -18,11 +18,11 @@ export class PredictorsService {
getPublicPredictors(): Observable<Predictor[]> {
return this.http.get<Predictor[]>(`${API_SETTINGS.apiURL}/predictor/publicpredictors`, { headers: this.authService.authHeader() });
}
- getPredictor(id : String): Observable<Predictor> {
- return this.http.get<Predictor>(`${API_SETTINGS.apiURL}/predictor/getpredictor/`+ id, { headers: this.authService.authHeader() });
+ getPredictor(id: String): Observable<Predictor> {
+ return this.http.get<Predictor>(`${API_SETTINGS.apiURL}/predictor/getpredictor/` + id, { headers: this.authService.authHeader() });
}
- usePredictor(predictor: Predictor, inputs : Column[]) {
+ usePredictor(predictor: Predictor, inputs: Column[]) {
return this.http.post(`${API_SETTINGS.apiURL}/predictor/usepredictor/` + predictor._id, inputs, { headers: this.authService.authHeader() });
}
diff --git a/frontend/src/app/_services/user-info.service.ts b/frontend/src/app/_services/user-info.service.ts
index 7ed2970c..16fc90a2 100644
--- a/frontend/src/app/_services/user-info.service.ts
+++ b/frontend/src/app/_services/user-info.service.ts
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { API_SETTINGS } from 'src/config';
+import API_SETTINGS from '../../config.json';
import User from '../_data/User';
import { AuthService } from './auth.service';