Laravel Shift upgrade + fixing UI composer deployment

.env-dist

@@ -84,25 +84,25 @@ APP_KEY=
 ## Cache Settings
 ##------------------------------------------------------------------------------
 
-## CACHE_DRIVER options: apc, array, database, file, memcached, redis
-#CACHE_DRIVER=file
+## CACHE_STORE options: apc, array, database, file, memcached, redis
+#CACHE_STORE=file
 ## Cache TTL in seconds
 #CACHE_DEFAULT_TTL=18000
 ## Prefix added to all caching from this installation
 #CACHE_PREFIX=dreamfactory
-## Database cache settings if CACHE_DRIVER = file
+## Database cache settings if CACHE_STORE = file
 #CACHE_PATH=storage/framework/cache/data
-## Database cache settings if CACHE_DRIVER = database
+## Database cache settings if CACHE_STORE = database
 #CACHE_TABLE=cache
-## If CACHE_DRIVER = memcached or redis
+## If CACHE_STORE = memcached or redis
 #CACHE_HOST=
 #CACHE_PORT=
 #CACHE_PASSWORD=
-## If CACHE_DRIVER = memcached
+## If CACHE_STORE = memcached
 #CACHE_WEIGHT=
 #CACHE_PERSISTENT_ID=
 #CACHE_USERNAME=
-## If CACHE_DRIVER = redis
+## If CACHE_STORE = redis
 #CACHE_DATABASE=2
 ## Which Redis client to use: predis or phpredis (PHP extension)
 #REDIS_CLIENT=predis
@@ -159,12 +159,12 @@ APP_KEY=
 ##------------------------------------------------------------------------------
 
 ## Broadcast driver options: pusher, redis, log, null (default)
-#BROADCAST_DRIVER=null
-## If BROADCAST_DRIVER = pusher
+#BROADCAST_CONNECTION=null
+## If BROADCAST_CONNECTION = pusher
 #PUSHER_APP_ID=
 #PUSHER_APP_KEY=
 #PUSHER_APP_SECRET=
-## If BROADCAST_DRIVER = redis
+## If BROADCAST_CONNECTION = redis
 #BROADCAST_HOST=
 #BROADCAST_PORT=6379
 #BROADCAST_DATABASE=1

.gitignore

@@ -39,3 +39,5 @@ composer.json.full_debug
 composer.json-install-bkup
 after.sh
 .vscode
+
+/.phpunit.cache

README.md

@@ -3,11 +3,11 @@
 </h1>
 
 <p align="center">
-    <strong>DevOps for Private APIs</strong>
+    <strong>Code Automation for Generating APIs</strong>
 </p>
 
 <p align="center">
-    <a href="http://guide.dreamfactory.com/">Getting Started Guide</a> ∙ <a href="https://genie.dreamfactory.com">Try Online</a> ∙ <a href="https://github.com/dreamfactorysoftware/dreamfactory/blob/master/CONTRIBUTING.md">Contribute</a> ∙ <a href="http://community.dreamfactory.com/">Community Support</a> ∙ <a href="https://wiki.dreamfactory.com">Docs</a>
+    <a href="http://guide.dreamfactory.com/">Getting Started Guide</a> ∙ <a href="https://dreamfactory.appsembler.com/embed/c75cd5dd-6354-453d-a03e-f3a5bbc05cfa/">Try Online</a> ∙ <a href="https://github.com/dreamfactorysoftware/dreamfactory/blob/master/CONTRIBUTING.md">Contribute</a> ∙ <a href="http://community.dreamfactory.com/">Community Support</a> ∙ <a href="https://docs.dreamfactory.com">Docs</a>
 </p>
 
 <p align="center">
@@ -21,17 +21,30 @@
 </p>
 
 <p align="center">
-<a href="https://heroku.com/deploy?template=https://github.com/dreamfactorysoftware/dreamfactory">
-  <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
+<a href="https://app.snowflake.com/marketplace/listing/GZTYZRSG47I/dreamfactory-software-dreamfactory-rest-api-generation">
+  <img src="https://github.com/dreamfactorysoftware/dreamfactory/blob/shift-124321/readme/deploy-to-snowflake.svg" alt="Deploy to Snowflake">
+</a>
+&nbsp;&nbsp;
+<a href="https://marketplace.digitalocean.com/apps/dreamfactory?refcode=e62ab9df59c2&action=deploy">
+  <img src="https://www.deploytodo.com/do-btn-blue.svg" alt="Deploy to DO">
+</a>
+</p>
+
+<p align="center">
+<a href="https://github.com/dreamfactorysoftware/df-helm">
+  <img src="https://github.com/dreamfactorysoftware/dreamfactory/blob/shift-124321/readme/deploy-with-helm.svg" alt="Deploy with Helm">
+</a>
+&nbsp;&nbsp;
+<a href="https://github.com/dreamfactorysoftware/df-docker">
+  <img src="https://github.com/dreamfactorysoftware/dreamfactory/blob/shift-124321/readme/deploy-with-docker.svg" alt="Deploy with Docker">
 </a>
 </p>
 
 ## Table of Contents
 
 * <a href="#overview">Platform Overview</a>
 * <a href="#installation">Installation Options</a>
-* <a href="#heroku">Installing on Heroku</a>
-* <a href="#hosted">DreamFactory's Cloud Environment</a>
+* <a href="#hosted">DreamFactory's Cloud Playground</a>
 * <a href="#documentation">Documentation</a>
 * <a href="#community">Support Options</a>
 * <a href="#commercial">Commercial Licenses</a>
@@ -60,25 +73,12 @@ https://github.com/dreamfactorysoftware/dreamfactory/assets/36458555/6d1569a8-07
 * Our [Helm chart](https://github.com/dreamfactorysoftware/df-helm) provides a convenient way to install DreamFactory within your Kubernetes cluster.
 * [Raspberry Pi](http://guide.dreamfactory.com/docs/raspberry-pi.html) allows you to configure DreamFactory on everybody's favorite tiny computer.
 
-
-<a name="heroku"></a>
-
-## Installing on Heroku
-
-Heroku users can easily install DreamFactory by clicking on the below button. Keep in mind like many Heroku add-ons DreamFactory comes with some limitations such as the inability to deploy a local file system-based REST API due to Heroku's file system write limitations. Additionally, DreamFactory lacks support for multiple dynos. Regardless of these limitations, it's a breeze to get started using DreamFactory on Heroku so give it a whirl!
-
-<p align="center">
-<a href="https://heroku.com/deploy?template=https://github.com/dreamfactorysoftware/dreamfactory">
-  <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
-</a>
-</p>
-
-<a href="#commercial">Contact us</a> for more information if you're interested in a feature complete version (whether hosted in our cloud environment or on-premise). Or just <a href="https://genie.dreamfactory.com/">spin up a playground instance</a> right now! 
+<a href="#commercial">Contact us</a> for more information if you're interested in a feature complete version (whether hosted in our cloud environment or on-premise). Or just <a href="https://dreamfactory.appsembler.com/embed/c75cd5dd-6354-453d-a03e-f3a5bbc05cfa/">spin up a playground instance</a> right now! 
 
 <a name="hosted"></a>
 ## DreamFactory's Cloud Playground
 
-Start testing for free with our cloud playground now by creating a DreamFactory instance at <a href="https://genie.dreamfactory.com/">https://genie.dreamfactory.com/</a>.
+Start testing for free with our cloud playground now by creating a DreamFactory instance <a href="https://genie.dreamfactory.com/">here</a>.
 
 <a name="documentation"></a>
 ## Documentation
@@ -89,15 +89,14 @@ Additional platform documentation can be found on the [DreamFactory wiki](http:/
 <a name="community"></a>
 ## Community 
 
-| <a href="https://stackoverflow.com/questions/tagged/dreamfactory"><img src="https://raw.githubusercontent.com/dreamfactorysoftware/dreamfactory/master/readme/stackoverflow.png" height="50px"/></a> | <a href="https://community.dreamfactory.com"><img src="https://raw.githubusercontent.com/dreamfactorysoftware/dreamfactory/dev-readme/readme/mark-gold.png" height="60px"/></a> | <a href="https://twitter.com/dfsoftwareinc"><img src="https://raw.githubusercontent.com/dreamfactorysoftware/dreamfactory/master/readme/twitter.png" height="40px"/></a> |
+| <a href="https://stackoverflow.com/questions/tagged/dreamfactory"><img src="https://static-00.iconduck.com/assets.00/stack-overflow-icon-2048x2048-7ohycn5z.png" height="50px"/></a> | <a href="https://community.dreamfactory.com"><img src="https://raw.githubusercontent.com/dreamfactorysoftware/dreamfactory/master/readme/vertical-logo-fullcolor.png" height="60px"/></a> | <a href="https://twitter.com/dfsoftwareinc"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/X_logo.jpg/768px-X_logo.jpg" height="40px"/></a> |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Ask and answer StackOverflow questions with the [`dreamfactory` tag](https://stackoverflow.com/questions/tagged/dreamfactory)                                                                               | Check out our [community forum](https://community.dreamfactory.com), ask questions, and discuss project direction                                                                                           | Tweet to [`@dfsoftwareinc`](https://twitter.com/dfsoftwareinc) or with the [`#dreamfactory` hashtag](https://twitter.com/search?q=%23dreamfactory&f=live)  
+| Ask and answer StackOverflow questions with the [`dreamfactory` tag](https://stackoverflow.com/questions/tagged/dreamfactory)                                                                               | Check out our [Docs](https://docs.dreamfactory.com), [Wiki](https://wiki.dreamfactory.com), and [Guide](https://guide.dreamfactory.com) for various examples and tutorials                                                                                           | Tweet to [`@dfsoftwareinc`](https://twitter.com/dfsoftwareinc) or with the [`#dreamfactory` hashtag](https://twitter.com/search?q=%23dreamfactory&f=live)  
 
 <a name="commercial"></a>
 ## Commercial Licenses
 
-In need of official technical support? Desire access to REST API generators for SQL Server, Oracle, SOAP, or mobile
-push notifications? Require API limiting and/or auditing? Schedule a demo [with our team](https://www.dreamfactory.com/demo/)!
+In need of official technical support? Desire access to REST API wrappers for SQL Server, Oracle, SOAP, or Snowflake? Require API limiting and/or auditing? Looking to extend the capabilites of your existing APIs? Schedule a demo [with our team](https://www.dreamfactory.com/demo/)!
 
 <a name="feedback"></a>
 ## Feedback and Contributions

app/Http/Controllers/Auth/RegisterController.php

@@ -43,7 +43,6 @@ public function __construct()
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
@@ -58,7 +57,6 @@ protected function validator(array $data)
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
      * @return \DreamFactory\User
      */
     protected function create(array $data)

app/Http/Controllers/Controller.php

@@ -7,7 +7,7 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
+abstract class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 }

app/Http/Controllers/SplashController.php

@@ -4,23 +4,23 @@
 
 use DreamFactory\Core\Enums\Verbs;
 use DreamFactory\Core\Models\User;
-use DreamFactory\Core\Utility\Session;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\Arr;
-use Response;
 
 class SplashController extends Controller
 {
     /**
      * Show the application splash screen to the user.
-     *
-     * @return Factory|View|Application
      */
-    public function index(): Factory|View|Application
+    public function index()
     {
-        return view("index");
+        $token = \Request::input('session_token');
+        $param = '';
+        if (! empty($token)) {
+            $param = '?session_token='.$token;
+        }
+        return redirect(config('df.landing_page', '/test_rest.html').$param);
     }
 
     public function createFirstUser()
@@ -30,32 +30,45 @@ public function createFirstUser()
             $method = $request->method();
             $data = [
                 'username_placeholder' => 'Username (Optional, defaults to email address)',
-                'email_placeholder'    => 'Email Address (Required for login)',
+                'email_placeholder' => 'Email Address (Required for login)',
             ];
             $loginAttribute = strtolower(config('df.login_attribute', 'email'));
             if ($loginAttribute === 'username') {
                 $data['username_placeholder'] = 'Username (Required for login)';
                 $data['email_placeholder'] = 'Email Address';
             }
 
-            if (Verbs::GET === $method) {
+            if ($method === Verbs::GET) {
                 $data = array_merge([
-                    'version'    => \Config::get('app.version'),
-                    'email'      => '',
-                    'name'       => '',
+                    'version' => \Config::get('app.version'),
+                    'email' => '',
+                    'name' => '',
                     'first_name' => '',
-                    'last_name'  => '',
-                    'username'   => '',
-                    'errors'     => [],
-                    'phone'      => '',
+                    'last_name' => '',
+                    'username' => '',
+                    'errors' => [],
+                    'phone' => '',
                 ], $data);
 
                 return view('firstUser', $data);
-            } elseif (Verbs::POST === $method) {
-                $data = array_merge($request->all(), $data);
-                $user = User::createFirstAdmin($data);
+            } elseif ($method === Verbs::POST) {
+                try {
+                    $data = array_merge($request->all(), $data);
+                    $user = User::createFirstAdmin($data);
 
-                if (! $user) {
+                    if (!$user) {
+                        return view('firstUser', $data);
+                    }
+
+                    // Clear all caches
+                    \Cache::flush();
+                    \Artisan::call('config:clear');
+                    \Artisan::call('route:clear');
+
+                    return redirect()->to('/');
+                } catch (\Exception $e) {
+                    \Log::error('Error creating first admin: ' . $e->getMessage());
+                    $data['errors'] = [$e->getMessage()];
                     return view('firstUser', $data);
                 }
             }
@@ -75,11 +88,11 @@ public function setupDb()
             $request = \Request::instance();
             $method = $request->method();
 
-            if (Verbs::GET === $method) {
+            if ($method === Verbs::GET) {
                 return view('setup', [
                     'version' => config('app.version'),
                 ]);
-            } elseif (Verbs::POST === $method) {
+            } elseif ($method === Verbs::POST) {
                 try {
                     if (\Cache::pull('setup_db', false)) {
                         if (! file_exists(base_path('.env'))) {
@@ -113,7 +126,7 @@ public function setupDb()
                         return view(
                             'errors.generic',
                             [
-                                'error'   => $e->getMessage(),
+                                'error' => $e->getMessage(),
                                 'version' => config('app.version'),
                             ]
                         );