Merge branch 'main' into ch88576/smartkey-updates

.github/workflows/release-build-publish.yaml

@@ -88,8 +88,12 @@ jobs:
       - name: Build image
         run: docker build . --file docker/Dockerfile --tag "p8e-ui:$VERSION"
 
-      - name: Log into registry
-        run: echo "${{ secrets.DOCKER_REGISTRY_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
 
       - name: Push image
         run: |
@@ -103,3 +107,11 @@ jobs:
 
           docker tag "p8e-ui:$VERSION" $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
+
+          PRERELEASE=${{ github.event.release.prerelease }}
+          echo PRERELEASE=$PRERELEASE
+
+          if [ "$PRERELEASE" == "false" ]; then
+              docker tag "p8e-ui:$VERSION" $IMAGE_ID:latest
+              docker push $IMAGE_ID:latest
+          fi

src/App.js

@@ -1,41 +1,17 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Switch, Route, Redirect } from 'react-router-dom';
 import DashboardContainer from 'components/Dashboard/DashboardContainer';
 import { ContractContainer, ContractListContainer } from 'components/Contract';
-import { LoginContainer } from 'components/Login';
 import { KeyManagerContainer, AddServiceKeyModal } from 'components/KeyManagement';
-import { OAuthCallback } from 'components/OAuth';
 import KeyDetailsContainer from 'components/KeyManagement/KeyDetailsContainer';
 import { ScopeContainer, ScopeHistoryContainer, ScopeListContainer } from 'components/Scopes';
 import { Settings } from 'Constant';
-import { useDeepLink } from 'hooks';
-
-const App = ({ isAuthenticated }) => {
-  const { performDeepLink } = useDeepLink();
-
-  useEffect(() => {
-    if (isAuthenticated) {
-      performDeepLink();
-    }
-  }, [isAuthenticated, performDeepLink]);
-
-  if (!isAuthenticated) {
-    return (
-      <>
-        <Switch>
-          <Route exact path="/oauth/callback" component={OAuthCallback} />
-        </Switch>
-        <LoginContainer />
-      </>
-    );
-  }
 
+const App = () => {
   return (
     <>
       <Switch>
         <Route exact path="/" component={DashboardContainer} />
-        {/* <Route exact path="/login" component={LoginContainer} /> */}
-        {/* <Route exact path="/register" component={RegisterContainer} /> */}
         <Route exact path="/contracts/:uuid" component={ContractContainer} />
         <Route exact path="/contracts" component={ContractListContainer} />
         <Route exact path="/scopes/:scopeUuid/history/:uuid" component={ScopeHistoryContainer} />

src/AppContainer.tsx

@@ -1,14 +1,10 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import App from 'App';
 import { ErrorCardContainer } from 'components/ErrorCards';
 
 export const AppContainer = () => {
-    const { jwt } = useSelector(({ identityReducer }) => identityReducer);
-    const isAuthenticated = typeof jwt === 'string' && jwt.length > 0;
-
     return (<>
-        <App isAuthenticated={isAuthenticated} />
+        <App />
         <ErrorCardContainer />
     </>);
 }

src/components/Layout/Menu/MenuContainer.tsx

@@ -1,30 +1,20 @@
 import React from 'react';
-import { useDispatch } from 'react-redux';
 import { withRouter } from 'react-router-dom';
-import { logout } from 'actions/identity-actions';
-import { Menu, MenuLink, MenuLinkText, MenuListItem } from './index';
+import { Menu, MenuLink } from './index';
 import { Location } from 'history';
 
 type MenuContainerProps = {
   location: Location;
 }
 
 const MenuContainer = ({ location }) => {
-  const dispatch = useDispatch();
-  const handleLogout = () => {
-    dispatch(logout());
-  };
-
   return (
     <Menu>
       <ul>
         <MenuLink pathname="/" location={location} text="Dashboard" />
         <MenuLink pathname="/contracts" location={location} text="Contracts" />
         <MenuLink pathname="/scopes" location={location} text="Scopes" />
         <MenuLink pathname="/key-management" location={location} text="Key Management" />
-        <MenuListItem>
-          <MenuLinkText onClick={handleLogout}>Logout</MenuLinkText>
-        </MenuListItem>
       </ul>
     </Menu>
   );

src/reducers/index.ts

@@ -2,14 +2,12 @@ import { default as contractReducer } from './contract-reducer';
 import { default as scopeReducer } from './scope-reducer';
 import { default as objectReducer } from './object-reducer';
 import { default as keyReducer } from './key-reducer';
-import { default as identityReducer } from './identity-reducer';
 import { default as errorReducer } from './error-reducer';
 
 export default {
   contractReducer,
   scopeReducer,
   objectReducer,
   keyReducer,
-  identityReducer,
   errorReducer,
 };

src/store/index.js

@@ -1,7 +1,6 @@
 import { applyMiddleware, createStore, combineReducers, compose } from 'redux';
 import thunk from 'redux-thunk';
 import rootReducer from 'reducers';
-import { setup401Interceptor } from 'interceptors';
 
 const middleware = [
   thunk, // thunk middleware allows us to return promises from and receive dispatch reference in redux action creators.
@@ -23,6 +22,4 @@ const composedEnhancers = compose(applyMiddleware(...middleware), ...enhancers);
 
 const store = createStore(combineReducers({ ...rootReducer }), preloadedState, composedEnhancers);
 
-setup401Interceptor();
-
 export default store;