Production assets

Signed-off-by: snipe <snipe@snipe.net>
Merge remote-tracking branch 'origin/develop'
2024-06-18 09:33:07 +01:00 · 2024-06-18 09:32:30 +01:00 · 2024-06-18 09:31:49 +01:00 · 2024-06-18 09:30:24 +01:00 · 2024-06-18 09:22:18 +01:00 · 2024-06-18 09:20:58 +01:00
10 changed files with 239 additions and 218 deletions
@@ -17,22 +17,24 @@ class ActionlogController extends Controller

        $disk = config('filesystems.default');
        switch (config("filesystems.disks.$disk.driver")) {
-        case 's3':
-            $file = 'private_uploads/signatures/'.$filename;
-            return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
-        default:
-          $this->authorize('view', \App\Models\Asset::class);
-          $file = config('app.private_uploads').'/signatures/'.$filename;
-          $filetype = Helper::checkUploadIsImage($file);
+            case 's3':
+                $file = 'private_uploads/signatures/'.$filename;
+                return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
+            default:
+                $this->authorize('view', \App\Models\Asset::class);
+                $file = config('app.private_uploads').'/signatures/'.$filename;
+                $filetype = Helper::checkUploadIsImage($file);

-          $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
-          if ($contents === false) {
-              Log::warning('File '.$file.' not found');
-              return false;
-          } else {
-              return Response::make($contents)->header('Content-Type', $filetype);
-          }
+                $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
+                if ($contents === false) {
+                    Log::warning('File '.$file.' not found');
+                    return false;
+                } else {
+                    return Response::make($contents)->header('Content-Type', $filetype);
+                }
+        }
    }
+
    public function getStoredEula($filename){
        $this->authorize('view', \App\Models\Asset::class);
        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
@@ -26,7 +26,6 @@
    "alek13/slack": "^2.0",
    "arietimmerman/laravel-scim-server": "dev-master",
    "bacon/bacon-qr-code": "^2.0",
-    "barryvdh/laravel-debugbar": "^3.6",
    "barryvdh/laravel-dompdf": "^2.0",
    "doctrine/cache": "^1.10",
    "doctrine/dbal": "^3.1",
@@ -73,6 +72,7 @@
    "ext-zip": "*"
  },
  "require-dev": {
+    "barryvdh/laravel-debugbar": "^3.13",
    "brianium/paratest": "^v6.4.4",
    "fakerphp/faker": "^1.16",
    "mockery/mockery": "^1.4",
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "09b576ccf0db4a09af74bc9f95593c20",
+    "content-hash": "3745f0ae5ff9db99aaaef1d0fd060e08",
    "packages": [
        {
            "name": "alek13/slack",
@@ -338,90 +338,6 @@
            },
            "time": "2022-12-07T17:46:57+00:00"
        },
-        {
-            "name": "barryvdh/laravel-debugbar",
-            "version": "v3.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
-                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/routing": "^9|^10|^11",
-                "illuminate/session": "^9|^10|^11",
-                "illuminate/support": "^9|^10|^11",
-                "maximebf/debugbar": "~1.22.0",
-                "php": "^8.0",
-                "symfony/finder": "^6|^7"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3.3",
-                "orchestra/testbench-dusk": "^5|^6|^7|^8|^9",
-                "phpunit/phpunit": "^9.6|^10.5",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.13-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Barryvdh\\Debugbar\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Barryvdh\\Debugbar\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "PHP Debugbar integration for Laravel",
-            "keywords": [
-                "debug",
-                "debugbar",
-                "laravel",
-                "profiler",
-                "webprofiler"
-            ],
-            "support": {
-                "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.0"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-04-01T16:39:30+00:00"
-        },
        {
            "name": "barryvdh/laravel-dompdf",
            "version": "v2.1.1",
@@ -4613,74 +4529,6 @@
            },
            "time": "2023-05-10T11:58:31+00:00"
        },
-        {
-            "name": "maximebf/debugbar",
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
-                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8",
-                "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^4|^5|^6|^7"
-            },
-            "require-dev": {
-                "dbrekelmans/bdi": "^1",
-                "phpunit/phpunit": "^8|^9",
-                "symfony/panther": "^1|^2.1",
-                "twig/twig": "^1.38|^2.7|^3.0"
-            },
-            "suggest": {
-                "kriswallsmith/assetic": "The best way to manage assets",
-                "monolog/monolog": "Log using Monolog",
-                "predis/predis": "Redis storage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.22-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "DebugBar\\": "src/DebugBar/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxime Bouroumeau-Fuseau",
-                    "email": "maxime.bouroumeau@gmail.com",
-                    "homepage": "http://maximebf.com"
-                },
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Debug bar in the browser for php application",
-            "homepage": "https://github.com/maximebf/php-debugbar",
-            "keywords": [
-                "debug",
-                "debugbar"
-            ],
-            "support": {
-                "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.1"
-            },
-            "time": "2024-04-01T10:44:20+00:00"
-        },
        {
            "name": "monolog/monolog",
            "version": "3.5.0",
@@ -11777,6 +11625,90 @@
            ],
            "time": "2021-03-30T17:13:30+00:00"
        },
+        {
+            "name": "barryvdh/laravel-debugbar",
+            "version": "v3.13.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/laravel-debugbar.git",
+                "reference": "92d86be45ee54edff735e46856f64f14b6a8bb07"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/92d86be45ee54edff735e46856f64f14b6a8bb07",
+                "reference": "92d86be45ee54edff735e46856f64f14b6a8bb07",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/routing": "^9|^10|^11",
+                "illuminate/session": "^9|^10|^11",
+                "illuminate/support": "^9|^10|^11",
+                "maximebf/debugbar": "~1.22.0",
+                "php": "^8.0",
+                "symfony/finder": "^6|^7"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3.3",
+                "orchestra/testbench-dusk": "^5|^6|^7|^8|^9",
+                "phpunit/phpunit": "^9.6|^10.5",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.13-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\Debugbar\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Barryvdh\\Debugbar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "PHP Debugbar integration for Laravel",
+            "keywords": [
+                "debug",
+                "debugbar",
+                "laravel",
+                "profiler",
+                "webprofiler"
+            ],
+            "support": {
+                "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.5"
+            },
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-12T11:20:37+00:00"
+        },
        {
            "name": "brianium/paratest",
            "version": "v6.11.1",
@@ -12846,6 +12778,74 @@
            ],
            "time": "2024-03-13T13:12:53+00:00"
        },
+        {
+            "name": "maximebf/debugbar",
+            "version": "v1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maximebf/php-debugbar.git",
+                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
+                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8",
+                "psr/log": "^1|^2|^3",
+                "symfony/var-dumper": "^4|^5|^6|^7"
+            },
+            "require-dev": {
+                "dbrekelmans/bdi": "^1",
+                "phpunit/phpunit": "^8|^9",
+                "symfony/panther": "^1|^2.1",
+                "twig/twig": "^1.38|^2.7|^3.0"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.22-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/maximebf/php-debugbar",
+            "keywords": [
+                "debug",
+                "debugbar"
+            ],
+            "support": {
+                "issues": "https://github.com/maximebf/php-debugbar/issues",
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.1"
+            },
+            "time": "2024-04-01T10:44:20+00:00"
+        },
        {
            "name": "mockery/mockery",
            "version": "1.6.11",
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.2',
-  'full_app_version' => 'v7.0.2 - build 13978-g430808e18',
-  'build_version' => '13978',
+  'app_version' => 'v7.0.3',
+  'full_app_version' => 'v7.0.3 - build 13980-',
+  'build_version' => '13980',
  'prerelease_version' => '',
-  'hash_version' => 'g430808e18',
-  'full_hash' => 'v7.0.2-12-g430808e18',
+  'hash_version' => '',
+  'full_hash' => 'v7.0.3',
  'branch' => 'master',
 );
@@ -31,7 +31,7 @@
                "less-loader": "^6.0",
                "list.js": "^1.5.0",
                "morris.js": "github:morrisjs/morris.js",
-                "papaparse": "5.2.0",
+                "papaparse": "5.4.1",
                "select2": "4.0.13",
                "sheetjs": "^2.0.0",
                "signature_pad": "^4.2.0",
@@ -8347,9 +8347,9 @@
            "license": "(MIT AND Zlib)"
        },
        "node_modules/papaparse": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.2.0.tgz",
-            "integrity": "sha512-ylq1wgUSnagU+MKQtNeVqrPhZuMYBvOSL00DHycFTCxownF95gpLAk1HiHdUW77N8yxRq1qHXLdlIPyBSG9NSA=="
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
+            "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="
        },
        "node_modules/param-case": {
            "version": "3.0.4",
@@ -51,7 +51,7 @@
        "less-loader": "^6.0",
        "list.js": "^1.5.0",
        "morris.js": "github:morrisjs/morris.js",
-        "papaparse": "5.2.0",
+        "papaparse": "5.4.1",
        "select2": "4.0.13",
        "sheetjs": "^2.0.0",
        "signature_pad": "^4.2.0",
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class AssetModelIndexTest extends TestCase
+{
+    public function testPermissionRequiredToViewAssetModelList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('models.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListAssetModels()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('models.index'))
+            ->assertOk();
+    }
+}
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Ui;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class AssetModelStoreTest extends TestCase
+{
+    public function testPermissionRequiredToStoreAssetModel()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertForbidden();
+    }
+
+    public function testUserCanCreateAssetModels()
+    {
+        $this->assertFalse(AssetModel::where('name', 'Test Model')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertRedirect(route('models.index'));
+
+        $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
+    }
+}
@@ -1,38 +0,0 @@
-<?php
-
-namespace Tests\Feature\AssetModels\Ui;
-
-use App\Models\Category;
-use App\Models\AssetModel;
-use App\Models\Company;
-use App\Models\CustomField;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
-use App\Models\User;
-use Illuminate\Support\Facades\Crypt;
-use Tests\TestCase;
-
-class AssetModelsTest extends TestCase
-{
-    public function testUserCanListAssetModels()
-    {
-
-        $this->actingAs(User::factory()->superuser()->create())
-            ->get(route('models.index'))
-            ->assertStatus(200);
-
-    }
-
-    public function testUserCanCreateAssetModels()
-    {
-        $this->actingAs(User::factory()->superuser()->create())
-            ->post(route('models.index'), [
-                'name' => 'Test Model',
-                'category_id' => Category::factory()->create()->id
-            ])
-            ->assertStatus(302)
-            ->assertRedirect(route('models.index'));
-    }
-
-
-}
@@ -1,6 +1,6 @@
 <?php

-namespace Feature\Users\Ui;
+namespace Tests\Feature\Users\Ui;

 use App\Models\Company;
 use App\Models\User;
@@ -80,5 +80,4 @@ class ViewUserTest extends TestCase
            [$user], CurrentInventory::class
        );
    }
-
 }
Author	SHA1	Message	Date
snipe	6c6a3649ea	Production assets Signed-off-by: snipe <snipe@snipe.net>	2024-06-18 09:33:07 +01:00
snipe	05b97db747	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2024-06-18 09:32:30 +01:00
snipe	543e4c0666	Bumped version file Signed-off-by: snipe <snipe@snipe.net>	2024-06-18 09:31:49 +01:00
snipe	e28619f769	Bumped papaparse library Signed-off-by: snipe <snipe@snipe.net>	2024-06-18 09:30:24 +01:00
snipe	4d8c2d3f4e	Merge pull request #14886 from marcusmoore/fixes/debugbar Bumped debugbar from v3.13.0 to v3.13.5 to fix issue with session messages	2024-06-18 09:22:18 +01:00
snipe	f53eeb8b33	Merge pull request #14887 from marcusmoore/fixes/fix-test-namespace Fixed namespace for ViewUserTest	2024-06-18 09:20:58 +01:00
snipe	aba6d9b338	Merge pull request #14885 from marcusmoore/tests/asset-model-test-improvements Added more tests around Asset Model	2024-06-18 09:20:45 +01:00
snipe	cd5bef414c	Merge pull request #14884 from marcusmoore/fix/actionlogcontroller-fix Fixed missing `}`	2024-06-18 09:20:26 +01:00
Marcus Moore	4f2d2ae4b8	Fix namespace for ViewUserTest	2024-06-17 16:37:24 -07:00
Marcus Moore	1bd0ab7389	Move barryvdh/laravel-debugbar from require to require-dev	2024-06-17 16:28:08 -07:00
Marcus Moore	8799276c6e	Bump debugbar from v3.13.0 to v3.13.5	2024-06-17 16:25:39 -07:00
Marcus Moore	672aabf4ac	Add more tests for Asset Model index and store methods	2024-06-17 14:51:59 -07:00
Marcus Moore	796d6909d5	Add missing }	2024-06-17 14:40:06 -07:00