diff --git a/docker/ci/postgres/authentik.sql.gz b/docker/ci/postgres/authentik.sql.gz index f711b922..49665d4e 100644 Binary files a/docker/ci/postgres/authentik.sql.gz and b/docker/ci/postgres/authentik.sql.gz differ diff --git a/docker/docker-compose.ci.postgres.yml b/docker/docker-compose.ci.postgres.yml index 9124caac..80f06d3e 100644 --- a/docker/docker-compose.ci.postgres.yml +++ b/docker/docker-compose.ci.postgres.yml @@ -44,7 +44,7 @@ services: - redis_vol:/data authentik: - image: ghcr.io/goauthentik/server:2024.8.3 + image: ghcr.io/goauthentik/server:2024.10.1 restart: unless-stopped command: server env_file: @@ -54,7 +54,7 @@ services: - db-postgres authentik-worker: - image: ghcr.io/goauthentik/server:2024.8.3 + image: ghcr.io/goauthentik/server:2024.10.1 restart: unless-stopped command: worker env_file: @@ -64,11 +64,11 @@ services: - db-postgres authentik-ldap: - image: ghcr.io/goauthentik/ldap + image: ghcr.io/goauthentik/ldap:2024.10.1 environment: AUTHENTIK_HOST: 'http://authentik:9000' AUTHENTIK_INSECURE: 'true' - AUTHENTIK_TOKEN: '1N7z2r5PZrNBauuyDZSnlhU4gPSih7bkooIgqbvhzBbrA1MGYyDGZmBasJqU' + AUTHENTIK_TOKEN: 'wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp' restart: unless-stopped depends_on: - authentik diff --git a/test/cypress/config/ci.js b/test/cypress/config/ci.js index ae943127..5f413cf3 100644 --- a/test/cypress/config/ci.js +++ b/test/cypress/config/ci.js @@ -16,9 +16,6 @@ module.exports = defineConfig({ }, env: { swaggerBase: '{{baseUrl}}/api/schema', - authentik: 'http://authentik:9000', - authentikLdap: 'authentik-ldap:3389', - oauthRedirect: 'http://fullstack:81', }, baseUrl: 'http://localhost:1234', }, diff --git a/test/cypress/config/dev.js b/test/cypress/config/dev.js index d311fd31..93ff18d6 100644 --- a/test/cypress/config/dev.js +++ b/test/cypress/config/dev.js @@ -7,7 +7,8 @@ module.exports = defineConfig({ reporterOptions: { configFile: 'multi-reporter.json' }, - video: false, + video: true, + videosFolder: 'results/videos', screenshotsFolder: 'results/screenshots', e2e: { setupNodeEvents(on, config) { @@ -15,9 +16,7 @@ module.exports = defineConfig({ }, env: { swaggerBase: '{{baseUrl}}/api/schema', - authentik: 'http://authentik:9000', - authentikLdap: 'authentik-ldap:3389', - oauthRedirect: 'http://npm:81', + skipStackCheck: 'true', }, } }); diff --git a/test/cypress/e2e/api/Ldap.cy.js b/test/cypress/e2e/api/Ldap.cy.js index 37d655e9..0ac5bf56 100644 --- a/test/cypress/e2e/api/Ldap.cy.js +++ b/test/cypress/e2e/api/Ldap.cy.js @@ -2,7 +2,7 @@ describe('LDAP with Authentik', () => { let token; - if (Cypress.env('stack') === 'postgres') { + if (Cypress.env('skipStackCheck') === 'true' || Cypress.env('stack') === 'postgres') { before(() => { cy.resetUsers(); @@ -14,7 +14,7 @@ describe('LDAP with Authentik', () => { path: '/api/settings/ldap-auth', data: { value: { - host: Cypress.env('authentik-ldap'), + host: 'authentik-ldap:3389', base_dn: 'ou=users,DC=ldap,DC=goauthentik,DC=io', user_dn: 'cn={{USERNAME}},ou=users,DC=ldap,DC=goauthentik,DC=io', email_property: 'mail', diff --git a/test/cypress/e2e/api/OAuth.cy.js b/test/cypress/e2e/api/OAuth.cy.js index b2751089..09faea7b 100644 --- a/test/cypress/e2e/api/OAuth.cy.js +++ b/test/cypress/e2e/api/OAuth.cy.js @@ -2,7 +2,7 @@ describe('OAuth with Authentik', () => { let token; - if (Cypress.env('stack') === 'postgres') { + if (Cypress.env('skipStackCheck') === 'true' || Cypress.env('stack') === 'postgres') { before(() => { cy.resetUsers(); @@ -14,12 +14,12 @@ describe('OAuth with Authentik', () => { path: '/api/settings/oauth-auth', data: { value: { - client_id: 'U5gCy0ymU8OofWS4nmkAPugCbWkFkkPztap38ReD', - client_secret: '9ZFClxwp7LzbfhIDk7k9DngQNQfwDAYqPrQMGXjFumCvQZATtXCwme20o0TnLP6uEHUkKqEFOInhxp01gVeaHCLW83iTK4PonoUnpFnXgyZAcu0H3zBxxOkVtRwACaoW', - authorization_url: Cypress.env('authentik') + '/application/o/authorize/', - resource_url: Cypress.env('authentik') + '/application/o/userinfo/', - token_url: Cypress.env('authentik') + '/application/o/token/', - logout_url: Cypress.env('authentik') + '/application/o/npm3/end-session/', + client_id: '7iO2AvuUp9JxiSVkCcjiIbQn4mHmUMBj7yU8EjqU', + client_secret: 'VUMZzaGTrmXJ8PLksyqzyZ6lrtz04VvejFhPMBP9hGZNCMrn2LLBanySs4ta7XGrDr05xexPyZT1XThaf4ubg00WqvHRVvlu4Naa1aMootNmSRx3VAk6RSslUJmGyHzq', + authorization_url: 'http://authentik:9000/application/o/authorize/', + resource_url: 'http://authentik:9000/application/o/userinfo/', + token_url: 'http://authentik:9000/application/o/token/', + logout_url: 'http://authentik:9000/application/o/npm/end-session/', identifier: 'preferred_username', scopes: [], auto_create_user: true @@ -51,7 +51,7 @@ describe('OAuth with Authentik', () => { it('Should log in with OAuth', function() { cy.task('backendApiGet', { token: token, - path: '/oauth/login?redirect_base=' + encodeURI(Cypress.env('oauthRedirect')), + path: '/oauth/login?redirect_base=' + encodeURI('http://fullstack:81'), }).then((data) => { expect(data).to.have.property('result'); cy.visit(data.result); @@ -59,6 +59,8 @@ describe('OAuth with Authentik', () => { cy.get('button[type="submit"]').click(); cy.get('input[name="password"]').type('fqXBfUYqHvYqiwBHWW7f'); cy.get('button[type="submit"]').click(); + // confirmation page + cy.get('button[type="submit"]').click(); cy.url().should('match', /fullstack/) }); });