Page Attachments - Improved UI, Now initially complete

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index e4f9b1b107c94cf1a9f47383b6f2634861eddb78..ad1c7dd20ce1b0a5f38ad7d9ce5b267d7f92f30c 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -2,33 +2,48 @@
 
 use BookStack\Ownable;
 
-if (!function_exists('versioned_asset')) {
-    /**
-     * Get the path to a versioned file.
-     *
-     * @param  string $file
-     * @return string
-     *
-     * @throws \InvalidArgumentException
-     */
-    function versioned_asset($file)
-    {
-        static $manifest = null;
-
-        if (is_null($manifest)) {
-            $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+/**
+ * Get the path to a versioned file.
+ *
+ * @param  string $file
+ * @return string
+ * @throws Exception
+ */
+function versioned_asset($file = '')
+{
+    // Don't require css and JS assets for testing
+    if (config('app.env') === 'testing') return '';
+
+    static $manifest = null;
+    $manifestPath = 'build/manifest.json';
+
+    if (is_null($manifest) && file_exists($manifestPath)) {
+        $manifest = json_decode(file_get_contents(public_path($manifestPath)), true);
+    } else if (!file_exists($manifestPath)) {
+        if (config('app.env') !== 'production') {
+            $path = public_path($manifestPath);
+            $error = "No {$path} file found, Ensure you have built the css/js assets using gulp.";
+        } else {
+            $error = "No {$manifestPath} file found, Ensure you are using the release version of BookStack";
         }
+        throw new \Exception($error);
+    }
 
-        if (isset($manifest[$file])) {
-            return baseUrl($manifest[$file]);
-        }
+    if (isset($manifest[$file])) {
+        return baseUrl($manifest[$file]);
+    }
 
-        if (file_exists(public_path($file))) {
-            return baseUrl($file);
-        }
+    throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
+}
 
-        throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
-    }
+/**
+ * Helper method to get the current User.
+ * Defaults to public 'Guest' user if not logged in.
+ * @return \BookStack\User
+ */
+function user()
+{
+    return auth()->user() ?: \BookStack\User::getDefault();
 }
 
 /**
@@ -42,7 +57,7 @@ if (!function_exists('versioned_asset')) {
 function userCan($permission, Ownable $ownable = null)
 {
     if ($ownable === null) {
-        return auth()->user() && auth()->user()->can($permission);
+        return user() && user()->can($permission);
     }
 
     // Check permission on ownable item
@@ -58,7 +73,7 @@ function userCan($permission, Ownable $ownable = null)
  */
 function setting($key, $default = false)
 {
-    $settingService = app('BookStack\Services\SettingService');
+    $settingService = app(\BookStack\Services\SettingService::class);
     return $settingService->get($key, $default);
 }
 
@@ -74,11 +89,17 @@ function baseUrl($path, $forceAppDomain = false)
     if ($isFullUrl && !$forceAppDomain) return $path;
     $path = trim($path, '/');
 
+    // Remove non-specified domain if forced and we have a domain
     if ($isFullUrl && $forceAppDomain) {
         $explodedPath = explode('/', $path);
         $path = implode('/', array_splice($explodedPath, 3));
     }
 
+    // Return normal url path if not specified in config
+    if (config('app.url') === '') {
+        return url($path);
+    }
+
     return rtrim(config('app.url'), '/') . '/' . $path;
 }