diff --git a/app/Http/Middleware/AllowedDomains.php b/app/Http/Middleware/AllowedDomains.php index 2a078ce5..a13e2173 100644 --- a/app/Http/Middleware/AllowedDomains.php +++ b/app/Http/Middleware/AllowedDomains.php @@ -38,6 +38,8 @@ class AllowedDomains foreach ($domains as $domain) { $response->headers->set('Access-Control-Allow-Origin', $domain); } + } else { + $response->headers->set('Access-Control-Allow-Origin', getenv('APP_URL')); } return $response; diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index ac95f6d5..16dcaf6f 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Authentifikations-Code', 'invalid' => 'Falsche E-Mail-Adresse oder falsches Passwort', 'invalid-token' => 'Token nicht korrekt', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 05921d30..b3c60e8c 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Authentication Code', 'invalid' => 'Invalid email or password', 'invalid-token' => 'Invalid token', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 6bf44808..b0948d89 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Código de Autenticación', 'invalid' => 'Dirección de correo o contraseña incorrectos', 'invalid-token' => 'Token inválido', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index f9d8e78d..b860f939 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Authentication Code', 'invalid' => 'Invalid email or password', 'invalid-token' => 'Invalid token', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index b302e80c..61ca2b8b 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Authenticatiecode', 'invalid' => 'Ongeldig e-mailadres of wachtwoord', 'invalid-token' => 'Ongeldige token', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 768d4c0f..81b58580 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Kod autentykacji', 'invalid' => 'Nieprawidłowy email lub hasło', 'invalid-token' => 'Nieprawidłowy kod', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index 2593d9d9..2289923c 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => 'Código de autenticação', 'invalid' => 'E-mail ou senha inválidos', 'invalid-token' => 'Token inválido', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index 81587b52..4a8ca4ee 100644 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => '双因素验证代码', 'invalid' => '无效的电子邮件或密码。', 'invalid-token' => '无效的令牌。', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php index 33f20d9c..660c3b5f 100644 --- a/resources/lang/zh-TW/forms.php +++ b/resources/lang/zh-TW/forms.php @@ -30,6 +30,7 @@ return [ '2fauth' => '驗證碼', 'invalid' => '錯誤的電郵地址或密碼', 'invalid-token' => '錯誤的驗證碼', + 'cookies' => 'You must enable cookies to login.', ], // Incidents form fields diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index d7df4a08..6183cd93 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,6 +27,9 @@ 'class' => 'form-control', 'placeholder' => trans('forms.login.password'), 'required' => 'required' ]) !!} +