From 03217d5df3e04cf1718e34fdf71df215dbc4878f Mon Sep 17 00:00:00 2001
From: Beto Cuevas <46721097+efturtle@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:18:10 -0600
Subject: [PATCH 1/3] fix: bug 2fa redirect to unallowed method

Bug cause by an input value that tries to do a get request to a post route.

after a failure to verify the 2fa code the url in navbar changes to validate2fa which is a post route.

- set the input value to static string 'dashboard'
---
 .gitignore                                 | 1 +
 CONTRIBUTORS                               | 1 +
 resources/views/auth/validate2fa.blade.php | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3200b78feb5..a94eca9fd60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ monicadump.sql
 npm-debug.log*
 php-extensions-*.tar.bz2
 yarn-error.log
+.vscode
\ No newline at end of file
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 42f7ed4b4aa..3c6dfa9bccb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -60,3 +60,4 @@ Geidson Benicio @geidsonc
 Maximilian Arzberger @Schlauer-Hax <hax@bbn.family>
 Gregor Bigalke @GregTCLTK <greg@bbn.family>
 Julián Garcés Rodríguez <juliangarces.jg@gmail.com>
+Alberto Cuevas Ocegueda <mexslacker@gmail.com>
diff --git a/resources/views/auth/validate2fa.blade.php b/resources/views/auth/validate2fa.blade.php
index d69d9db2e9c..55842424072 100644
--- a/resources/views/auth/validate2fa.blade.php
+++ b/resources/views/auth/validate2fa.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="container">
       <form action="{{ session('oauth') ? route('oauth.validate2fa') : route('validate2fa') }}" method="post">
-        <input type="hidden" name="url" value="{{ urlencode(url()->current()) }}" />
+        <input type="hidden" name="url" value="dashboard" />
         <div class="row">
           <div class="col-12 col-md-6 offset-md-3 offset-md-3-right">
             <div class="signup-box">

From e1e3ade734c0e175d2c7299f4d16a24f804874de Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Sun, 5 Nov 2023 19:34:18 +0100
Subject: [PATCH 2/3] Apply suggestions from code review

---
 .gitignore                                 | 3 +--
 resources/views/auth/validate2fa.blade.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a94eca9fd60..181aa149e3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,4 @@ Homestead.json
 monicadump.sql
 npm-debug.log*
 php-extensions-*.tar.bz2
-yarn-error.log
-.vscode
\ No newline at end of file
+yarn-error.log
\ No newline at end of file
diff --git a/resources/views/auth/validate2fa.blade.php b/resources/views/auth/validate2fa.blade.php
index 55842424072..6d51d18d023 100644
--- a/resources/views/auth/validate2fa.blade.php
+++ b/resources/views/auth/validate2fa.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="container">
       <form action="{{ session('oauth') ? route('oauth.validate2fa') : route('validate2fa') }}" method="post">
-        <input type="hidden" name="url" value="dashboard" />
+        <input type="hidden" name="url" value="{{ urlencode(route('dashboard.index')) }}" />
         <div class="row">
           <div class="col-12 col-md-6 offset-md-3 offset-md-3-right">
             <div class="signup-box">

From 52ce2642d96cc372b747b0119ae0d75263884cb3 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Sun, 5 Nov 2023 22:24:07 +0100
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 181aa149e3f..3200b78feb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ Homestead.json
 monicadump.sql
 npm-debug.log*
 php-extensions-*.tar.bz2
-yarn-error.log
\ No newline at end of file
+yarn-error.log