Merge pull request #76 from deanblackborough/v1.12.0

v1.12.0
costs-to-expect · Oct 11, 2023 · 9da5fef · 9da5fef
2 parents 85ad8bc + 677f0dc
commit 9da5fef
Show file tree

Hide file tree

Showing 11 changed files with 785 additions and 629 deletions.
diff --git a/app/Http/Controllers/Authentication.php b/app/Http/Controllers/Authentication.php
@@ -106,8 +106,8 @@ public function createPasswordProcess(Request $request): RedirectResponse
             $request->only(['token', 'email', 'password', 'password_confirmation'])
         );
 
-        if ($result === 204) {
-            return redirect()->route('registration-complete');
+        if ($result === 204 && Auth::attempt($request->only(['email', 'password']), false)) {
+            return redirect()->route('home');
         }
 
         if ($result === 422) {

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -22,7 +22,7 @@ public function boot(): void
     {
         $api_status = [];
 
-        if (app()->environment('local')) {
+        if (app()->runningInConsole() === false && app()->environment('local')) {
             $api = new Service();
             $status = $api->status();
             if ($status['status'] === 200) {

diff --git a/app/Service/Api/Service.php b/app/Service/Api/Service.php
@@ -297,6 +297,7 @@ public function authenticationRegister(array $payload): array
             [
                 'name' => $payload['name'],
                 'email' => $payload['email'],
+                'registered_via' => 'budget',
             ]
         );
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 [
                     'name' => $payload['name'],
                     'email' => $payload['email'],
+                    'registered_via' => 'budget',
                 ]
             );
         }
@@ Expand Down @@