navigateToProject(proj.uuid)}>
| {proj.name} |
{proj.ds_project_id} {proj.ds_project_title}
diff --git a/react/src/constants/routes.ts b/react/src/constants/routes.ts
index 274aab65..8599525b 100644
--- a/react/src/constants/routes.ts
+++ b/react/src/constants/routes.ts
@@ -3,5 +3,5 @@ export const LOGIN = '/login';
export const LOGOUT = '/logout';
export const PUBLIC_PROJECT = '/project-public/:projectUUID';
export const PROJECT = '/project/:projectUUID';
-export const CALLBACK = '/callback';
+export const CALLBACK = '/handle-login';
export const STREETVIEW_CALLBACK = '/streetview/callback';
diff --git a/react/src/hooks/environment/useAppConfiguration.ts b/react/src/hooks/environment/useAppConfiguration.ts
index 59d34341..27089ee0 100644
--- a/react/src/hooks/environment/useAppConfiguration.ts
+++ b/react/src/hooks/environment/useAppConfiguration.ts
@@ -18,12 +18,14 @@ function getGeoapiUrl(backend: GeoapiBackendEnvironment): string {
switch (backend) {
case GeoapiBackendEnvironment.Local:
return 'http://localhost:8888';
+ case GeoapiBackendEnvironment.Experimental:
+ return 'https://hazmapper.tacc.utexas.edu/geoapi-experimental';
case GeoapiBackendEnvironment.Dev:
- return 'https://agave.designsafe-ci.org/geo-dev/v2';
+ return 'https://hazmapper.tacc.utexas.edu/geoapi-dev';
case GeoapiBackendEnvironment.Staging:
- return 'https://agave.designsafe-ci.org/geo-staging/v2';
+ return 'https://hazmapper.tacc.utexas.edu/geoapi-staging';
case GeoapiBackendEnvironment.Production:
- return 'https://agave.designsafe-ci.org/geo/v2';
+ return 'https://hazmapper.tacc.utexas.edu/geoapi';
default:
throw new Error(
'Unsupported TARGET/GEOAPI_BACKEND Type. Please check the .env file.'
@@ -36,9 +38,13 @@ function getGeoapiUrl(backend: GeoapiBackendEnvironment): string {
*/
function getDesignsafePortalUrl(backend: DesignSafePortalEnvironment): string {
if (backend === DesignSafePortalEnvironment.Production) {
- return 'https://www.designsafe-ci.org/';
+ return 'https://www.designsafe-ci.org';
+ } else if (backend === DesignSafePortalEnvironment.Next) {
+ return 'https://designsafeci-next.tacc.utexas.edu';
+ } else if (backend === DesignSafePortalEnvironment.Dev) {
+ return 'https://designsafeci-dev.tacc.utexas.edu';
} else {
- return 'https://designsafeci-dev.tacc.utexas.edu/';
+ throw new Error('Unsupported DS environment');
}
}
@@ -62,40 +68,15 @@ export const useAppConfiguration = (): AppConfiguration => {
};
if (/^localhost/.test(hostname) || /^hazmapper.local/.test(hostname)) {
- // Check if jwt has been set properly if we are using local geoapi
- if (
- localDevelopmentConfiguration.geoapiBackend ===
- GeoapiBackendEnvironment.Local
- ) {
- if (
- localDevelopmentConfiguration.jwt.startsWith('INSERT YOUR JWT HERE')
- ) {
- console.error(
- 'JWT has not been added to secret_local.ts; see README'
- );
- throw new Error('JWT has not been added to secret_local.ts');
- }
- }
-
- // local devevelopers can use localhost or hazmapper.local but
- // hazmapper.local has been preferred in the past as TAPIS only supported it as a frame ancestor
- // then (i.e. it allows for point cloud iframe preview)
- const clientId = /^localhost/.test(hostname)
- ? 'XgCBlhfAaqfv7jTu3NRc4IJDGdwa'
- : 'Eb9NCCtWkZ83c01UbIAITFvhD9ka';
-
const appConfig: AppConfiguration = {
basePath: basePath,
- clientId: clientId,
geoapiBackend: localDevelopmentConfiguration.geoapiBackend,
geoapiUrl: getGeoapiUrl(localDevelopmentConfiguration.geoapiBackend),
- designSafeUrl: 'https://agave.designsafe-ci.org/',
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
),
mapillary: mapillaryConfig,
taggitUrl: origin + '/taggit-staging',
- jwt: localDevelopmentConfiguration.jwt,
};
appConfig.mapillary.clientId = '5156692464392931';
appConfig.mapillary.clientSecret =
@@ -107,15 +88,10 @@ export const useAppConfiguration = (): AppConfiguration => {
/^hazmapper.tacc.utexas.edu/.test(hostname) &&
pathname.startsWith('/staging')
) {
- const clientId = basePath.includes('react')
- ? 'AhV_h3Ilvrfs1S2Cj10yj82G0Uoa' // "staging-react" client
- : 'foitdqFcimPzKZuMhbQ1oyh3Anka'; // "staging client" client
const appConfig: AppConfiguration = {
basePath: basePath,
- clientId: clientId,
geoapiBackend: GeoapiBackendEnvironment.Staging,
geoapiUrl: getGeoapiUrl(GeoapiBackendEnvironment.Staging),
- designSafeUrl: 'https://agave.designsafe-ci.org/',
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
),
@@ -133,15 +109,10 @@ export const useAppConfiguration = (): AppConfiguration => {
/^hazmapper.tacc.utexas.edu/.test(hostname) &&
pathname.startsWith('/dev')
) {
- const clientId = basePath.includes('react')
- ? '9rWjQLiJb0XPXHicmUh1RUq6rOEa' // "react-dev" client
- : 'oEuGsl7xi015wnrEpxIeUmvzc6Qa'; // "dev" client
const appConfig: AppConfiguration = {
basePath: basePath,
- clientId: clientId,
geoapiBackend: GeoapiBackendEnvironment.Dev,
geoapiUrl: getGeoapiUrl(GeoapiBackendEnvironment.Dev),
- designSafeUrl: 'https://agave.designsafe-ci.org/',
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
),
@@ -157,15 +128,10 @@ export const useAppConfiguration = (): AppConfiguration => {
'MLY|4936281379826603|f8c4732d3c9d96582b86158feb1c1a7a';
return appConfig;
} else if (/^hazmapper.tacc.utexas.edu/.test(hostname)) {
- const clientId = basePath.includes('react')
- ? 'XEMnINR8b8hA6kFxE69HVTyoNCga' // "hazmapper-react" client
- : 'tMvAiRdcsZ52S_89lCkO4x3d6VMa'; // "hazmapper" client
const appConfig: AppConfiguration = {
basePath: basePath,
- clientId: clientId,
geoapiBackend: GeoapiBackendEnvironment.Production,
geoapiUrl: getGeoapiUrl(GeoapiBackendEnvironment.Production),
- designSafeUrl: 'https://agave.designsafe-ci.org/',
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Production
),
diff --git a/react/src/hooks/index.ts b/react/src/hooks/index.ts
index 859181ec..6f530573 100644
--- a/react/src/hooks/index.ts
+++ b/react/src/hooks/index.ts
@@ -4,3 +4,4 @@ export { useTileServers } from './tileServers/useTileServers';
export { default as useSystems } from './systems/useSystems';
export * from './environment';
export * from './projects';
+export * from './user';
diff --git a/react/src/hooks/projects/useProjects.ts b/react/src/hooks/projects/useProjects.ts
index 10a22ec2..c37787e4 100644
--- a/react/src/hooks/projects/useProjects.ts
+++ b/react/src/hooks/projects/useProjects.ts
@@ -39,7 +39,7 @@ export const useProject = ({
export const useDsProjects =
(): UseQueryResult => {
const query = useGet({
- endpoint: `projects/v2/`,
+ endpoint: `/api/projects/v2/`,
key: ['projectsv2'],
apiService: ApiService.DesignSafe,
});
diff --git a/react/src/hooks/systems/useSystems.ts b/react/src/hooks/systems/useSystems.ts
index 4732cebd..99ddf609 100644
--- a/react/src/hooks/systems/useSystems.ts
+++ b/react/src/hooks/systems/useSystems.ts
@@ -4,9 +4,9 @@ import { useGet } from '../../requests';
const useSystems = (): UseQueryResult => {
return useGet({
- endpoint: '/systems/v2?type=STORAGE',
- key: ['systemsv2'],
- apiService: ApiService.DesignSafe,
+ endpoint: '/v3/systems/?listType=ALL',
+ key: ['systemsv3'],
+ apiService: ApiService.Tapis,
transform: (data) => data.result,
});
};
diff --git a/react/src/hooks/user/index.ts b/react/src/hooks/user/index.ts
new file mode 100644
index 00000000..aede95c7
--- /dev/null
+++ b/react/src/hooks/user/index.ts
@@ -0,0 +1,2 @@
+export { useEnsureAuthenticatedUserHasValidTapisToken } from './useEnsureAuthenticatedUserHasValidTapisToken';
+export { default as useAuthenticatedUser } from './useAuthenticatedUser';
diff --git a/react/src/hooks/user/useAuthenticatedUser.ts b/react/src/hooks/user/useAuthenticatedUser.ts
index 46754c8e..d884c411 100644
--- a/react/src/hooks/user/useAuthenticatedUser.ts
+++ b/react/src/hooks/user/useAuthenticatedUser.ts
@@ -1,17 +1,22 @@
-import { UseQueryResult } from 'react-query';
-import { ApiService, AuthenticatedUser } from '../../types';
-import { useGet } from '../../requests';
+import { useSelector } from 'react-redux';
+import { RootState } from '../../redux/store';
+import { AuthenticatedUser } from '../../types';
-const useAuthenticatedUser = (): UseQueryResult => {
- return useGet({
- endpoint: '/oauth2/userinfo?schema=openid',
- key: ['username'],
- apiService: ApiService.Tapis,
- transform: (data) => ({
- username: data.name,
- email: data.email,
- }),
- });
+type SuccessResult = {
+ data: T;
+ isLoading: false;
+ error: null;
+};
+
+// TODO remove this placeholder hook
+const useAuthenticatedUser = (): SuccessResult => {
+ let username = useSelector((state: RootState) => state.auth.user?.username);
+
+ if (!username) {
+ username = '';
+ }
+
+ return { data: { username }, isLoading: false, error: null };
};
export default useAuthenticatedUser;
diff --git a/react/src/hooks/user/useEnsureAuthenticatedUserHasValidTapisToken.ts b/react/src/hooks/user/useEnsureAuthenticatedUserHasValidTapisToken.ts
new file mode 100644
index 00000000..be795b28
--- /dev/null
+++ b/react/src/hooks/user/useEnsureAuthenticatedUserHasValidTapisToken.ts
@@ -0,0 +1,15 @@
+import { useNavigate, useLocation } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { isTokenValid } from '../../utils/authUtils';
+import { RootState } from '../../redux/store';
+
+export function useEnsureAuthenticatedUserHasValidTapisToken() {
+ const navigate = useNavigate();
+ const location = useLocation();
+ const authToken = useSelector((state: RootState) => state.auth.authToken);
+
+ // if user has auth token, ensure its valid and if not, redirect to login
+ if (authToken && !isTokenValid(authToken)) {
+ navigate(`/login?to=${encodeURIComponent(location.pathname)}`);
+ }
+}
diff --git a/react/src/pages/Callback/Callback.tsx b/react/src/pages/Callback/Callback.tsx
index 26fa78a9..63913b08 100644
--- a/react/src/pages/Callback/Callback.tsx
+++ b/react/src/pages/Callback/Callback.tsx
@@ -1,7 +1,9 @@
import React, { useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { useDispatch } from 'react-redux';
-import { loginSuccess, logout } from '../../redux/authSlice';
+import { jwtDecode } from 'jwt-decode';
+import { loginSuccess } from '../../redux/authSlice';
+import { AuthenticatedUser, AuthToken } from '../../types';
export default function CallbackPage() {
const dispatch = useDispatch();
@@ -9,31 +11,23 @@ export default function CallbackPage() {
const navigate = useNavigate();
useEffect(() => {
- // Parse the query parameters from the URL
- const params = new URLSearchParams(location.hash.slice(1));
-
- // Check the state value against the expected value
- const state = params.get('state');
- const expectedState = localStorage.getItem('authState');
- if (state !== expectedState) {
- console.error('State for callback is incorrect. Send to login');
+ /* TODO use hash instead of search https://tacc-main.atlassian.net/browse/WG-367 */
+ const params = new URLSearchParams(location.search);
+ const redirectTo = localStorage.getItem('toParam') || '/';
+ const token = params.get('access_token');
+ const expiresAt = params.get('expires_at');
- // Redirect the user to the login page
- dispatch(logout());
- return;
- }
+ if (token && expiresAt) {
+ const username = jwtDecode(token)['tapis/username'];
- const redirectTo = localStorage.getItem('toParam') || '/';
+ const authToken: AuthToken = { token, expiresAt };
+ const user: AuthenticatedUser = { username };
- const token = params.get('access_token');
- const expiresIn = params.get('expires_in');
- if (token && expiresIn) {
- const expires = Date.now() + parseInt(expiresIn) * 1000;
- // Save the token to the Redux store
- dispatch(loginSuccess({ token, expires }));
+ // Save the token/username to the Redux store
+ dispatch(loginSuccess({ user, authToken }));
navigate(redirectTo);
}
- }, [dispatch]);
+ }, [dispatch, location, navigate]);
- return Logging in... ;
+ return Logging in. ;
}
diff --git a/react/src/pages/Login/Login.test.tsx b/react/src/pages/Login/Login.test.tsx
index 5bac8d82..f7a13d8c 100644
--- a/react/src/pages/Login/Login.test.tsx
+++ b/react/src/pages/Login/Login.test.tsx
@@ -7,6 +7,23 @@ import { QueryClientProvider } from 'react-query';
import { testQueryClient } from '../../testUtil';
import { MemoryRouter } from 'react-router';
+beforeAll(() => {
+ const mockLocation = {
+ href: 'http://localhost:4200/login',
+ hostname: 'localhost',
+ pathname: '/login',
+ assign: jest.fn(),
+ replace: jest.fn(),
+ // You can add other properties if needed
+ };
+
+ jest.spyOn(window, 'location', 'get').mockReturnValue(mockLocation as any);
+});
+
+afterAll(() => {
+ jest.restoreAllMocks(); // Restore the original window.location after tests
+});
+
test('renders login', async () => {
const { getByText } = render(
@@ -18,7 +35,11 @@ test('renders login', async () => {
);
expect(getByText(/Logging in/)).toBeDefined();
+
await waitFor(() => {
- expect(localStorage.getItem('authState')).not.toBeNull();
+ // Check that localStorage was set with the correct "toParam"
+ expect(localStorage.getItem('toParam')).toBe('/');
+ // Check that the mocked location was set correctly
+ expect(window.location.href).toContain('geoapi');
});
});
diff --git a/react/src/pages/Login/Login.tsx b/react/src/pages/Login/Login.tsx
index 16c94393..cca182fe 100644
--- a/react/src/pages/Login/Login.tsx
+++ b/react/src/pages/Login/Login.tsx
@@ -20,20 +20,11 @@ function Login() {
if (isAuthenticated) {
navigate(toParam);
} else {
- const state = Math.random().toString(36);
- // Save the authState parameter to localStorage
- localStorage.setItem('authState', state);
+ // Save the "to" parameter to localStorage
localStorage.setItem('toParam', toParam);
- const callbackUrl = (
- window.location.origin +
- configuration.basePath +
- '/callback'
- ).replace(/([^:])(\/{2,})/g, '$1/');
- // Construct the authentication URL with the client_id, redirect_uri, scope, response_type, and state parameters
- const authUrl = `https://agave.designsafe-ci.org/authorize?client_id=${configuration.clientId}&redirect_uri=${callbackUrl}&scope=openid&response_type=token&state=${state}`;
-
- window.location.replace(authUrl);
+ const GEOAPI_AUTH_URL = `${configuration.geoapiUrl}/auth/login?to=${toParam}`;
+ window.location.href = GEOAPI_AUTH_URL;
}
}, []);
diff --git a/react/src/redux/authSlice.ts b/react/src/redux/authSlice.ts
index 3bc1822c..cee8bb2e 100644
--- a/react/src/redux/authSlice.ts
+++ b/react/src/redux/authSlice.ts
@@ -1,17 +1,13 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import {
- getTokenFromLocalStorage,
- setTokenToLocalStorage,
- removeTokenFromLocalStorage,
+ getAuthenticatedUserFromLocalStorage,
+ setAuthenticatedUserFromLocalStorage,
+ removeAuthenticatedUserFromLocalStorage,
} from '../utils/authUtils';
-import { AuthState, AuthenticatedUser } from '../types';
+import { AuthenticatedUser, AuthToken } from '../types';
-// TODO consider moving to ../types/
// check local storage for our initial state
-const initialState: AuthState = {
- authToken: getTokenFromLocalStorage(),
- user: null,
-};
+const initialState = getAuthenticatedUserFromLocalStorage();
const authSlice = createSlice({
name: 'auth',
@@ -19,25 +15,21 @@ const authSlice = createSlice({
reducers: {
loginSuccess(
state,
- action: PayloadAction<{ token: string; expires: number }>
+ action: PayloadAction<{ user: AuthenticatedUser; authToken: AuthToken }>
) {
- state.authToken = {
- token: action.payload.token,
- expires: action.payload.expires,
+ state = {
+ user: action.payload.user,
+ authToken: action.payload.authToken,
};
// save to local storage
- setTokenToLocalStorage(state.authToken);
+ setAuthenticatedUserFromLocalStorage(state);
},
logout(state) {
state.user = null;
state.authToken = null;
//remove from local storage
- removeTokenFromLocalStorage();
- },
-
- setUser(state, action: PayloadAction<{ user: AuthenticatedUser }>) {
- state.user = action.payload.user;
+ removeAuthenticatedUserFromLocalStorage();
},
},
});
diff --git a/react/src/requests.test.ts b/react/src/requests.test.ts
index 5aeb50d4..95f41bda 100644
--- a/react/src/requests.test.ts
+++ b/react/src/requests.test.ts
@@ -1,47 +1,20 @@
import { getHeaders } from './requests';
-import { ApiService, GeoapiBackendEnvironment } from './types';
+import { ApiService } from './types';
import {
authenticatedUser,
unauthenticatedUser,
} from './__fixtures__/authStateFixtures';
-import { localDevConfiguration } from './__fixtures__/appConfigurationFixture';
describe('getHeaders', () => {
- it('returns JWT header when using local Geoapi', () => {
- const headers = getHeaders(
- ApiService.Geoapi,
- {
- ...localDevConfiguration,
- geoapiBackend: GeoapiBackendEnvironment.Local,
- },
- authenticatedUser
- );
-
- expect(headers).toEqual({
- 'X-JWT-Assertion-designsafe': localDevConfiguration.jwt,
- });
- });
-
- it('returns Authorization header for non-local Geoapi', () => {
- const headers = getHeaders(
- ApiService.Geoapi,
- {
- ...localDevConfiguration,
- geoapiBackend: GeoapiBackendEnvironment.Production, // Or any other non-local environment
- },
- authenticatedUser
- );
+ it('returns Authorization header for Geoapi', () => {
+ const headers = getHeaders(ApiService.Geoapi, authenticatedUser);
expect(headers).toEqual({
- Authorization: `Bearer ${authenticatedUser.authToken?.token}`,
+ 'X-Tapis-Token': `${authenticatedUser.authToken?.token}`,
});
});
it('returns no auth-related headers for unauthenticatedUser', () => {
- const headers = getHeaders(
- ApiService.Geoapi,
- localDevConfiguration,
- unauthenticatedUser
- );
+ const headers = getHeaders(ApiService.Geoapi, unauthenticatedUser);
expect(headers).toEqual({});
});
});
diff --git a/react/src/requests.ts b/react/src/requests.ts
index df9b90d7..7e1b9be7 100644
--- a/react/src/requests.ts
+++ b/react/src/requests.ts
@@ -8,13 +8,11 @@ import {
UseMutationOptions,
QueryKey,
} from 'react-query';
-import { useAppConfiguration } from './hooks';
import {
- ApiService,
- AppConfiguration,
- AuthState,
- GeoapiBackendEnvironment,
-} from './types';
+ useAppConfiguration,
+ useEnsureAuthenticatedUserHasValidTapisToken,
+} from './hooks';
+import { ApiService, AppConfiguration, AuthState } from './types';
import { v4 as uuidv4 } from 'uuid';
function getBaseApiUrl(
@@ -25,32 +23,32 @@ function getBaseApiUrl(
case ApiService.Geoapi:
return configuration.geoapiUrl;
case ApiService.DesignSafe:
- return configuration.designSafeUrl;
+ return configuration.designsafePortalUrl;
case ApiService.Tapis:
- // Tapis and DesignSafe are currently the same
- return configuration.designSafeUrl;
+ return 'https://designsafe.tapis.io';
default:
throw new Error('Unsupported api service Type.');
}
}
-export function getHeaders(
- apiService: ApiService,
- configuration: AppConfiguration,
- auth: AuthState
-) {
- // TODO_REACT add mapillary support
- if (auth.authToken?.token && apiService !== ApiService.Mapillary) {
- //Add auth information in header for DesignSafe, Tapis, Geoapi for logged in users
- if (
- apiService === ApiService.Geoapi &&
- configuration.geoapiBackend === GeoapiBackendEnvironment.Local
- ) {
- // Use JWT in request header because local geoapi API is not behind ws02
- return { 'X-JWT-Assertion-designsafe': configuration.jwt };
- }
- return { Authorization: `Bearer ${auth.authToken?.token}` };
+function usesTapisToken(apiService: ApiService) {
+ const servicesUsingTapisToken = [
+ ApiService.Geoapi,
+ ApiService.Tapis,
+ ApiService.DesignSafe,
+ ];
+ return servicesUsingTapisToken.includes(apiService);
+}
+
+export function getHeaders(apiService: ApiService, auth: AuthState) {
+ const hasTapisAuthToken = !!auth.authToken?.token;
+
+ if (hasTapisAuthToken && usesTapisToken(apiService)) {
+ return { 'X-Tapis-Token': auth.authToken?.token };
}
+
+ // TODO_REACT add mapillary support
+
return {};
}
@@ -81,8 +79,11 @@ export function useGet({
const client = axios;
const state = store.getState();
const configuration = useAppConfiguration();
+
+ useEnsureAuthenticatedUserHasValidTapisToken();
+
const baseUrl = getBaseApiUrl(apiService, configuration);
- const headers = getHeaders(apiService, configuration, state.auth);
+ const headers = getHeaders(apiService, state.auth);
let url = `${baseUrl}${endpoint}`;
@@ -137,8 +138,11 @@ export function usePost({
const state = store.getState();
const configuration = useAppConfiguration();
+ useEnsureAuthenticatedUserHasValidTapisToken();
+
const baseUrl = getBaseApiUrl(apiService, configuration);
- const headers = getHeaders(apiService, configuration, state.auth);
+
+ const headers = getHeaders(apiService, state.auth);
const postUtil = async (requestData: RequestType) => {
const response = await client.post(
diff --git a/react/src/secret_local.example.ts b/react/src/secret_local.example.ts
index 396ba952..ae7e1816 100644
--- a/react/src/secret_local.example.ts
+++ b/react/src/secret_local.example.ts
@@ -1,9 +1,5 @@
import { GeoapiBackendEnvironment, LocalAppConfiguration } from './types';
-// prettier-ignore
-const jwt = 'INSERT YOUR JWT HERE; See README ';
-
export const localDevelopmentConfiguration: LocalAppConfiguration = {
- jwt: jwt,
geoapiBackend: GeoapiBackendEnvironment.Production,
};
diff --git a/react/src/types/auth.ts b/react/src/types/auth.ts
index 5d0207e1..c78ba839 100644
--- a/react/src/types/auth.ts
+++ b/react/src/types/auth.ts
@@ -1,11 +1,10 @@
export interface AuthenticatedUser {
username: string;
- email: string;
}
export interface AuthToken {
- token: string | null;
- expires: number | null;
+ token: string;
+ expiresAt: string;
}
export interface AuthState {
diff --git a/react/src/types/environment.ts b/react/src/types/environment.ts
index d1ae074a..6e398eff 100644
--- a/react/src/types/environment.ts
+++ b/react/src/types/environment.ts
@@ -5,6 +5,7 @@ export enum GeoapiBackendEnvironment {
Production = 'production',
Staging = 'staging',
Dev = 'dev',
+ Experimental = 'experimental',
Local = 'local',
}
@@ -12,8 +13,10 @@ export enum GeoapiBackendEnvironment {
* Environment for Geoapi Backend
*/
export enum DesignSafePortalEnvironment {
- Production = 'production',
- Dev = 'dev' /* DesignSafe has 2 deployed environments: prod and dev. This dev is comparable to Geoapi's staging */,
+ Production = 'production' /* https://www.designsafe-ci.org/ */,
+ Dev = 'dev' /* https://designsafeci-dev.tacc.utexas.edu/ This dev is comparable to Geoapi's staging */,
+ Next = 'experimental' /* https://designsafeci-next.tacc.utexas.edu/ */,
+ Local = 'local' /* not supported but would be designsafe.dev */,
}
/**
@@ -23,7 +26,7 @@ export enum ApiService {
/* Geoapi api */
Geoapi = 'geoapi',
- /* DesignSafe api - for project listings */
+ /* DesignSafe api - for project listings + project metadata read/update */
DesignSafe = 'designsafe',
/* Tapis api - for system listings and file operations */
@@ -40,9 +43,6 @@ export enum ApiService {
*
*/
export interface LocalAppConfiguration {
- /* Developer's JWT token used for authentication during local development. */
- jwt: string;
-
/* The type of backend environment (production, staging, development, or local) */
geoapiBackend: GeoapiBackendEnvironment;
}
@@ -69,19 +69,13 @@ export interface AppConfiguration {
/** Base URL path for the application. */
basePath: string;
- /** Client ID used for Tapis authentication. */
- clientId: string;
-
/* The type of backend environment */
geoapiBackend: GeoapiBackendEnvironment;
/** URL for the GeoAPI service. */
geoapiUrl: string;
- /** URL for the DesignSafe/tapis API. */
- designSafeUrl: string;
-
- /** URL for the DesignSafe portal. */
+ /** URL for the DesignSafe portal and API. */
designsafePortalUrl: string;
/** Mapillary related configuration */
@@ -89,7 +83,4 @@ export interface AppConfiguration {
/** URL for taggit */
taggitUrl: string;
-
- /** Optional JWT token used for development with local geoapi service. */
- jwt?: string;
}
diff --git a/react/src/utils/authUtils.test.ts b/react/src/utils/authUtils.test.ts
new file mode 100644
index 00000000..0a15eaaf
--- /dev/null
+++ b/react/src/utils/authUtils.test.ts
@@ -0,0 +1,89 @@
+import {
+ isTokenValid,
+ getAuthenticatedUserFromLocalStorage,
+ setAuthenticatedUserFromLocalStorage,
+ removeAuthenticatedUserFromLocalStorage,
+ AUTH_KEY,
+} from './authUtils';
+import { AuthState, AuthToken } from '../types';
+
+describe('Auth Utils', () => {
+ describe('isTokenValid', () => {
+ it('should return false if authToken is null', () => {
+ expect(isTokenValid(null)).toBe(false);
+ });
+
+ it('should return false if token is expired', () => {
+ const authToken: AuthToken = {
+ token: 'fakeToken',
+ expiresAt: new Date(Date.now() - 1000).toISOString(), // Expired 1 second ago
+ };
+ expect(isTokenValid(authToken)).toBe(false);
+ });
+
+ it('should return true if token is valid', () => {
+ const authToken: AuthToken = {
+ token: 'fakeToken',
+ expiresAt: new Date(Date.now() + 1000 * 60 * 10).toISOString(), // Expires in 10 minutes
+ };
+ expect(isTokenValid(authToken)).toBe(true);
+ });
+ });
+
+ describe('getAuthenticatedUserFromLocalStorage', () => {
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ it('should return null user and token if localStorage is empty', () => {
+ const result = getAuthenticatedUserFromLocalStorage();
+ expect(result).toEqual({ user: null, authToken: null });
+ });
+
+ it('should return the user and token from localStorage', () => {
+ const authState: AuthState = {
+ user: { username: 'testUser' },
+ authToken: { token: 'fakeToken', expiresAt: '2024-12-31T23:59:59Z' },
+ };
+ localStorage.setItem(AUTH_KEY, JSON.stringify(authState));
+
+ const result = getAuthenticatedUserFromLocalStorage();
+ expect(result).toEqual(authState);
+ });
+ });
+
+ describe('setAuthenticatedUserFromLocalStorage', () => {
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ it('should store the user and token in localStorage', () => {
+ const authState: AuthState = {
+ user: { username: 'testUser' },
+ authToken: { token: 'fakeToken', expiresAt: '2024-12-31T23:59:59Z' },
+ };
+
+ setAuthenticatedUserFromLocalStorage(authState);
+ const storedValue = localStorage.getItem(AUTH_KEY);
+ expect(storedValue).toEqual(JSON.stringify(authState));
+ });
+ });
+
+ describe('removeAuthenticatedUserFromLocalStorage', () => {
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ it('should remove the user and token from localStorage', () => {
+ const authState: AuthState = {
+ user: { username: 'testUser' },
+ authToken: { token: 'fakeToken', expiresAt: '2024-12-31T23:59:59Z' },
+ };
+ localStorage.setItem(AUTH_KEY, JSON.stringify(authState));
+
+ removeAuthenticatedUserFromLocalStorage();
+ const storedValue = localStorage.getItem(AUTH_KEY);
+ expect(storedValue).toBeNull();
+ });
+ });
+});
diff --git a/react/src/utils/authUtils.ts b/react/src/utils/authUtils.ts
index 0432cb6e..3a8c9146 100644
--- a/react/src/utils/authUtils.ts
+++ b/react/src/utils/authUtils.ts
@@ -1,37 +1,43 @@
-import { AuthToken } from '../types';
+import { AuthToken, AuthState } from '../types';
-export const AUTH_KEY = 'auth';
+export const AUTH_KEY = 'authV3';
export function isTokenValid(authToken: AuthToken | null): boolean {
if (authToken) {
- if (!authToken.expires) {
+ if (!authToken.expiresAt) {
return false;
}
- const now = Date.now();
- return now < authToken.expires;
+ const now = new Date();
+ const expiresAtDate: Date = new Date(authToken.expiresAt);
+ return now < expiresAtDate;
} else {
return false;
}
}
-export function getTokenFromLocalStorage(): AuthToken {
+/**
+ * Retrieves the authentication information (user, token etc) from local storage.
+ *
+ * If not found in local storage, the function returns `null`.
+ */
+export function getAuthenticatedUserFromLocalStorage(): AuthState {
try {
- const tokenStr = localStorage.getItem(AUTH_KEY);
- if (tokenStr) {
- const auth = JSON.parse(tokenStr);
- return auth;
+ const authenticatedUserJson = localStorage.getItem(AUTH_KEY);
+ if (authenticatedUserJson) {
+ const authState = JSON.parse(authenticatedUserJson);
+ return authState;
}
} catch (e) {
console.error('Error loading state from localStorage:', e);
}
- return { token: null, expires: null };
+ return { user: null, authToken: null };
}
-export function setTokenToLocalStorage(authToken: AuthToken) {
+export function setAuthenticatedUserFromLocalStorage(authToken: AuthState) {
localStorage.setItem(AUTH_KEY, JSON.stringify(authToken));
}
-export function removeTokenFromLocalStorage() {
+export function removeAuthenticatedUserFromLocalStorage() {
localStorage.removeItem(AUTH_KEY);
}
|