From a3e8d64d4e994ec9d51d4de5fed4320e54759aba Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 8 Jan 2025 14:18:46 +0100 Subject: [PATCH] dex config --- e2e-tests/dex-config.yaml | 2 +- e2e-tests/docker-compose.yaml | 2 +- e2e-tests/env/oauth-local/.env | 14 ++++++++++++++ e2e-tests/package.json | 10 ++++++++-- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 e2e-tests/env/oauth-local/.env diff --git a/e2e-tests/dex-config.yaml b/e2e-tests/dex-config.yaml index 502c0c3f8..37a67ed21 100644 --- a/e2e-tests/dex-config.yaml +++ b/e2e-tests/dex-config.yaml @@ -17,6 +17,6 @@ staticClients: enablePasswordDB: true staticPasswords: - email: "test@example.com" - hash: "$apr1$Jt1q33YL$HtIJEPYtMAf6aEtCdF4j80" + hash: "$2y$05$olu30d4lgn7r1/Xfe13N1.5dz0N9AVlKXUFIxXUYVkhiq8D6gwYGG" username: "test" userID: "1234" diff --git a/e2e-tests/docker-compose.yaml b/e2e-tests/docker-compose.yaml index 4a511433d..3a27aec06 100644 --- a/e2e-tests/docker-compose.yaml +++ b/e2e-tests/docker-compose.yaml @@ -37,4 +37,4 @@ services: - "16009:5556" volumes: - ./dex-config.yaml:/etc/dex/cfg/config.yaml - command: ["serve", "/etc/dex/cfg/config.yaml"] + command: ["dex", "serve", "/etc/dex/cfg/config.yaml"] diff --git a/e2e-tests/env/oauth-local/.env b/e2e-tests/env/oauth-local/.env new file mode 100644 index 000000000..b53c2031b --- /dev/null +++ b/e2e-tests/env/oauth-local/.env @@ -0,0 +1,14 @@ +CONNECTIONS=mysql + +LABEL_mysql=MySql-connection +SERVER_mysql=localhost +USER_mysql=root +PASSWORD_mysql=Pwd2020Db +PORT_mysql=16004 +ENGINE_mysql=mysql@dbgate-plugin-mysql + +OAUTH_AUTH=http://localhost:16009/dex/auth +OAUTH_TOKEN=http://localhost:16009/dex/token +OAUTH_CLIENT_ID=my-app +OAUTH_CLIENT_SECRET=my-secret +OAUTH_LOGIN_FIELD=username diff --git a/e2e-tests/package.json b/e2e-tests/package.json index 45dbfc4c6..fb88f3e76 100644 --- a/e2e-tests/package.json +++ b/e2e-tests/package.json @@ -21,12 +21,18 @@ "cy:run:portal:local": "cypress run --spec cypress/e2e/portal.cy.js", "cy:run:portal:ci": "cypress run --env runOnCI=true --spec cypress/e2e/portal.cy.js", + "cy:run:oauth:local": "cypress run --spec cypress/e2e/oauth.cy.js", + "cy:run:oauth:ci": "cypress run --env runOnCI=true --spec cypress/e2e/oauth.cy.js", + "start:add-connection": "cd .. && node packer/build/bundle.js --listen-api --run-e2e-tests", "start:portal:local": "cd .. && env-cmd -f e2e-tests/env/portal-local/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal-local/.env node packer/build/bundle.js --listen-api --run-e2e-tests", "start:portal:ci": "cd .. && env-cmd -f e2e-tests/env/portal-ci/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal-ci/.env node packer/build/bundle.js --listen-api --run-e2e-tests", - "test:ci": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection:ci && start-server-and-test start:portal:ci http://localhost:3000 cy:run:portal:ci", - "test:local": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection:local && start-server-and-test start:portal:local http://localhost:3000 cy:run:portal:local" + "start:oauth:local": "cd .. && env-cmd -f e2e-tests/env/oauth-local/.env node packer/build/bundle.js --listen-api --run-e2e-tests", + "start:oauth:ci": "cd .. && env-cmd -f e2e-tests/env/oauth-ci/.env node packer/build/bundle.js --listen-api --run-e2e-tests", + + "test:ci": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection:ci && start-server-and-test start:portal:ci http://localhost:3000 cy:run:portal:ci && start-server-and-test start:oauth:ci http://localhost:3000 cy:run:oauth:ci", + "test:local": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection:local && start-server-and-test start:portal:local http://localhost:3000 cy:run:portal:local && start-server-and-test start:oauth:local http://localhost:3000 cy:run:oauth:local" } }