formation 3 лет назад
Родитель
Сommit
ee940e8ebd
2 измененных файлов с 13 добавлено и 13 удалено
  1. 11 11
      angular-client/src/app/services/auth.service.ts
  2. 2 2
      build/docker/httpd/httpd.conf

+ 11 - 11
angular-client/src/app/services/auth.service.ts

@@ -1,4 +1,4 @@
-import { environment } from 'src/environments/environment';
+//import { environment } from 'src/environments/environment';
 import { User } from './../models/userResponse';
 import { Token, payloadToken } from './../models/token';
 import { Injectable } from '@angular/core';
@@ -17,7 +17,7 @@ import * as jwt_decode from 'jwt-decode';
 export class AuthService {
 
   //url api
-  private apiUrl = environment.apiUrl
+ // private apiUrl = environment.apiUrl
 
 
   private tokenSubject: BehaviorSubject<Token>;
@@ -56,9 +56,9 @@ export class AuthService {
   // login get  token on login 
   signIn(credentials): Observable<Token> {
      //debugger;
-    console.log("url ========",this.apiUrl);
+   // console.log("url ========",this.apiUrl);
 
-    return this.http.post<Token>(`${this.apiUrl}/api/auth/login`, credentials)
+    return this.http.post<Token>(`https://api-preprod.foodgame.fr/api/auth/login`, credentials)
       .pipe(map(token => {
         // store jwt token in local storage 
         localStorage.setItem('token', JSON.stringify(token));
@@ -81,9 +81,9 @@ export class AuthService {
     // login get  token on login admin
     signInAdmin(credentials): Observable<Token> {
        //debugger;
-      console.log("url ========",this.apiUrl);
+      //console.log("url ========",this.apiUrl);
   
-      return this.http.post<Token>(`${this.apiUrl}/api/auth/admin`, credentials)
+      return this.http.post<Token>(`https://api-preprod.foodgame.fr/api/auth/admin`, credentials)
         .pipe(map(token => {
           // store jwt token in local storage 
           localStorage.setItem('token', JSON.stringify(token));
@@ -97,10 +97,10 @@ export class AuthService {
   // iscription get  token on login 
   signUP(data): Observable<Token> {
      debugger;
-     console.log("url ========",this.apiUrl);
+    // console.log("url ========",this.apiUrl);
   
 
-    return this.http.post<Token>(`${this.apiUrl}/api/auth/signup`, data)
+    return this.http.post<Token>(`https://api-preprod.foodgame.fr/api/auth/signup`, data)
       .pipe(map(token => {
         // store jwt token in local storage 
         localStorage.setItem('token', JSON.stringify(token));
@@ -113,13 +113,13 @@ export class AuthService {
 
 // mot de passe oublie 
 lostPassword(email): Observable<any> {
-  return this.http.put<any>(`${this.apiUrl}/api/auth/forgot-password`, email)
+  return this.http.put<any>(`https://api-preprod.foodgame.fr/api/auth/forgot-password`, email)
 }
 
 
 // réinitialiser mot de passe  
 resetPassword(data): Observable<any> {
-  return this.http.put<any>(`${this.apiUrl}/api/auth/reset-password`, data)
+  return this.http.put<any>(`https://api-preprod.foodgame.fr/api/auth/reset-password`, data)
 }
 
   // isLoggedIn
@@ -142,7 +142,7 @@ resetPassword(data): Observable<any> {
   getUserInfo(): Observable<User> {
     
     let decodedToken : payloadToken = jwt_decode(this.tokenSubject.value.token); 
-    return this.http.get<User>(`${this.apiUrl}/api/users/${decodedToken.userId}`)
+    return this.http.get<User>(`https://api-preprod.foodgame.fr/api/users/${decodedToken.userId}`)
       .pipe(map(user => {
         // store user info in local storage 
         localStorage.setItem('user', JSON.stringify(user));

+ 2 - 2
build/docker/httpd/httpd.conf

@@ -260,8 +260,8 @@ ServerName angular-preprod.foodgame.fr
 # <Directory> blocks below.
 #
 <Directory />
-    AllowOverride All
-    Require all granted
+    AllowOverride none
+    Require all denied
 </Directory>
 
 #