Compare commits

..

No commits in common. "4e6d65645f5f3d091d9881ddaa3e36c91d14830b" and "2145df0dfb35276edba0e04ba7d3b52cf5efeaea" have entirely different histories.

10 changed files with 33 additions and 78 deletions

View File

@ -254,10 +254,6 @@ func (s *testsuite) TestDeleteAll() {
WithArgs(false).
WillReturnResult(sqlmock.NewResult(0, 1))
s.mock.
ExpectExec(regexp.QuoteMeta(`DELETE FROM "auth"`)).
WillReturnResult(sqlmock.NewResult(0, 1))
err := DeleteAll()
require.NoError(s.T(), err)
require.NoError(s.T(), s.mock.ExpectationsWereMet())

View File

@ -89,22 +89,10 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
// DeleteAll will do just that, and should only be used for testing purposes.
func DeleteAll() error {
db := database.GetDB()
if result := db.Exec(
fmt.Sprintf(`DELETE FROM %s WHERE is_system = ?`, database.QuoteTableName("user")),
false,
); result.Error != nil {
result := db.Exec(fmt.Sprintf(`DELETE FROM %s WHERE is_system = ?`, database.QuoteTableName("user")), false)
return result.Error
}
if result := db.Exec(
fmt.Sprintf(`DELETE FROM %s`, database.QuoteTableName("auth")),
); result.Error != nil {
return result.Error
}
return nil
}
// GetCapabilities gets capabilities for a user
func GetCapabilities(userID uint) ([]string, error) {
capabilities := make([]string, 0)

Binary file not shown.

View File

@ -44,7 +44,7 @@ services:
- redis_vol:/data
authentik:
image: ghcr.io/goauthentik/server:2024.10.1
image: ghcr.io/goauthentik/server:2024.8.3
restart: unless-stopped
command: server
env_file:
@ -54,7 +54,7 @@ services:
- db-postgres
authentik-worker:
image: ghcr.io/goauthentik/server:2024.10.1
image: ghcr.io/goauthentik/server:2024.8.3
restart: unless-stopped
command: worker
env_file:
@ -64,11 +64,11 @@ services:
- db-postgres
authentik-ldap:
image: ghcr.io/goauthentik/ldap:2024.10.1
image: ghcr.io/goauthentik/ldap
environment:
AUTHENTIK_HOST: 'http://authentik:9000'
AUTHENTIK_INSECURE: 'true'
AUTHENTIK_TOKEN: 'wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp'
AUTHENTIK_TOKEN: '1N7z2r5PZrNBauuyDZSnlhU4gPSih7bkooIgqbvhzBbrA1MGYyDGZmBasJqU'
restart: unless-stopped
depends_on:
- authentik

View File

@ -16,6 +16,9 @@ module.exports = defineConfig({
},
env: {
swaggerBase: '{{baseUrl}}/api/schema',
authentik: 'http://authentik:9000',
authentikLdap: 'authentik-ldap:3389',
oauthRedirect: 'http://fullstack:81',
},
baseUrl: 'http://localhost:1234',
},

View File

@ -7,8 +7,7 @@ module.exports = defineConfig({
reporterOptions: {
configFile: 'multi-reporter.json'
},
video: true,
videosFolder: 'results/videos',
video: false,
screenshotsFolder: 'results/screenshots',
e2e: {
setupNodeEvents(on, config) {
@ -16,7 +15,9 @@ module.exports = defineConfig({
},
env: {
swaggerBase: '{{baseUrl}}/api/schema',
skipStackCheck: 'true',
authentik: 'http://authentik:9000',
authentikLdap: 'authentik-ldap:3389',
oauthRedirect: 'http://npm:81',
},
}
});

View File

@ -2,7 +2,7 @@
describe('LDAP with Authentik', () => {
let token;
if (Cypress.env('skipStackCheck') === 'true' || Cypress.env('stack') === 'postgres') {
if (Cypress.env('stack') === 'postgres') {
before(() => {
cy.resetUsers();
@ -14,7 +14,7 @@ describe('LDAP with Authentik', () => {
path: '/api/settings/ldap-auth',
data: {
value: {
host: 'authentik-ldap:3389',
host: Cypress.env('authentik-ldap'),
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',

View File

@ -2,7 +2,7 @@
describe('OAuth with Authentik', () => {
let token;
if (Cypress.env('skipStackCheck') === 'true' || Cypress.env('stack') === 'postgres') {
if (Cypress.env('stack') === 'postgres') {
before(() => {
cy.resetUsers();
@ -14,12 +14,12 @@ describe('OAuth with Authentik', () => {
path: '/api/settings/oauth-auth',
data: {
value: {
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/',
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/',
identifier: 'preferred_username',
scopes: [],
auto_create_user: true
@ -50,48 +50,16 @@ describe('OAuth with Authentik', () => {
it('Should log in with OAuth', function() {
cy.task('backendApiGet', {
path: '/oauth/login?redirect_base=' + encodeURI(Cypress.config('baseUrl')),
token: token,
path: '/oauth/login?redirect_base=' + encodeURI(Cypress.env('oauthRedirect')),
}).then((data) => {
expect(data).to.have.property('result');
cy.origin('http://authentik:9000', {args: data.result}, (url) => {
cy.visit(url);
cy.get('ak-flow-executor')
.shadow()
.find('ak-stage-identification')
.shadow()
.find('input[name="uidField"]', { visible: true })
.type('cypress');
cy.get('ak-flow-executor')
.shadow()
.find('ak-stage-identification')
.shadow()
.find('button[type="submit"]', { visible: true })
.click();
cy.get('ak-flow-executor')
.shadow()
.find('ak-stage-password')
.shadow()
.find('input[name="password"]', { visible: true })
.type('fqXBfUYqHvYqiwBHWW7f');
cy.get('ak-flow-executor')
.shadow()
.find('ak-stage-password')
.shadow()
.find('button[type="submit"]', { visible: true })
.click();
})
// we should be logged in
cy.get('#root p.chakra-text')
.first()
.should('have.text', 'Nginx Proxy Manager');
// logout:
cy.clearLocalStorage();
cy.visit(data.result);
cy.get('input[name="uidField"]').type('cypress');
cy.get('button[type="submit"]').click();
cy.get('input[name="password"]').type('fqXBfUYqHvYqiwBHWW7f');
cy.get('button[type="submit"]').click();
cy.url().should('match', /fullstack/)
});
});
}

View File

@ -14,9 +14,8 @@ describe('UI Setup and Login', () => {
cy.get('input[name="password"]').type('changeme');
cy.get('form button:last').click();
cy.get('#root p.chakra-text')
.first()
.should('have.text', 'Nginx Proxy Manager');
// To fix after chakra change:
// cy.get('.navbar-nav .avatar').should('be.visible');
// logout:
cy.clearLocalStorage();

View File

@ -1,5 +1,5 @@
{
"name": "npmtestsuite",
"name": "test",
"version": "1.0.0",
"description": "",
"main": "index.js",