240 azure oauth2

.github/workflows/build-war-and-container.yml

@@ -55,4 +55,8 @@ jobs:
           src: ghcr.io/hbtgmbh/salat:ci
           dst: |
             ${{ steps.meta.outputs.tags }}
-
+#      - name: 'Run Azure webapp deploy action using publish profile credentials'
+#        uses: azure/webapps-deploy@v2
+#        with:
+#          app-name: salat-test
+#          publish-profile: ${{ secrets.azureWebAppPublishProfile }}

.gitignore

@@ -7,3 +7,5 @@
 /tb/target/
 /.java-version
 /.jpb/
+/src/e2e/**/node_modules/
+/src/e2e/cypress/node_modules/

.run/SalatApplication test.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SalatApplication test" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="e2etest" />
+    <module name="tb" />
+    <selectedOptions>
+      <option name="environmentVariables" />
+    </selectedOptions>
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.tb.SalatApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

docker-compose.e2e.yml

@@ -0,0 +1,20 @@
+version: "3.9"  # optional since v1.27.0
+services:
+  salat:
+    image: docker.io/hbt/salat:latest
+    ports:
+      - "8080:8080"
+      - "8000:8000"
+    environment:
+      SPRING_DATASOURCE_USERNAME: salattest
+      SPRING_DATASOURCE_PASSWORD: salattest
+      SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/salat?useUnicode=true&useJDBCCompliantTimezoneShift=true&serverTimezone=Europe/Berlin&useLegacyDatetimeCode=false
+      JPDA_ADDRESS: "*:8000"
+    depends_on:
+      - db
+
+  db:
+    build: ./testdb
+    ports:
+      - "3306:3306" # not necessary, only so we can access the db from host computer.
+    command: --lower_case_table_names=1

docker-compose.yml

@@ -2,6 +2,7 @@ version: "3.9"  # optional since v1.27.0
 services:
   salat:
     image: docker.io/hbt/salat:latest
+    build: src/main/
     ports:
       - "8080:8080"
       - "8000:8000"

pom.xml

@@ -4,7 +4,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.4</version>
+		<version>2.7.8</version>
+
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>de.hbt.salat</groupId>
@@ -27,12 +28,21 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-oauth2-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.azure.spring</groupId>-->
+<!--			<artifactId>spring-cloud-azure-starter-active-directory</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -48,11 +58,6 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -82,6 +87,11 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -195,6 +205,12 @@
 			<version>2.11.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.microsoft.playwright</groupId>
+			<artifactId>playwright</artifactId>
+			<version>1.39.0</version>
+		</dependency>
+
 		<!-- web jars -->
 		<dependency>
 			<groupId>org.webjars</groupId>
@@ -219,7 +235,7 @@
 		<dependency>
 			<groupId>org.webjars.npm</groupId>
 			<artifactId>bootstrap-icons</artifactId>
-			<version>1.10.3</version>
+			<version>1.11.1</version>
 		</dependency>
 
 	</dependencies>
@@ -270,6 +286,16 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.10.1</version>
+				<!-- References to interface static methods are allowed only at source level 1.8 or above -->
+				<configuration>
+					<source>17</source>
+					<target>17</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

src/e2e/cypress/README.md

@@ -0,0 +1,16 @@
+# e2e-Test
+## Vorbereitung
+* `$ npm install`
+* DB Starten: `$ docker-compose -f .\docker-compose-infra.yml up` (im Project root)
+* Salat mit Profil 'test' starten (die Authentifizierung wird deaktiviert)
+  * [runConfiguration](../../.run/SalatApplication test.run.xml)
+
+## Ausführung
+* `$ cypress run`
+
+## Entwicklung von Tests
+* `$ cypress open`
+  * -> E2E Testing
+  * -> Browser auswählen
+  * -> spec auswählen
+

src/e2e/cypress/cypress.config.ts

@@ -0,0 +1,11 @@
+import {defineConfig} from "cypress";
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:8080',
+    experimentalModifyObstructiveThirdPartyCode: true,
+    env: {
+    },
+  },
+  chromeWebSecurity: false,
+});

src/e2e/cypress/cypress/e2e/basic.cy.ts

@@ -0,0 +1,54 @@
+describe('template spec', () => {
+  // beforeEach(() => {
+  //   cy.origin(`https://login.microsoftonline.com/`, () => {
+  //     cy.visit('/');
+  //     cy.get('[type="email"]').type(`${Cypress.env('aad_username')}{enter}`);
+  //     cy.get('[type="password"]').type(`${Cypress.env('aad_password')}{enter}`);
+  //     cy.get('[type="submit"]').type('{enter}');
+  //   });
+  // })
+
+  it('call ', () => {
+    Cypress.on('uncaught:exception', (err, runnable) => {
+      // returning false here prevents Cypress from
+      // failing the test
+      return false
+    })
+    cy.visit(
+        {
+          method: 'GET',
+          url: '/do/ShowDailyReport',
+          headers: {
+            'user': 'tt'
+          }
+        })
+  })
+})
+
+it('create report ', () => {
+  Cypress.on('uncaught:exception', (err, runnable) => {
+    // returning false here prevents Cypress from
+    // failing the test
+    return false
+  })
+  cy.visit(
+      {
+        method: 'GET',
+        url: '/do/ShowDailyReport',
+        headers: {
+          'user': 'tt'
+        }
+      })
+  const timestamp = Date.now();
+  cy.get('.createnewreport').click();
+  cy.url().should('contains', '/do/CreateDailyReport');
+  cy.get('tr:nth-child(6) select:nth-child(1)').select('01');
+  cy.url().should('contains', '/do/StoreDailyReport');
+  cy.get('textarea').click();
+  cy.get('textarea').type('test:'+timestamp);
+  cy.get('[name="save"]').click();
+  cy.get('[name="comment"]').last().should('have.text', 'test:'+timestamp);
+  cy.get('.timereports tr.timereport .function-delete').last().click();
+  cy.get('[name="comment"]').last().should('not.have.text', 'test:'+timestamp);
+
+})

src/e2e/cypress/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "[email protected]",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

src/e2e/cypress/cypress/support/commands.ts

@@ -0,0 +1,27 @@
+/// <reference types="cypress" />
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+//

src/e2e/cypress/cypress/support/e2e.ts

@@ -0,0 +1,21 @@
+// ***********************************************************
+// This example support/e2e.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+