Revize faed7f5e

re #58 conected to correct server, added config.json, added credentials in api.js and relocated errors 401, 403 to home page instead of throwing alert, edited login, edit link navbar logo

client/public/config.json

@@ +1 @@
+{
+    "baseUrl": "https://ymanager-api-yosoinfra.apps.oc.yoso.fi/api",
+    "redirectUrl": "http://localhost:3000/"
+}

client/src/App.css

@@ -56 +56 @@
     margin-left: 85px;
 }
 
+.link-nav {
+    text-decoration: none;
+    color: #fff; 
+    cursor: pointer;  
+}
+
 .top-nav h4 {
     color: white;
 }
@@ -292 +298 @@
     color: white;
     font-size: 90px;
 }
+.login-container a {
+  
+    text-decoration: none;
+    color: #fff; 
+    cursor: pointer;  
+
+}
 /* ------------- SETTING -------------------*/
 
 .setting-container {

client/src/App.js

@@ -15 +15 @@
 function App() {
 
   useEffect(() => {
+    if (window.location.pathname === '/login') return;
+
     api_fetch.getCurrentProfile().then(currentProfile => {
       setUserName(currentProfile);
     }).catch(reason => {

client/src/Login.js

@@ -3 +3 @@
 
 
 function Login() {
-
+console.log(window.config)
   return (
     <div className="login-container column">
-      <h1>log in</h1>
+     
+    <a href={window.config.baseUrl + '/login/google?target=' + window.config.redirectUrl}><h1>log in</h1></a>
+     
+
     </div>
   )
 }

client/src/Nav.js

@@ -6 +6 @@
 
   return (
     <nav className="top-nav">
-      <h3>YOSO</h3>
+      <a className="link-nav" href="http://localhost:3000/"><h3>YOSO</h3></a>
       <div className="profile-comp">
       <img src="https://cataas.com/cat/says/hello%20world!" className="img-avatar" alt="cat"></img>
         <h5>{props.userName.name}</h5>

client/src/api.js

@@ -1 @@
-
-const http = 'http://devcz.yoso.fi:8090/ymanager';
-
 // ******************** GET DATA APP getCurrentProfile ********************
 
 export const getCurrentProfile = async () => {
@@ -9 +6 @@
 
   try {
     response = await fetch(
-      `${http}/users/current/profile`, {
+      `${window.config.baseUrl}/users/current/profile`, {
         headers: {
           Authorization: 1
-          
-        }
+
+        },
+        credentials: 'include'
       }
     );    
   } catch (e) {
@@ -34 +32 @@
   } else {
       switch (response.status) {
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
+          break;
+        case 403:
+          window.location.replace("http://localhost:3000/login")
+          break;
         case 500:
           throw new Error('Internal server error.')
         default:
@@ -50 +52 @@
 
   try {
     response = await fetch(
-      `${http}/user/${userName.id}/calendar?from=${fromDate}&status=ACCEPTED&status=REJECTED`, {
+      `${window.config.baseUrl}/user/${userName.id}/calendar?from=${fromDate}&status=ACCEPTED&status=REJECTED`, {
         headers: {
           'Accept': 'application/json',
           Authorization: 6
         },
+        credentials: 'include',
         method: 'GET',
       }
     );
@@ -82 +85 @@
         case 400:
           throw new Error('Bad request. Check query parameters.')
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
         case 403:
-          throw new Error('Not authorized.')
+          window.location.replace("http://localhost:3000/login")
         case 404:
           throw new Error('User with given ID does not exist.')
         case 500:
@@ -103 +106 @@
 
   try {
     response = await fetch(
-      `${http}/users/requests/vacation?status=ACCEPTED`, {
+      `${window.config.baseUrl}/users/requests/vacation?status=ACCEPTED`, {
         headers: {
           'Accept': 'application/json',
-          Authorization: 1
+          Authorization: 6
         },
+        credentials: 'include',
         method: 'GET',
       }
     );
@@ -132 +136 @@
         case 400:
           throw new Error('Bad request. Check query parameters.')
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
         case 403:
-          throw new Error('Not authorized.')
+          window.location.replace("http://localhost:3000/login")
         case 500:
           throw new Error('Internal server error.')
         default:
@@ -145 +149 @@
 
 // ******************** ADD EVENT to CALENDAR - EMPLOYEE ********************
 
-export async function addEventApi(dataAddEventEmployee) {
+export async function addEventApi(userName, dataAddEventEmployee) {
   let response;
 
   try {
   // send accepted request to server
-    response = await fetch(`${http}/user/calendar/create`, {
+    response = await fetch(`${window.config.baseUrl}/user/calendar/create`, {
       headers: {
         Authorization: 6,
         'Content-Type': 'application/json',
       },
+      credentials: 'include',
       method: 'POST',
   // object which is sent to server
   body: JSON.stringify(dataAddEventEmployee),
@@ -166 +171 @@
   if (response.ok) {
       
     response = await fetch(
-    `${http}/users/requests/vacation?status=PENDING`, {
+    `${window.config.baseUrl}/users/requests/vacation?status=PENDING`, {
       headers: {
         Authorization: 1
       },
+      credentials: 'include',
     });
     const data = await response.json();
       
@@ -193 +199 @@
         case 400:
           throw new Error('Bad request. Check request body.')
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
         case 403:
-          throw new Error('Not authorized.')
+          window.location.replace("http://localhost:3000/login")
         case 500:
           throw new Error('Internal server error.')
         default:
@@ -211 +217 @@
 
   try {
   // send accepted request to server
-    response = await fetch(`${http}/user/calendar/create`, {
+    response = await fetch(`${window.config.baseUrl}/user/calendar/create`, {
       headers: {
         Authorization: 1,
         'Content-Type': 'application/json',
     },
+    credentials: 'include',
       method: 'POST',
     // object which is sent to server
       body: JSON.stringify(dataAddEventAdmin),
@@ -229 +236 @@
       case 400:
         throw new Error('Bad request. Check request body.')
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 500:
         throw new Error('Internal server error.')
       default:
@@ -247 +254 @@
 
   try {
   response = await fetch (
-    `${http}/users`, {
+    `${window.config.baseUrl}/users`, {
       headers: {
-        Authorization: 1          }
+        Authorization: 1          
+      },
+      credentials: 'include',
     }
   );
   } catch (e) {
@@ -275 +284 @@
       case 400:
         throw new Error('Bad request. Check query parameters.')
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 500:
         throw new Error('Internal server error.')
       default:
@@ -293 +302 @@
 
   try {
     // send accepted request to server
-        response = await fetch(`${http}/user/settings`, {
+        response = await fetch(`${window.config.baseUrl}/user/settings`, {
           headers: {
             Authorization: 1,
             'Content-Type': 'application/json',
           },
+          credentials: 'include',
           method: 'PUT',
  
     // object which is sent to server
@@ -312 +322 @@
       case 400:
         throw new Error('Bad request. Check query parameters.')
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 500:
         throw new Error('Internal server error.')
       default:
@@ -329 +339 @@
 
   try {
     response = await fetch(
-      `${http}/settings`, {
+      `${window.config.baseUrl}/settings`, {
         headers: {
           Authorization: 1
+        },
+        credentials: 'include',
+      }
+    );
 
-        }
-      });
   } catch (e) {
     throw 'Server is not available'
     }
@@ -360 +372 @@
   let response;
 
   try {
-    response = await fetch(`${http}/settings`, {
+    response = await fetch(`${window.config.baseUrl}/settings`, {
       headers: {
         'Authorization': 1,
         'Content-Type': 'application/json'
       },
+      credentials: 'include',
       method: 'POST',
       body: JSON.stringify(dataSettingObject),
     });
@@ -375 +388 @@
   if (!response.ok) {
     switch (response.status) {
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 500:
         throw new Error('Internal server error.')
       default:
@@ -388 +401 @@
 
 // ****************** LOAD DATA to YOUR REQUESTS - EMPLOYEE ******************
 
-export async function loadYourRequests() {
+export async function loadYourRequests(userName) {
   let response;
   
   try {
     response = await fetch(
-      `${http}/user/6/calendar?from=2020/06/24&status=PENDING`, {
+      `${window.config.baseUrl}/user/${userName.id}/calendar?from=2020/06/24&status=PENDING`, {
         headers: {
           Authorization: 6
         },
+        credentials: 'include',
       }
     );
   } catch (e) {
@@ -411 +425 @@
         case 400:
           throw new Error('Bad request. Check query parameters.')
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
         case 403:
-          throw new Error('Not authorized.')
+          window.location.replace("http://localhost:3000/login")
         case 500:
           throw new Error('Internal server error.')
         default:
@@ -428 +442 @@
 
   try {
     response = await fetch(
-      `${http}/users/requests/vacation?status=PENDING`, {
+      `${window.config.baseUrl}/users/requests/vacation?status=PENDING`, {
         headers: {
           Authorization: 1
-        }
+        },
+        credentials: 'include',
       },
     );
   } catch (e) {
@@ -446 +461 @@
         case 400:
           throw new Error('Bad request. Check query parameters.')
         case 401:
-          throw new Error('Not authenticated.')
+          window.location.replace("http://localhost:3000/login")
         case 403:
-          throw new Error('Not authorized.')
+          window.location.replace("http://localhost:3000/login")
         case 500:
           throw new Error('Internal server error.')
         default:
@@ -463 +478 @@
   let response;
 
   try {
-    response = await fetch(`${http}/user/requests?type=VACATION`, {
+    response = await fetch(`${window.config.baseUrl}/user/requests?type=VACATION`, {
       headers: {
         Authorization: 1,
         'Content-Type': 'application/json',
       },
+      credentials: 'include',
       method: 'PUT',
       body: JSON.stringify(acceptedRequests),
     });
@@ -480 +496 @@
       case 400:
         throw new Error('Bad request. Check query parameters and request body.')
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 404:
         throw new Error('Neither vacation nor authorization request with given ID exists.')
       case 500:
@@ -499 +515 @@
   let response;
   
   try {
-    response = await fetch(`${http}/user/requests?type=VACATION`, {
+    response = await fetch(`${window.config.baseUrl}/user/requests?type=VACATION`, {
       headers: {
         Authorization: 1,
         'Content-Type': 'application/json',
       },
+      credentials: 'include',
       method: 'PUT',
       body: JSON.stringify(rejectedRequest),
     });
@@ -516 +533 @@
       case 400:
         throw new Error('Bad request. Check query parameters and request body.')
       case 401:
-        throw new Error('Not authenticated.')
+        window.location.replace("http://localhost:3000/login")
       case 403:
-        throw new Error('Not authorized.')
+        window.location.replace("http://localhost:3000/login")
       case 404:
         throw new Error('Neither vacation nor authorization request with given ID exists.')
       case 500:

client/src/index.js

@@ -3 +3 @@
 import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
+import { render } from '@testing-library/react';
+
+fetch(
+  "config.json").then((response) => response.json()).then(config => {
+    window.config = config;
+    ReactDOM.render(
+      <React.StrictMode>
+        <App />
+      </React.StrictMode>,
+      document.getElementById('root')
+    );
+    
+  });
+
+
 
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.