🔖 prepping for new release

Author: mychidarko

App/Controllers/Controller.php

@@ -4,7 +4,6 @@
 
 // Leaf Auth is a package which makes user authentication simple
 use Leaf\Auth;
-use Leaf\Helpers\Password;
 
 /**
  * This is the base controller for your Leaf API Project.
@@ -13,32 +12,28 @@
  */
 class Controller extends \Leaf\ApiController
 {
-    /** @var \Leaf\Auth */
-    public $auth;
-
     public function __construct()
     {
         parent::__construct();
 
         // In this version, request isn't initialised for you. You can use
         // requestData() or request() to get request data or initialise it yourself
-        $this->auth = new Auth;
 
         // autoConnect uses the .env variables to quickly connect to db
-        $this->auth->autoConnect();
+        Auth::autoConnect();
 
         // set default token expiry time
-        $this->auth->tokenLifetime(60 * 60 * 24 * 365);
+        Auth::tokenLifetime(60 * 60 * 24 * 365);
 
         // You can configure auth to get additional customizations
         // This can be done here with the Auth::config method or
         // simply in the Config/auth.php file
-        $this->auth->config(authConfig());
+        Auth::config(AuthConfig());
 
         // You can refer to https://leafphp.netlify.app/#/leaf/v/2.4/core/auth for auth docs
 
         // New in v2.5. This allows us to use session
         // authentication instead of the default API JWT method.
-        $this->auth->useSession();
+        Auth::useSession();
     }
 }

App/Routes/index.php

@@ -8,6 +8,9 @@
 | Create a handler for 404 errors
 |
 */
+
+use function Leaf\Traits\auth;
+
 $app->set404(function() {
 	response()->headers->status(404);
 	response()->page(views_path("errors/404.html", false));

Config/functions.php

@@ -10,6 +10,22 @@ function app()
 	}
 }
 
+if (!function_exists('auth')) {
+	/**
+	 * Return Leaf's auth object
+	 */
+	function auth($guard = null)
+	{
+		if (!$guard) return \Leaf\Auth::class;
+
+		if ($guard === 'session') {
+			return \Leaf\Auth::session();
+		}
+
+		return \Leaf\Auth::guard($guard);
+	}
+}
+
 if (!function_exists('d')) {
 	/**
 	 * Return Leaf's date object
@@ -272,7 +288,7 @@ function view(string $view, array $data = [], array $mergeData = [])
 /**
  * Get an auth configuration
  */
-function authConfig($setting = null)
+function AuthConfig($setting = null)
 {
 	$config = require __DIR__ . "/auth.php";
 	return !$setting ? $config : $config[$setting];