formation %!s(int64=4) %!d(string=hai) anos
pai
achega
665ee5d66e
Modificáronse 2 ficheiros con 16 adicións e 16 borrados
  1. 5 5
      angular-client/src/app/services/auth.service.ts
  2. 11 11
      express-server/index.js

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

@@ -49,7 +49,7 @@ export class AuthService {
   // login get  token on login 
   signIn(credentials): Observable<Token> {
 
-    return this.http.post<Token>(`${this.apiUrl}/auth/login`, credentials)
+    return this.http.post<Token>(`${this.apiUrl}/api/auth/login`, credentials)
       .pipe(map(token => {
         // store jwt token in local storage 
         localStorage.setItem('token', JSON.stringify(token));
@@ -63,7 +63,7 @@ export class AuthService {
   // iscription get  token on login 
   signUP(data): Observable<Token> {
 
-    return this.http.post<Token>(`${this.apiUrl}/auth/signup`, data)
+    return this.http.post<Token>(`${this.apiUrl}/api/auth/signup`, data)
       .pipe(map(token => {
         // store jwt token in local storage 
         localStorage.setItem('token', JSON.stringify(token));
@@ -76,13 +76,13 @@ export class AuthService {
 
 // mot de passe oublie 
 lostPassword(email): Observable<any> {
-  return this.http.put<any>(`${this.apiUrl}/auth/forgot-password`, email)
+  return this.http.put<any>(`${this.apiUrl}/api/auth/forgot-password`, email)
 }
 
 
 // réinitialiser mot de passe  
 resetPassword(data): Observable<any> {
-  return this.http.put<any>(`${this.apiUrl}/auth/reset-password`, data)
+  return this.http.put<any>(`${this.apiUrl}/api/auth/reset-password`, data)
 }
 
 
@@ -116,7 +116,7 @@ resetPassword(data): Observable<any> {
   getUserInfo(): Observable<User> {
     
     let decodedToken : payloadToken = jwt_decode(this.tokenSubject.value.token); 
-    return this.http.get<User>(`${this.apiUrl}/users/${decodedToken.userId}`)
+    return this.http.get<User>(`${this.apiUrl}/api/users/${decodedToken.userId}`)
       .pipe(map(user => {
         // store user info in local storage 
         localStorage.setItem('user', JSON.stringify(user));

+ 11 - 11
express-server/index.js

@@ -34,7 +34,7 @@ app.use(metricsMiddleware);
 //metrics
 app.use(makeApiMiddleware()); 
 
-app.get("/", (req, res) => {
+app.get("/api", (req, res) => {
     res.status(200).send("Api Works.");
   });
 
@@ -65,16 +65,16 @@ app.use(bodyparser.json());
 app.use(bodyparser.urlencoded({extended: true}));
 
 //simple route
-app.use('/users', userRoutes );
-app.use('/employees', employeeRoutes );
-app.use('/tickets', ticketRoutes );
-app.use('/auth',  authRoutes );
-app.use('/emails',  emailsRoutes );
-app.use('/auth/google',  authGoogle );
-app.use('/auth/facebook',  authFacebook );
-app.use('/tirage',  tirageRoutes );
-app.use('/contact',  contactRoutes );
-app.use('/restaurants',  restaurantRoutes );
+app.use('/api/users', userRoutes );
+app.use('/api/employees', employeeRoutes );
+app.use('/api/tickets', ticketRoutes );
+app.use('/api/auth',  authRoutes );
+app.use('/api/emails',  emailsRoutes );
+app.use('/api/auth/google',  authGoogle );
+app.use('/api/auth/facebook',  authFacebook );
+app.use('/api/tirage',  tirageRoutes );
+app.use('/api/contact',  contactRoutes );
+app.use('/api/restaurants',  restaurantRoutes );
 
 //connexion database
 require('./lib/db');