the encryptor specific attributs
out of the dbUser and the original
password entered by the user | +| **verifyPassword** | dbUser, password | dbUser, password | boolean | process the decryption with
the encryptor specific attributs
out of the dbUser and the original
password entrered by the user | +| **isPassword** | password | password | boolean | verifiy the formal rules of the original
password entered by the user | + +Which of the *xxxEncryptor* implementations will be used, depends on the value of the attribute `user.passwordEncryptionType`, which has to be interpreted before. + +The new Enum `PasswordEncryptionType `with the increasing values: + +* 1 = emailEncryptor +* 2 = gradidoIDEncryptor +* ... = ? + +will be used to define the order which encryptor implementation is the oldest and the newest. That means if a user is still not using the newest encryptor for his password encryption the business logic will implicit start a change to the newest encryptor. This has to be inserted in all business processes, where the user enters his password, because without the original entered password from the user no encryptor upgrade can be done. + +#### Registration Process + +The logic of the registration process has to be adapted + +* the general business logic of the ***createUser*** process will not be changed +* during the user creation set the attribut `Users.passwordEncrpytionType = 2` +* on activating the email-confirmation link the **queryOptIn** methode of the `UserResolver `is called +* because of the `users.passwordEncryptionType = 2` the `gradidoIDEncryptor `has to be used for encrypting and setting the password +* the `gradidoIDEncryptor` + * encrypts the password with the `Users.gradidoID` instead of the `UserContacts.email` + * it will creates a password-hash by using the gradidoID +* + +#### Login Process + +The logic of the login process has to be adapted by + +* search the users data by reading the `Users `and the `UsersContact` table with the `email` as input **(ongoing #2165)** +* depending on the `Users.passwordEncryptionType` decrypt the stored password + * = 1 : with the email and the existing cryptographical logic (asymetric encryption) + * = 2 : with the gradidoID and the new cryptographical logic (hashing)#### Change Password Process diff --git a/e2e-tests/README.md b/e2e-tests/README.md new file mode 100644 index 000000000..f53618ab4 --- /dev/null +++ b/e2e-tests/README.md @@ -0,0 +1,7 @@ +# Gradido end-to-end tests + +This is still WIP. + +For automated end-to-end testing one of the frameworks Cypress or Playwright will be utilized. + +For more details on how to run them, see the subfolders' README instructions. diff --git a/e2e-tests/cypress/.gitignore b/e2e-tests/cypress/.gitignore new file mode 100644 index 000000000..7dfc547b4 --- /dev/null +++ b/e2e-tests/cypress/.gitignore @@ -0,0 +1,4 @@ +tests/node_modules/ +tests/cypress/screenshots/ +tests/cypress/videos/ +tests/cucumber-messages.ndjson diff --git a/e2e-tests/cypress/Dockerfile b/e2e-tests/cypress/Dockerfile new file mode 100644 index 000000000..8c8e00da8 --- /dev/null +++ b/e2e-tests/cypress/Dockerfile @@ -0,0 +1,36 @@ +############################################################################### +# Dockerfile to create a ready-to-use Cypress Docker image for end-to-end +# testing. +# +# Based on the images containing several browsers, provided by Cypress.io +# (https://github.com/cypress-io/cypress-docker-images/tree/master/browsers) +# this Dockerfile is based a slim Linux Dockerfile using Node.js 16.14.2. +# +# Here the latest stable versions of the browsers Chromium and Firefox are +# installed before installing Cypress. +############################################################################### +FROM cypress/base:16.14.2-slim + +ARG DOCKER_WORKDIR=/tests/ +WORKDIR $DOCKER_WORKDIR + +# install dependencies +RUN apt-get -qq update > /dev/null && \ + apt-get -qq install -y bzip2 mplayer wget > /dev/null + +# install Chromium browser +RUN apt-get -qq install -y chromium > /dev/null + +# install Firefox browser +RUN wget --no-verbose -O /tmp/firefox.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US" && \ + tar -C /opt -xjf /tmp/firefox.tar.bz2 && \ + rm /tmp/firefox.tar.bz2 && \ + ln -fs /opt/firefox/firefox /usr/bin/firefox + +# clean up +RUN rm -rf /var/lib/apt/lists/* && apt-get -qq clean > /dev/null + +COPY tests/package.json tests/yarn.lock $DOCKER_WORKDIR + +RUN yarn install +COPY tests/ $DOCKER_WORKDIR diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md new file mode 100644 index 000000000..4ec1ebe51 --- /dev/null +++ b/e2e-tests/cypress/README.md @@ -0,0 +1,73 @@ +# Gradido End-to-End Testing with [Cypress](https://www.cypress.io/) (CI-ready via Docker) + +A setup to show-case Cypress as an end-to-end testing tool for Gradido running in a Docker container. +The tests are organized in feature files written in Gherkin syntax. + + +## Features under test + +So far these features are initially tested +- [User authentication](https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/User.Authentication.feature) +- [User profile - change password](https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/UserProfile.ChangePassword.feature) +- [User registration]((https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature)) (WIP) + + +## Precondition + +Before running the tests, change to the repo's root directory (gradido). + +### Boot up the system under test + +```bash +docker-compose up +``` + +### Seed the database + +The database has to be seeded upfront to every test run. + +```bash +# change to the backend directory +cd /path/to/gradido/gradido/backend + +# install all dependencies +yarn + +# seed the database (everytime before running the tests) +yarn seed +``` + +## Execute the test + +This setup will be integrated in the Gradido Github Actions to automatically support the CI/CD process. +For now the test setup can only be used locally in two modes. + +### Run Cypress directly from the code + +```bash +# change to the tests directory +cd /path/to/gradido/e2e-tests/cypress/tests + +# install all dependencies +yarn install + +# a) run the tests on command line +yarn cypress run + +# b) open the Cypress GUI to run the tests in interactive mode +yarn cypress open +``` + + +### Run Cyprss from a separate Docker container + +```bash +# change to the cypress directory +cd /path/to/gradido/e2e-tests/cypress/ + +# build a Docker image from the Dockerfile +docker build -t gradido_e2e-tests-cypress . + +# run the Docker image and execute the given tests +docker run -it --network=host gradido_e2e-tests-cypress yarn cypress-e2e +``` diff --git a/e2e-tests/cypress/tests/.eslintignore b/e2e-tests/cypress/tests/.eslintignore new file mode 100644 index 000000000..3c3629e64 --- /dev/null +++ b/e2e-tests/cypress/tests/.eslintignore @@ -0,0 +1 @@ +node_modules diff --git a/e2e-tests/cypress/tests/.eslintrc.js b/e2e-tests/cypress/tests/.eslintrc.js new file mode 100644 index 000000000..157454287 --- /dev/null +++ b/e2e-tests/cypress/tests/.eslintrc.js @@ -0,0 +1,24 @@ +module.exports = { + root: true, + env: { + node: true, + }, + parser: "@typescript-eslint/parser", + plugins: ["cypress", "prettier", "@typescript-eslint"], + extends: [ + "standard", + "eslint:recommended", + "plugin:prettier/recommended", + "plugin:@typescript-eslint/recommended", + ], + rules: { + "no-console": ["error"], + "no-debugger": "error", + "prettier/prettier": [ + "error", + { + htmlWhitespaceSensitivity: "ignore", + }, + ], + }, +}; diff --git a/e2e-tests/cypress/tests/cypress.config.ts b/e2e-tests/cypress/tests/cypress.config.ts new file mode 100644 index 000000000..ad6a8d7de --- /dev/null +++ b/e2e-tests/cypress/tests/cypress.config.ts @@ -0,0 +1,65 @@ +import { defineConfig } from "cypress"; +import { addCucumberPreprocessorPlugin } from "@badeball/cypress-cucumber-preprocessor"; +import browserify from "@badeball/cypress-cucumber-preprocessor/browserify"; + +async function setupNodeEvents( + on: Cypress.PluginEvents, + config: Cypress.PluginConfigOptions +): Promise
- 
-
-
-
-
-
-
diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index 1192d6db3..73602c48a 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -1,7 +1,7 @@
- {{ $t('auth.left.gratitude') }}
-
-
- {{ $t('auth.left.oneGratitude') }}
-
-
-
-
- {{ $t('signup') }}
-
-
-
- {{ $t('auth.left.hasAccount') }}
-
- {{ $t('auth.left.hereLogin') }}
-
-
-
-
-
+
+
-
-
- {{ $t('auth.navbar.aboutGradido') }}
-
+
{{ $t('signup') }}
{{ $t('math.pipe') }}
{{ $t('signin') }}
@@ -49,18 +44,10 @@ export default {
color: #0e79bc !important;
}
-.navbar-toggler {
- font-size: 2.25rem;
-}
-
.authNavbar > .router-link-exact-active {
color: #383838 !important;
}
-button.navbar-toggler > span.navbar-toggler-icon {
- background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
-}
-
.auth-header {
font-family: 'Open Sans', sans-serif !important;
}
diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue
index 836e72aeb..cc0087560 100644
--- a/frontend/src/components/Auth/AuthNavbarSmall.vue
+++ b/frontend/src/components/Auth/AuthNavbarSmall.vue
@@ -1,6 +1,6 @@