diff --git a/app/config/services.php b/app/config/services.php index a56d708628..85c313cfbb 100644 --- a/app/config/services.php +++ b/app/config/services.php @@ -19,7 +19,7 @@ return [ ], 'v1/auth' => [ // Add to docs later: You can also learn how to [configure support for our supported OAuth providers](/docs/oauth) 'name' => 'Auth', - 'description' => "The authentication service allows you to verify users accounts using basic email and password login or with a supported OAuth provider. The auth service also exposes methods to confirm users email account and recover users forgotten passwords.\n\n. You can review our currently available OAuth providers from your project console under the **'users'** menu.", + 'description' => "The authentication service allows you to verify users accounts using basic email and password login or with a supported OAuth provider. The auth service also exposes methods to confirm users email account and recover users forgotten passwords.\n\nYou can review our currently available OAuth providers from your project console under the **'users'** menu.", 'controller' => 'controllers/auth.php', 'sdk' => true, ], diff --git a/app/controllers/auth.php b/app/controllers/auth.php index f7c9fb2ecd..073abcab00 100644 --- a/app/controllers/auth.php +++ b/app/controllers/auth.php @@ -30,7 +30,7 @@ $utopia->post('/v1/auth/register') ->label('abuse-limit', 10) ->param('email', '', function () {return new Email();}, 'Account email') ->param('password', '', function () {return new Password();}, 'User password') - ->param('confirmation', '', function () use ($clients) {return new Host($clients);}, 'Confirmation URL to redirect user after confirm token has been sent to user email') + ->param('confirmation', '', function () use ($clients) {return new Host($clients);}, 'Confirmation URL to redirect user after confirm token has been sent to user email') // TODO add our own built-in confirm page ->param('success', null, function () use ($clients) {return new Host($clients);}, 'Redirect when registration succeed', true) ->param('failure', null, function () use ($clients) {return new Host($clients);}, 'Redirect when registration failed', true) ->param('name', '', function () {return new Text(100);}, 'User name', true) diff --git a/docker-compose.yml b/docker-compose.yml index c45a3294f7..2cd1d9bb4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,12 +16,12 @@ services: - "80:80" - "443:443" depends_on: - - mariadb - - redis - - smtp - - clamav - - influxdb - - telegraf + - mariadb + - redis + - smtp + - clamav + - influxdb + - telegraf environment: - _APP_ENV=development - _APP_OPENSSL_KEY_V1=your-secret-key diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml index 5076a037ac..29a630b908 100644 --- a/tests/resources/docker-compose.yml +++ b/tests/resources/docker-compose.yml @@ -5,13 +5,23 @@ services: build: ../../ restart: unless-stopped volumes: - - ./../../:/usr/share/nginx/html + - ./../../app:/usr/share/nginx/html/app + - ./../../public:/usr/share/nginx/html/public + - ./../../src:/usr/share/nginx/html/src + - ./../../vendor:/usr/share/nginx/html/vendor - ./../../docker/nginx.conf:/etc/nginx/nginx.conf:rw - ./../../storage/uploads:/storage/uploads:rw - ./../../storage/cache:/storage/cache:rw ports: - "80:80" - "443:443" + depends_on: + - mariadb + - redis + - smtp + - clamav + - influxdb + - telegraf environment: - _APP_ENV=development - _APP_OPTIONS_ABUSE=disabled