Revert "fix(auth): UI logged-in detection for other auths (#2535)" (#…

…2660)

This reverts commit 44a05c7.

Makefile

@@ -13,12 +13,6 @@ MAKEFLAGS+=--no-builtin-rules
 # Project settings
 
 INSTANCE_PORT=8080
-# The defaults from the UI configuration
-# export RAZZLE_DEV_PROXY_API_PATH=http://localhost:$(INSTANCE_PORT)/Plone
-# export RAZZLE_API_PATH=http://localhost:3000
-# Uncomment the following to run against the proxy hosting testbed
-# export RAZZLE_DEV_PROXY_API_PATH=
-# export RAZZLE_API_PATH=http://localhost:49080/api/Plone
 
 # Recipe snippets for reuse
 
@@ -83,7 +77,7 @@ docs-build:
 .PHONY: start
 # Run both the back-end and the front end
 start:
-	$(MAKE) -e -j 2 start-backend start-frontend
+	$(MAKE) -j 2 start-backend start-frontend
 
 .PHONY: start-frontend
 start-frontend: dist
@@ -101,10 +95,6 @@ start-backend-docker:
 start-backend-docker-guillotina:
 	docker-compose -f g-api/docker-compose.yml up -d
 
-.PHONY: start-proxy
-start-proxy: start
-	docker-compose up -d traefik
-
 .PHONY: start-test
 start-test: ## Start Test
 	@echo "$(GREEN)==> Start Test$(RESET)"

api/buildout.cfg

@@ -2,15 +2,15 @@
 index = https://pypi.org/simple/
 extends = http://dist.plone.org/release/5.2.4/versions.cfg
 find-links += http://dist.plone.org/thirdparty/
-parts = instance plonesite site-packages robot-server
+parts = instance plonesite robot-server
 versions = versions
 
 extensions = mr.developer
 auto-checkout =
 always-checkout = force
 
 [sources]
-kitconcept.volto = git https://github.com/kitconcept/kitconcept.volto.git branch=main
+kitconcept.volto = git https://github.com/kitconcept/kitconcept.volto.git branch=workingcopysupport
 plone.rest = git git@github.com:plone/plone.rest.git branch=master
 plone.restapi = git git://github.com/plone/plone.restapi.git pushurl=git@github.com:plone/plone.restapi.git branch=master
 
@@ -62,14 +62,6 @@ upgrade-portal = False
 upgrade-all-profiles = False
 site-replace = True
 
-[site-packages]
-# Reproduce a single directory tree of the Python packages installed in this buildout's
-# `rel_client` part.  Useful for searching, browsing, or otherwise exploring all the
-# source code involved in the application in a way that's more readable and avoids
-# duplicates from older versions of eggs.
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-
 [versions]
 setuptools =
 zc.buildout =

docker-compose.yml

@@ -9,16 +9,6 @@ services:
       - ADDONS=kitconcept.volto
       - 'PROFILES=kitconcept.volto:default-homepage'
     image: plone
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.plone.entrypoints: "web"
-      traefik.http.routers.plone.rule: "PathPrefix(`/api`)"
-      # https://doc.traefik.io/traefik/middlewares/stripprefix/#configuration-examples
-      traefik.http.middlewares.strip-api-prefix.stripprefix.prefixes: "/api"
-      traefik.http.middlewares.rewrite-api-vhost.replacepathregex.regex: "^(.*)$$"
-      traefik.http.middlewares.rewrite-api-vhost.replacepathregex.replacement: "/VirtualHostBase/http/localhost:49080/VirtualHostRoot/_vh_api$$1"
-      traefik.http.routers.plone.middlewares: "strip-api-prefix@docker,rewrite-api-vhost@docker"
-      traefik.http.services.plone.loadbalancer.server.port: "8080"
 
   frontend:
     ports:
@@ -30,38 +20,3 @@ services:
     # environment:
     #   - INTERNAL_API_PATH=plone:8080/Plone
     #   - ADDONS="volto-slate:asDefault"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.frontend.entrypoints: "web"
-      traefik.http.routers.frontend.rule: "PathPrefix(`/ui`)"
-      # https://doc.traefik.io/traefik/middlewares/stripprefix/#configuration-examples
-      traefik.http.middlewares.strip-ui-prefix.stripprefix.prefixes: "/ui"
-      traefik.http.routers.frontend.middlewares: "strip-ui-prefix@docker"
-      traefik.http.services.frontend.loadbalancer.server.port: "3000"
-
-  traefik:
-    image: "traefik"
-    # Disabled so that the proxy can also be used to test deployment scenarios against
-    # a back-end and/or front-end running on the local host.
-    # depends_on:
-    #   - plone
-    #   - frontend
-    command:
-      # - "--log.level=DEBUG"
-      - "--providers.docker=true"
-      - "--providers.docker.exposedbydefault=false"
-      - "--entrypoints.web.address=:49080"
-      - "--providers.file.directory=/etc/traefik.d/"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./traefik.d/:/etc/traefik.d/"
-    ports:
-      - "49080:49080"
-
-networks:
-  default:
-    ipam:
-      driver: "default"
-      config:
-        # Use the same random subnet each time
-        - subnet: "192.168.80.0/24"

docs/source/recipes/folder-structure.md

@@ -4,26 +4,20 @@ Volto is based on React, Redux, and React-Router. All of the
 code is located in the `src` folder. The following convention for locating
 resources is used.
 
-## Components
-
-`components` contains all the React components, AKA views. This includes views for the
-management interface and the theme.
-
 ## Actions
 
 `actions` contains all the redux actions for fetching all backend data like
 content, users and external resources that are pulled into our app in general.
 
-## Reducers
+## Components
 
-`reducers` contains all the Redux reducers that manage the life-cycle for Redux actions
-and make the according changes to state.
+`components` contains all the views. This includes views for the management
+interface and the theme.
 
-## Selectors
+## Config
 
-`selectors` contains all the [Redux
-selectors](https://redux.js.org/tutorials/fundamentals/part-2-concepts-data-flow#selectors)
-that interpret state into the form used by UI components.
+In this folder all configuration is stored. All configuration can be overridden
+in your theme package.
 
 ## Constants
 
@@ -33,10 +27,9 @@ The constants contain all constants including the action types.
 
 `helpers` contains helper methods like for example url helpers.
 
-## Config
+## Reducers
 
-In this folder all configuration is stored. All configuration can be overridden
-in your theme package.
+All the reducers are located here.
 
 ## Theme
 

src/actions/types/types.js

@@ -4,7 +4,6 @@
  */
 
 import { GET_TYPES } from '@plone/volto/constants/ActionTypes';
-import { loggedIn } from '@plone/volto/selectors/userSession/userSession';
 
 /**
  * Get types function.
@@ -14,7 +13,7 @@ import { loggedIn } from '@plone/volto/selectors/userSession/userSession';
  */
 export function getTypes(url) {
   return (dispatch, getState) => {
-    if (loggedIn(getState())) {
+    if (getState().userSession.token) {
       dispatch({
         type: GET_TYPES,
         request: {

src/actions/types/types.test.js

@@ -1,15 +1,13 @@
 import { getTypes } from './types';
 import { GET_TYPES } from '@plone/volto/constants/ActionTypes';
-import { arrayWIdsToObject } from '@plone/volto/helpers/Utils/Utils';
-
-const actions = { user: [{ id: 'logout' }] };
-const actionsById = arrayWIdsToObject(actions);
 
 describe('Types action', () => {
   describe('getTypes', () => {
     it('should create an action to get the types', () => {
       const getState = () => ({
-        actions: { actions, actionsById },
+        userSession: {
+          token: 'thetoken',
+        },
       });
       const url = '/blog';
       const dispatch = jest.fn();

src/components/manage/Contents/Contents.jsx

@@ -51,7 +51,6 @@ import {
   updateColumnsContent,
 } from '@plone/volto/actions';
 import Indexes, { defaultIndexes } from '@plone/volto/constants/Indexes';
-import { loggedIn } from '@plone/volto/selectors/userSession/userSession';
 import {
   ContentsIndexHeader,
   ContentsItem,
@@ -1091,7 +1090,9 @@ class Contents extends Component {
     const selected = this.state.selected.length > 0;
     const filteredItems = this.state.filteredItems || this.state.selected;
     const path = getBaseUrl(this.props.pathname);
-    const folderContentsAction = this.props.actionsById.object.folderContents;
+    const folderContentsAction = find(this.props.objectActions, {
+      id: 'folderContents',
+    });
 
     const loading =
       (this.props.clipboardRequest?.loading &&
@@ -1101,7 +1102,7 @@ class Contents extends Component {
       (this.props.orderRequest?.loading && !this.props.orderRequest?.error) ||
       (this.props.searchRequest?.loading && !this.props.searchRequest?.error);
 
-    return this.props.userLoggedIn && this.props.objectActions.length > 0 ? (
+    return this.props.token && this.props.objectActions.length > 0 ? (
       <>
         {folderContentsAction ? (
           <Container id="page-contents" className="folder-contents">
@@ -1767,8 +1768,7 @@ export const __test__ = compose(
   connect(
     (store, props) => {
       return {
-        userLoggedIn: loggedIn(store),
-        actionsById: store.actions.actionsById,
+        token: store.userSession.token,
         items: store.search.items,
         sort: store.content.update.sort,
         index: store.content.updatecolumns.idx,
@@ -1809,8 +1809,7 @@ export default compose(
   connect(
     (store, props) => {
       return {
-        userLoggedIn: loggedIn(store),
-        actionsById: store.actions.actionsById,
+        token: store.userSession.token,
         items: store.search.items,
         sort: store.content.update.sort,
         index: store.content.updatecolumns.idx,

src/components/manage/Contents/Contents.test.jsx

@@ -5,7 +5,6 @@ import { Provider } from 'react-intl-redux';
 import { MemoryRouter } from 'react-router-dom';
 
 import { __test__ as Contents } from './Contents';
-import { arrayWIdsToObject } from '@plone/volto/helpers/Utils/Utils';
 
 const mockStore = configureStore();
 
@@ -32,23 +31,24 @@ jest.mock('moment', () =>
   })),
 );
 
-const actions = {
-  document_actions: [],
-  object: [
-    {
-      icon: '',
-      id: 'folderContents',
-      title: 'Contents',
-    },
-  ],
-  user: [{ id: 'logout' }],
-};
-const actionsById = arrayWIdsToObject(actions);
-
 describe('Contents', () => {
   it('renders a folder contents view component', () => {
     const store = mockStore({
-      actions: { actions, actionsById },
+      actions: {
+        actions: {
+          document_actions: [],
+          object: [
+            {
+              icon: '',
+              id: 'folderContents',
+              title: 'Contents',
+            },
+          ],
+        },
+      },
+      userSession: {
+        token: '14134234123qwdaf',
+      },
       search: {
         items: [
           {

src/components/manage/Edit/Edit.jsx

@@ -16,7 +16,6 @@ import qs from 'query-string';
 import { find } from 'lodash';
 import { toast } from 'react-toastify';
 
-import { loggedIn } from '@plone/volto/selectors/userSession/userSession';
 import {
   Forbidden,
   Form,
@@ -351,7 +350,7 @@ class Edit extends Component {
         )}
         {!editPermission && (
           <>
-            {this.props.userLoggedIn ? (
+            {this.props.token ? (
               <Forbidden
                 pathname={this.props.pathname}
                 staticContext={this.props.staticContext}
@@ -426,7 +425,7 @@ export const __test__ = compose(
   connect(
     (state, props) => ({
       objectActions: state.actions.actions.object,
-      userLoggedIn: loggedIn(state),
+      token: state.userSession.token,
       content: state.content.data,
       compare_to: state.content.subrequests?.compare_to?.data,
       schema: state.schema.schema,
@@ -472,7 +471,7 @@ export default compose(
   connect(
     (state, props) => ({
       objectActions: state.actions.actions.object,
-      userLoggedIn: loggedIn(state),
+      token: state.userSession.token,
       content: state.content.data,
       compare_to: state.content.subrequests?.compare_to?.data,
       schema: state.schema.schema,