- authentication fix

- demo helper
2026-04-18 16:22:14 +00:00 · 2021-03-17 07:34:22 +01:00
parent 2c69553582
commit ce477fdaf1
13 changed files with 47 additions and 11653 deletions
--- a/app/Http/Controllers/Admin/PagesController.php
+++ b/app/Http/Controllers/Admin/PagesController.php
@@ -51,7 +51,7 @@ class PagesController extends Controller
     */
    public function update(Request $request, Page $page)
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

--- a/app/Http/Controllers/Admin/PlanController.php
+++ b/app/Http/Controllers/Admin/PlanController.php
@@ -78,7 +78,7 @@ class PlanController extends Controller
    public function store(Request $request)
    {
        // TODO: inline request
-        if (env('APP_DEMO')) {
+        if (is_demo()) {

            if (Cache::has('plan-starter-pack')) {
                $plan = Cache::get('plan-starter-pack');
@@ -110,7 +110,7 @@ class PlanController extends Controller
     */
    public function update(Request $request, $id)
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

@@ -131,7 +131,7 @@ class PlanController extends Controller
     */
    public function delete($id)
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

--- a/app/Http/Controllers/Admin/SettingController.php
+++ b/app/Http/Controllers/Admin/SettingController.php
@@ -49,7 +49,7 @@ class SettingController extends Controller
     */
    public function update(Request $request)
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

@@ -84,7 +84,7 @@ class SettingController extends Controller
    public function set_email(Request $request)
    {
        // TODO: pridat validator do requestu
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

@@ -178,7 +178,7 @@ class SettingController extends Controller
     */
    public function flush_cache()
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return $this->demo->response_with_no_content();
        }

--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -114,7 +114,7 @@ class UserController extends Controller
    public function change_role(ChangeRoleRequest $request, User $user)
    {
        // Demo preview
-        if (env('APP_DEMO') && $user->email === 'howdy@hi5ve.digial') {
+        if (is_demo_account('howdy@hi5ve.digial')) {
            return new UserResource($user);
        }

@@ -156,7 +156,7 @@ class UserController extends Controller
    public function reset_password(User $user)
    {
        // Demo preview
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return response('Done!', 204);
        }

@@ -210,7 +210,7 @@ class UserController extends Controller
     */
    public function delete_user(DeleteUserRequest $request, User $user)
    {
-        if (env('APP_DEMO')) {
+        if (is_demo()) {
            return response('Done!', 204);
        }

--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -28,7 +28,7 @@ class UserResource extends JsonResource
                    'subscription'         => $this->subscribed('main'),
                    'incomplete_payment'   => $this->hasIncompletePayment('main') ? route('cashier.payment', $this->subscription('main')->latestPayment()->id) : null,
                    'stripe_customer'      => is_null($this->stripe_id) ? false : true,
-                    'email'                => env('APP_DEMO') ? obfuscate_email($this->email) : $this->email,
+                    'email'                => is_demo() ? obfuscate_email($this->email) : $this->email,
                    'role'                 => $this->role,
                    'folders'              => $this->folder_tree,
                    'storage'              => $this->storage,
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -202,11 +202,22 @@ function get_version()
 /**
 * Check if is demo
 *
+ * @return boolean
+ */
+function is_demo()
+{
+    return config('vuefilemanager.is_demo');
+}
+
+/**
+ * Check if is demo
+ *
+ * @param $email
 * @return mixed
 */
-function is_demo($user_id)
+function is_demo_account($email)
 {
-    return env('APP_DEMO', false) && $user_id === 1;
+    return config('vuefilemanager.is_demo') && $email === 'howdy@hi5ve.digital';
 }

 /**
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -36,9 +36,9 @@ class FortifyServiceProvider extends ServiceProvider
        Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
        Fortify::resetUserPasswordsUsing(ResetUserPassword::class);

-        /*RateLimiter::for('login', function (Request $request) {
-            return Limit::perMinute(5)->by($request->email.$request->ip());
-        });*/
+        RateLimiter::for('login', function (Request $request) {
+            return Limit::perMinute(20)->by($request->email.$request->ip());
+        });

        RateLimiter::for('two-factor', function (Request $request) {
            return Limit::perMinute(5)->by($request->session()->get('login.id'));
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -4,6 +4,9 @@ return [

    'version'    => '2.0',

-    // Define size of chunk uploaded by MB. E.g. integer 128 means chunk size will be 128MB.
+    'is_demo' => env('APP_DEMO', false),
+
+    // Define size of chunk uploaded by MB.
+    // E.g. integer 128 means chunk size will be 128MB.
    'chunk_size' => env('CHUNK_SIZE', '128'),
 ];
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -19,16 +19,20 @@
    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=e71bb0286189734a8aec",
    "/chunks/app-setup.js": "/chunks/app-setup.js?id=4112238baf5cc574afb1",
    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=fdbbb11f8c216a2c3899",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=0c79abc7867f7cc7a72c",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=b9068dbb99fc1f52bad0",
    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=08ef47a59c4d6340ff5a",
    "/chunks/dashboard.js": "/chunks/dashboard.js?id=ea9d0dfc247abcaa5edc",
    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=b32bd13f9927b553b7a3",
    "/chunks/database.js": "/chunks/database.js?id=a877c2f9792396cba0c9",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6dccc2158cc6278f683d",
    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=b835f8fdedb4bc19f4a5",
    "/chunks/files.js": "/chunks/files.js?id=9b47294bd85e1f1db78e",
    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=bfc9bbbc5c50bc21cad7",
    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=1a0603549f93d781c5a3",
    "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=c869bb74e66efcad0288",
    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7f6474e743f5e147705a",
+    "/chunks/homepage.js": "/chunks/homepage.js?id=a526cba84728417d5be2",
    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7e924ee2e747d16a2810",
    "/chunks/invoices.js": "/chunks/invoices.js?id=198f163d6377feda0dd0",
    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=1a749c690540349c5276",
@@ -70,62 +74,11 @@
    "/chunks/user-storage.js": "/chunks/user-storage.js?id=d989f56de65842d84727",
    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=ce13a0e7a3ee2b607278",
    "/chunks/users.js": "/chunks/users.js?id=b26ed0a3ad0087236fd9",
-    "/js/main.17c97637e6f294a071c3.hot-update.js": "/js/main.17c97637e6f294a071c3.hot-update.js",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=0c79abc7867f7cc7a72c",
-    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=b9068dbb99fc1f52bad0",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6dccc2158cc6278f683d",
-    "/chunks/homepage.js": "/chunks/homepage.js?id=a526cba84728417d5be2",
-    "/js/main.a2fe5c71266ee2420244.hot-update.js": "/js/main.a2fe5c71266ee2420244.hot-update.js",
-    "/js/main.b786472a9a09981bf547.hot-update.js": "/js/main.b786472a9a09981bf547.hot-update.js",
-    "/js/main.391bad1600e266e62bcb.hot-update.js": "/js/main.391bad1600e266e62bcb.hot-update.js",
-    "/js/main.3504ec37c1439ed688c1.hot-update.js": "/js/main.3504ec37c1439ed688c1.hot-update.js",
-    "/js/main.39c7ac168d554855e709.hot-update.js": "/js/main.39c7ac168d554855e709.hot-update.js",
-    "/js/main.483ba4a5c0593d4c1f3e.hot-update.js": "/js/main.483ba4a5c0593d4c1f3e.hot-update.js",
-    "/js/main.aee54e267028e313163e.hot-update.js": "/js/main.aee54e267028e313163e.hot-update.js",
-    "/js/main.1f89781ed2dd8951ca23.hot-update.js": "/js/main.1f89781ed2dd8951ca23.hot-update.js",
-    "/js/main.df5be390fcb40c420d1f.hot-update.js": "/js/main.df5be390fcb40c420d1f.hot-update.js",
-    "/js/main.d7e635d6bbf0c4d3644e.hot-update.js": "/js/main.d7e635d6bbf0c4d3644e.hot-update.js",
-    "/js/main.017e801dc1070a785b73.hot-update.js": "/js/main.017e801dc1070a785b73.hot-update.js",
-    "/js/main.b6064a80244d4a93e81d.hot-update.js": "/js/main.b6064a80244d4a93e81d.hot-update.js",
-    "/js/main.257bcb7fad527850ff6d.hot-update.js": "/js/main.257bcb7fad527850ff6d.hot-update.js",
-    "/js/main.292b80eeefc140fa02b9.hot-update.js": "/js/main.292b80eeefc140fa02b9.hot-update.js",
-    "/js/main.777e70a151d5a6b3b21a.hot-update.js": "/js/main.777e70a151d5a6b3b21a.hot-update.js",
-    "/js/main.b4e2c567ededd2ed6081.hot-update.js": "/js/main.b4e2c567ededd2ed6081.hot-update.js",
-    "/js/main.0cd27ed63810732f66b7.hot-update.js": "/js/main.0cd27ed63810732f66b7.hot-update.js",
-    "/js/main.d926bbc317bdfaf51d7e.hot-update.js": "/js/main.d926bbc317bdfaf51d7e.hot-update.js",
-    "/js/main.d94d4f8108e2ccb28105.hot-update.js": "/js/main.d94d4f8108e2ccb28105.hot-update.js",
-    "/js/main.8e49e3cde12ad8cebccf.hot-update.js": "/js/main.8e49e3cde12ad8cebccf.hot-update.js",
-    "/js/main.8bf47f1253c3e0dc84e3.hot-update.js": "/js/main.8bf47f1253c3e0dc84e3.hot-update.js",
-    "/js/main.dfac72c97f63c8652b61.hot-update.js": "/js/main.dfac72c97f63c8652b61.hot-update.js",
-    "/js/main.471f6a2af21dd4cd5b45.hot-update.js": "/js/main.471f6a2af21dd4cd5b45.hot-update.js",
-    "/js/main.f4afa03bbb2a601eebe8.hot-update.js": "/js/main.f4afa03bbb2a601eebe8.hot-update.js",
-    "/js/main.1b74480f13c8aa31ff98.hot-update.js": "/js/main.1b74480f13c8aa31ff98.hot-update.js",
-    "/js/main.9a645abf7f661ba79359.hot-update.js": "/js/main.9a645abf7f661ba79359.hot-update.js",
-    "/js/main.1f6ac6edd49045179483.hot-update.js": "/js/main.1f6ac6edd49045179483.hot-update.js",
-    "/js/main.5b706a916ee18f9e9d93.hot-update.js": "/js/main.5b706a916ee18f9e9d93.hot-update.js",
-    "/js/main.ab208a7e8c55e676be34.hot-update.js": "/js/main.ab208a7e8c55e676be34.hot-update.js",
-    "/js/main.8a646a984e070c516b1a.hot-update.js": "/js/main.8a646a984e070c516b1a.hot-update.js",
-    "/js/main.6c3809a031801f04736f.hot-update.js": "/js/main.6c3809a031801f04736f.hot-update.js",
-    "/js/main.d84df10325f704e4ee66.hot-update.js": "/js/main.d84df10325f704e4ee66.hot-update.js",
-    "/js/main.dea566f54b5445fd9c16.hot-update.js": "/js/main.dea566f54b5445fd9c16.hot-update.js",
-    "/js/main.d1024df0e04f7f8919c9.hot-update.js": "/js/main.d1024df0e04f7f8919c9.hot-update.js",
-    "/js/main.cc99cd8b6c17d2817bbd.hot-update.js": "/js/main.cc99cd8b6c17d2817bbd.hot-update.js",
-    "/js/main.2aa783ea3c1d1d925b53.hot-update.js": "/js/main.2aa783ea3c1d1d925b53.hot-update.js",
-    "/js/main.9557a4132ed5a11630ac.hot-update.js": "/js/main.9557a4132ed5a11630ac.hot-update.js",
-    "/js/main.9cb85bfa9a0ae0f088cf.hot-update.js": "/js/main.9cb85bfa9a0ae0f088cf.hot-update.js",
-    "/js/main.7a3daf9258064f128cec.hot-update.js": "/js/main.7a3daf9258064f128cec.hot-update.js",
-    "/js/main.20ae4cb61b9543ae336a.hot-update.js": "/js/main.20ae4cb61b9543ae336a.hot-update.js",
-    "/js/main.5f1d4ced644ff9df3a08.hot-update.js": "/js/main.5f1d4ced644ff9df3a08.hot-update.js",
-    "/js/main.66ed1c78a4e5e6174b92.hot-update.js": "/js/main.66ed1c78a4e5e6174b92.hot-update.js",
-    "/js/main.2c51b739e21e5cf4ef23.hot-update.js": "/js/main.2c51b739e21e5cf4ef23.hot-update.js",
-    "/js/main.ad3deb02cc6e44846c49.hot-update.js": "/js/main.ad3deb02cc6e44846c49.hot-update.js",
-    "/js/main.70e52a6851a8351347c0.hot-update.js": "/js/main.70e52a6851a8351347c0.hot-update.js",
-    "/js/main.1599f1ed9683168ccf01.hot-update.js": "/js/main.1599f1ed9683168ccf01.hot-update.js",
-    "/js/main.6cea0641f46ff90ab763.hot-update.js": "/js/main.6cea0641f46ff90ab763.hot-update.js",
-    "/js/main.ed07e70a7ae8f05b7e6b.hot-update.js": "/js/main.ed07e70a7ae8f05b7e6b.hot-update.js",
-    "/js/main.505d960a7d71d76f7d6d.hot-update.js": "/js/main.505d960a7d71d76f7d6d.hot-update.js",
-    "/js/main.511dc943aa7bb408b0dc.hot-update.js": "/js/main.511dc943aa7bb408b0dc.hot-update.js",
-    "/js/main.d3b921a606471638bd76.hot-update.js": "/js/main.d3b921a606471638bd76.hot-update.js",
-    "/js/main.7cea0064e2915a01f1e4.hot-update.js": "/js/main.7cea0064e2915a01f1e4.hot-update.js",
-    "/js/main.3c455e46dae64dbf35e7.hot-update.js": "/js/main.3c455e46dae64dbf35e7.hot-update.js"
+    "/js/main.bdfdee346c5812311c9c.hot-update.js": "/js/main.bdfdee346c5812311c9c.hot-update.js",
+    "/js/main.dd1c3ba4cba8d8facd50.hot-update.js": "/js/main.dd1c3ba4cba8d8facd50.hot-update.js",
+    "/js/main.26bc42c0472f43c31869.hot-update.js": "/js/main.26bc42c0472f43c31869.hot-update.js",
+    "/js/main.7d71add4671372139d90.hot-update.js": "/js/main.7d71add4671372139d90.hot-update.js",
+    "/js/main.13d6c18d8977eba99c42.hot-update.js": "/js/main.13d6c18d8977eba99c42.hot-update.js",
+    "/js/main.bcdf8fd7687a13420d79.hot-update.js": "/js/main.bcdf8fd7687a13420d79.hot-update.js",
+    "/js/main.26088c7c9a3c036d4457.hot-update.js": "/js/main.26088c7c9a3c036d4457.hot-update.js"
 }
--- a/resources/babel.babel
+++ b/resources/babel.babel
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -4,7 +4,7 @@
        <!--System alerts-->
        <Alert/>

-        <div id="application-wrapper" v-if="! isGuestLayout">
+        <div id="application-wrapper" v-if="config.isAuthenticated">

            <!-- Full File Preview -->
            <FileFullPreview/>
@@ -153,7 +153,6 @@ export default {

        // Store config to vuex
        this.$store.commit('INIT', {
-            authCookie: this.$root.$data.config.hasAuthCookie,
            config: this.$root.$data.config,
            rootDirectory: {
                name: this.$t('locations.home'),
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -5,7 +5,6 @@ const defaultState = {
    FilePreviewType: localStorage.getItem('preview_type') || 'list',
    config: undefined,
    index: undefined,
-    authorized: undefined,
    homeDirectory: undefined,
    requestedPlan: undefined,
    emojis: undefined,
@@ -1002,7 +1001,6 @@ const mutations = {
    },
    INIT(state, data) {
        state.config = data.config
-        state.authorized = data.authCookie
        state.homeDirectory = data.rootDirectory
    },
    SET_SAAS(state, data) {
@@ -1016,8 +1014,8 @@ const mutations = {

        localStorage.setItem('file_info_visibility', isVisible)
    },
-    SET_AUTHORIZED(state, data) {
-        state.authorized = data
+    SET_AUTHORIZED(state, value) {
+        state.config.isAuthenticated = value
    },
    SET_INDEX_CONTENT(state, data) {
        state.index = data
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -58,10 +58,9 @@
            uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
            chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }},

-            hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
            isAuthenticated: {{ auth()->check() ? 1 : 0 }},
-            isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},
-            isDemo: {{ env('APP_DEMO') ? 1 : 0 }},
+            isSaaS: {{ $settings->license === 'Extended' ? 1 : 0 }},
+            isDemo: {{ config('vuefilemanager.is_demo') ? 1 : 0 }},

            legal: {!! $legal ?? 'undefined' !!},