Task/WG-10: Add projects and user queries.

react/package.json

@@ -10,7 +10,9 @@
         "test": "jest",
         "lint": "npm run lint:js",
         "lint:js": "eslint . --ext .js,.jsx,.ts,.tsx",
-        "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix"
+        "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
+        "prettier:check": "prettier --single-quote --check src",
+        "prettier:fix": "prettier --single-quote --write src"
     },
     "eslintConfig": {
         "extends": "react-app"

react/src/components/AppRouter.tsx

@@ -38,7 +38,7 @@ const ProtectedRoute: React.FC<ProtectedRouteProps> = ({
 
 function AppRouter() {
   const isAuthenticated = useSelector((state: RootState) =>
-    isTokenValid(state.auth)
+    isTokenValid(state.auth.token)
   );
 
   return (

react/src/components/Authentication/Login/Login.tsx

@@ -8,7 +8,7 @@ function Login() {
   const location = useLocation();
   const navigate = useNavigate();
   const isAuthenticated = useSelector((state: RootState) =>
-    isTokenValid(state.auth)
+    isTokenValid(state.auth.token)
   );
 
   useEffect(() => {

react/src/components/MainMenu/MainMenu.test.tsx

@@ -1,8 +1,14 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import MainMenu from './MainMenu';
+import { Provider } from 'react-redux';
+import store from '../../redux/store';
 
 test('renders menu', () => {
-  const { getByText } = render(<MainMenu />);
+  const { getByText } = render(
+    <Provider store={store}>
+      <MainMenu />
+    </Provider>
+  );
   expect(getByText(/Main Menu/)).toBeDefined();
 });

react/src/components/MainMenu/MainMenu.tsx

@@ -1,6 +1,12 @@
 import React from 'react';
+import {
+  useGetGeoapiProjectsQuery,
+  useGetGeoapiUserInfoQuery,
+} from '../../redux/api/geoapi';
 
 function MainMenu() {
+  useGetGeoapiProjectsQuery();
+  useGetGeoapiUserInfoQuery();
   return <h2>Main Menu</h2>;
 }
 

react/src/redux/api/geoapi.ts

@@ -1,21 +1,26 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/dist/query/react';
-import store from '../store';
+import type { RootState } from '../store';
 
 // TODO: make configurable so can be https://agave.designsafe-ci.org/geo-staging/v2 or https://agave.designsafe-ci.org/geo/v2
-const BASE_URL = 'https:localhost:8888';
+const BASE_URL = 'https://agave.designsafe-ci.org/geo/v2';
 
 export const geoapi = createApi({
   reducerPath: 'api',
   baseQuery: fetchBaseQuery({
     baseUrl: BASE_URL,
-    prepareHeaders: (headers) => {
+    prepareHeaders: (headers, api) => {
       // TODO check if logged in as we don't want to add if public
-      const token = store.getState().auth.token;
+      const token = (api.getState() as RootState).auth.token;
+
       if (token) {
-        headers.set('Authorization', `Bearer ${token}`);
+        headers.set('Authorization', `Bearer ${token.token}`);
       }
+
       headers.set('Content-Type', 'application/json;charset=UTF-8');
-      headers.set('Authorization', 'anonymous');
+
+      // TODO below adding of JWT if localhost and then add JWT
+      // we put the JWT on the request to our geoapi API because it is not behind ws02 if in local dev
+      // and if user is logged in
 
       // TODO below adding of JWT if localhost and then add JWT
       // we put the JWT on the request to our geoapi API because it is not behind ws02 if in local dev
@@ -25,5 +30,18 @@ export const geoapi = createApi({
     },
   }),
   tagTypes: ['Test'],
-  endpoints: () => ({}),
+  endpoints: (builder) => ({
+    getGeoapiProjects: builder.query<any, void>({
+      query: () => '/projects/',
+    }),
+    // NOTE: Currently fails due to cors on localhost (chrome) works when requesting production backend
+    getGeoapiUserInfo: builder.query<any, void>({
+      query: () => ({
+        url: 'https://agave.designsafe-ci.org/oauth2/userinfo?schema=openid',
+        method: 'GET',
+      }),
+    }),
+  }),
 });
+
+export const { useGetGeoapiProjectsQuery, useGetGeoapiUserInfoQuery } = geoapi;

react/src/redux/authSlice.ts

@@ -1,18 +1,19 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import {
-  getAuthFromLocalStorage,
-  setAuthToLocalStorage,
-  removeAuthFromLocalStorage,
+  getTokenFromLocalStorage,
+  setTokenToLocalStorage,
+  removeTokenFromLocalStorage,
 } from '../utils/authUtils';
+import { AuthState, AuthenticatedUser } from '../types';
+import { geoapi } from './api/geoapi';
 
 // TODO consider moving to ../types/
-export interface AuthState {
-  token: string | null;
-  expires: number | null;
-}
-
 // check local storage for our initial state
-const initialState: AuthState = getAuthFromLocalStorage();
+const initialState: AuthState = {
+  token: getTokenFromLocalStorage(),
+  user: null,
+};
+
 const authSlice = createSlice({
   name: 'auth',
   initialState,
@@ -21,19 +22,36 @@ const authSlice = createSlice({
       state,
       action: PayloadAction<{ token: string; expires: number }>
     ) {
-      state.token = action.payload.token;
-      state.expires = action.payload.expires;
+      state.token = {
+        token: action.payload.token,
+        expires: action.payload.expires,
+      };
 
       // save to local storage
-      setAuthToLocalStorage(state);
+      setTokenToLocalStorage(state.token);
     },
     logout(state) {
+      state.user = null;
       state.token = null;
-      state.expires = null;
-
       //remove from local storage
-      removeAuthFromLocalStorage();
+      removeTokenFromLocalStorage();
     },
+
+    setUser(state, action: PayloadAction<{ user: AuthenticatedUser }>) {
+      state.user = action.payload.user;
+    },
+  },
+  extraReducers: (builder) => {
+    builder.addMatcher(
+      geoapi.endpoints.getGeoapiUserInfo.matchFulfilled,
+      (state, action: PayloadAction<any>) => {
+        const u: any = {
+          name: action.payload.name,
+          email: action.payload.email,
+        };
+        state.user = u;
+      }
+    );
   },
 });
 

react/src/redux/projectsSlice.ts

@@ -0,0 +1,18 @@
+import { createSlice } from '@reduxjs/toolkit';
+import { geoapi } from './api/geoapi';
+
+const slice = createSlice({
+  name: 'projects',
+  initialState: { projects: [] },
+  reducers: {},
+  extraReducers: (builder) => {
+    builder.addMatcher(
+      geoapi.endpoints.getGeoapiProjects.matchFulfilled,
+      (state, { payload }) => {
+        state.projects = payload;
+      }
+    );
+  },
+});
+
+export default slice.reducer;

react/src/redux/reducers/reducers.ts

@@ -1,8 +1,10 @@
 import { combineReducers } from 'redux';
 import { geoapi } from '../api/geoapi';
 import authReducer from '../authSlice';
+import projectsReducer from '../projectsSlice';
 
 export const reducer = combineReducers({
   auth: authReducer,
+  projects: projectsReducer,
   [geoapi.reducerPath]: geoapi.reducer,
 });

react/src/redux/store.ts

@@ -1,9 +1,16 @@
 import { configureStore } from '@reduxjs/toolkit';
 import { reducer } from './reducers/reducers';
+import { geoapi } from './api/geoapi';
 
 const store = configureStore({
   reducer: reducer,
+  middleware: (getDefaultMiddleware) =>
+    getDefaultMiddleware({ serializableCheck: false }).concat(
+      geoapi.middleware
+    ),
 });
 
 export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
+
 export default store;

react/src/types/auth.ts

@@ -0,0 +1,14 @@
+export interface AuthenticatedUser {
+  username: string | null;
+  email: string | null;
+}
+
+export interface AuthToken {
+  token: string | null;
+  expires: number | null;
+}
+
+export interface AuthState {
+  user: AuthenticatedUser | null;
+  token: AuthToken | null;
+}

react/src/types/index.ts

@@ -5,3 +5,4 @@ export type {
   FeatureClass,
   FeatureCollection,
 } from './feature';
+export type { AuthState, AuthenticatedUser, AuthToken } from './auth';

react/src/utils/authUtils.ts

@@ -1,33 +1,37 @@
-import { AuthState } from '../redux/authSlice';
+import { AuthToken } from '../types';
 
 export const AUTH_KEY = 'auth';
 
-export function isTokenValid(auth: AuthState): boolean {
-  if (!auth.expires) {
+export function isTokenValid(token: AuthToken | null): boolean {
+  if (token) {
+    if (!token.expires) {
+      return false;
+    }
+
+    const now = Date.now();
+    return now < token.expires;
+  } else {
     return false;
   }
-
-  const now = Date.now();
-  return now < auth.expires;
 }
 
-export function getAuthFromLocalStorage(): AuthState {
+export function getTokenFromLocalStorage(): AuthToken {
   try {
     const tokenStr = localStorage.getItem(AUTH_KEY);
     if (tokenStr) {
       const auth = JSON.parse(tokenStr);
-      return { token: auth.token, expires: auth.expires };
+      return auth;
     }
   } catch (e: any) {
     console.error('Error loading state from localStorage:', e);
   }
   return { token: null, expires: null };
 }
 
-export function setAuthToLocalStorage(auth: AuthState) {
-  localStorage.setItem(AUTH_KEY, JSON.stringify(auth));
+export function setTokenToLocalStorage(token: AuthToken) {
+  localStorage.setItem(AUTH_KEY, JSON.stringify(token));
 }
 
-export function removeAuthFromLocalStorage() {
+export function removeTokenFromLocalStorage() {
   localStorage.removeItem(AUTH_KEY);
 }