Skip to content

Commit

Permalink
Fixes #854 Error when creating new user
Browse files Browse the repository at this point in the history
Fixed type error in the account controller
Turned off tls in the mail server settings to prevent ssl error
Updated the mail server image to point at the active repo
  • Loading branch information
johannac committed Dec 2, 2020
1 parent 90e3676 commit d0b1b56
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MAIL_HOST=maildev
MAIL_PORT=25
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=tls
MAIL_ENCRYPTION=null

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ setup: build
# run the whole stack and open up the app in the browser
run:
docker-compose up -d
docker-compose exec web sh -c 'wait-for-it db:3306 -t 180'
docker-compose exec web sh -c 'wait-for-it web:443 -t 120'
open https://localhost:8081/

# open a bash prompt on a running web container
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/ManageAccountController.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use App\Models\User;
use Exception;
use GuzzleHttp\Client;
use Illuminate\Contracts\Mail\Mailable;
use Illuminate\Mail\Message;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
Expand Down Expand Up @@ -200,7 +200,7 @@ public function postInviteUser(Request $request)
'inviter' => Auth::user(),
];

Mail::send('Emails.inviteUser', $data, static function (Mailable $message) use ($data) {
Mail::send('Emails.inviteUser', $data, static function (Message $message) use ($data) {
$message->to($data['user']->email)
->subject(trans('Email.invite_user', [
'name' => $data['inviter']->first_name . ' ' . $data['inviter']->last_name,
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
volumes:
- "mysql-data:/var/lib/mysql"
maildev:
image: djfarrelly/maildev
image: maildev/maildev
ports:
- "1080:80"
redis:
Expand Down

0 comments on commit d0b1b56

Please sign in to comment.