mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-05 18:23:48 +00:00
api refactoring
This commit is contained in:
Čarodej
@@ -1,6 +1,6 @@
|
||||
APP_NAME=Laravel
|
||||
APP_ENV=local
|
||||
APP_KEY=base64:7BmLEVLO3kx5hHcR3MlXZIg89wr5pMu9NOipcxttmaU=
|
||||
APP_KEY=base64:qO2rFS9MzY3SKl6AqwV1jMAshl9jiaC02VNjXMhrMpo=
|
||||
APP_DEBUG=true
|
||||
APP_URL=http://localhost
|
||||
APP_DEMO=false
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
{
|
||||
"/js/main.js": "/js/main.js",
|
||||
"/chunks/request.js": "/chunks/request.js?id=e2e83e87b1f6d097",
|
||||
"/chunks/request-upload.js": "/chunks/request-upload.js?id=3bc3423d2305cd30",
|
||||
"/chunks/request.js": "/chunks/request.js?id=4f2f083839a7f102",
|
||||
"/chunks/request-upload.js": "/chunks/request-upload.js?id=1201e261c848a844",
|
||||
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
|
||||
"/chunks/status-check.js": "/chunks/status-check.js?id=9239a586761b912d",
|
||||
"/chunks/status-check.js": "/chunks/status-check.js?id=a5ba5fb895af7040",
|
||||
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=ba76b9a8adbfdc0b",
|
||||
"/chunks/database.js": "/chunks/database.js?id=5113b0d4284f764f",
|
||||
"/chunks/database.js": "/chunks/database.js?id=9d365d9b60a201dd",
|
||||
"/chunks/environment.js": "/chunks/environment.js?id=e4fdb87ff173d48a",
|
||||
"/chunks/app-setup.js": "/chunks/app-setup.js?id=cbe7bfed06400736",
|
||||
"/chunks/admin-account.js": "/chunks/admin-account.js?id=78d257775f5fc485",
|
||||
"/chunks/shared.js": "/chunks/shared.js?id=0c2f68a87ccf9be3",
|
||||
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=3fd9baddb7333c24",
|
||||
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a6063bed9be75a09",
|
||||
"/chunks/shared.js": "/chunks/shared.js?id=54c3bc26f2aab8d6",
|
||||
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=ebf193e6828917dc",
|
||||
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e1ca697ccf4363dc",
|
||||
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5519d193bce2339",
|
||||
"/chunks/not-found.js": "/chunks/not-found.js?id=d31bd699138cf828",
|
||||
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=26798085f527d955",
|
||||
"/chunks/admin.js": "/chunks/admin.js?id=ac53badd82034a88",
|
||||
"/chunks/admin.js": "/chunks/admin.js?id=60aa9e8508a842a1",
|
||||
"/chunks/dashboard.js": "/chunks/dashboard.js?id=5ab55a12214433c8",
|
||||
"/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10",
|
||||
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0",
|
||||
"/chunks/pages.js": "/chunks/pages.js?id=bb5cc8327ca846a3",
|
||||
"/chunks/page-edit.js": "/chunks/page-edit.js?id=0bdc8a5935fd2197",
|
||||
"/chunks/plans.js": "/chunks/plans.js?id=76398906ad873fc3",
|
||||
"/chunks/plans.js": "/chunks/plans.js?id=d4e39044c5fc0ad4",
|
||||
"/chunks/users.js": "/chunks/users.js?id=b6629338e26b8313",
|
||||
"/chunks/user-create.js": "/chunks/user-create.js?id=40254ae98547761e",
|
||||
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=18f9d1ab17996507",
|
||||
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=549867504d6e4e4e",
|
||||
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40",
|
||||
"/chunks/user.js": "/chunks/user.js?id=cf9a2a0d8c1fa1d9",
|
||||
"/chunks/user-detail.js": "/chunks/user-detail.js?id=ff6c1fc63a372d96",
|
||||
"/chunks/user-storage.js": "/chunks/user-storage.js?id=4f76194837113969",
|
||||
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=797d77ff2b1c08cc",
|
||||
"/chunks/user-storage.js": "/chunks/user-storage.js?id=0e26321285c15e1a",
|
||||
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=189de61fad1cd281",
|
||||
"/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea",
|
||||
"/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5",
|
||||
"/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c",
|
||||
@@ -38,38 +38,39 @@
|
||||
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=630deb1fc4e17ed9",
|
||||
"/chunks/payments.js": "/chunks/payments.js?id=d59a2a18b680d65c",
|
||||
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=27d6c1b58dbd1e6c",
|
||||
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=450162f937b7b2fd",
|
||||
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=f940f2c965eb41eb",
|
||||
"/chunks/app-settings.js": "/chunks/app-settings.js?id=b0d1082fdcbbd17c",
|
||||
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8ba3feb2cc81a2c3",
|
||||
"/chunks/app-index.js": "/chunks/app-index.js?id=0c50096e8de09288",
|
||||
"/chunks/app-environment.js": "/chunks/app-environment.js?id=3436286fd625f8b7",
|
||||
"/chunks/app-others.js": "/chunks/app-others.js?id=dd23507db4551d0a",
|
||||
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=f79027ce1f1f4c4b",
|
||||
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=77ac953ce49b5b55",
|
||||
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=c7e7dc2975317062",
|
||||
"/chunks/app-server.js": "/chunks/app-server.js?id=ff66d34e90ff98a0",
|
||||
"/chunks/app-language.js": "/chunks/app-language.js?id=46d7fc713d36cea8",
|
||||
"/chunks/homepage.js": "/chunks/homepage.js?id=0dabc3156ab1336c",
|
||||
"/chunks/homepage.js": "/chunks/homepage.js?id=55c3e017e2a12876",
|
||||
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=9553d7a2912cb901",
|
||||
"/chunks/contact-us.js": "/chunks/contact-us.js?id=ea99d85aa3500595",
|
||||
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=c26cb144101e7c79",
|
||||
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=170d814982e1c475",
|
||||
"/chunks/sign-in.js": "/chunks/sign-in.js?id=c648cb698176a993",
|
||||
"/chunks/sign-up.js": "/chunks/sign-up.js?id=3d7559511768cd0e",
|
||||
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=27cda9364b6593d8",
|
||||
"/chunks/sign-in.js": "/chunks/sign-in.js?id=1631a0f4a4ad25c2",
|
||||
"/chunks/sign-up.js": "/chunks/sign-up.js?id=2af6073efe54c560",
|
||||
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=ff8954243e86c1e1",
|
||||
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4",
|
||||
"/chunks/settings.js": "/chunks/settings.js?id=2f1ec837e7673e6d",
|
||||
"/chunks/settings.js": "/chunks/settings.js?id=2f6576332da7cad2",
|
||||
"/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb",
|
||||
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
|
||||
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b",
|
||||
"/chunks/billing.js": "/chunks/billing.js?id=115c25478cee576d",
|
||||
"/chunks/platform.js": "/chunks/platform.js?id=d4e8d92aed88b8ee",
|
||||
"/chunks/files.js": "/chunks/files.js?id=a74bc8acc7ea876a",
|
||||
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c6ed26eaace65f01",
|
||||
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6adbb309c700eaf7",
|
||||
"/chunks/trash.js": "/chunks/trash.js?id=32b84e2c25561372",
|
||||
"/chunks/team-folders.js": "/chunks/team-folders.js?id=dc85357a1433f4e4",
|
||||
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=3168dd6a723f72f1",
|
||||
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ecfee7f7e98204f8",
|
||||
"/chunks/billing.js": "/chunks/billing.js?id=dd217d680baafb84",
|
||||
"/chunks/platform.js": "/chunks/platform.js?id=220943bcb1e9f3ca",
|
||||
"/chunks/files.js": "/chunks/files.js?id=5f29f35c280e680b",
|
||||
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=6f43aea38e0927bc",
|
||||
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6e819ffe88a0fd1d",
|
||||
"/chunks/trash.js": "/chunks/trash.js?id=1885832b8dd60529",
|
||||
"/chunks/team-folders.js": "/chunks/team-folders.js?id=709509b3e2dd2bf5",
|
||||
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=e86d3c1f72e6fde2",
|
||||
"/chunks/invitation.js": "/chunks/invitation.js?id=424b2783d9785a09",
|
||||
"/css/tailwind.css": "/css/tailwind.css",
|
||||
"/css/app.css": "/css/app.css"
|
||||
"/css/app.css": "/css/app.css",
|
||||
"/chunks/demo.js": "/chunks/demo.js?id=355303e4230cb5ae"
|
||||
}
|
||||
|
||||
@@ -116,11 +116,8 @@ export default {
|
||||
config: this.$root.$data.config,
|
||||
})
|
||||
|
||||
// Get installation state
|
||||
let installation = this.$root.$data.config.installation
|
||||
|
||||
// Redirect to setup wizard
|
||||
if (installation === 'installation-needed') {
|
||||
if (this.$root.$data.config.installation === 'installation-needed') {
|
||||
this.isLoaded = true
|
||||
|
||||
if (window.location.pathname.split('/')[1] !== 'setup-wizard') {
|
||||
|
||||
@@ -50,7 +50,7 @@ export default {
|
||||
reader.readAsDataURL(file)
|
||||
|
||||
// Update user avatar
|
||||
this.$updateImage('/user/settings', 'avatar', event.target.files[0])
|
||||
this.$updateAvatar(event.target.files[0])
|
||||
} else {
|
||||
alert(this.$t('wrong_image_error'))
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ export default {
|
||||
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${this.$router.currentRoute.params.token}/upload/remote`,
|
||||
RequestUpload: `/api/file-request/${this.$router.currentRoute.params.token}/upload/remote`,
|
||||
Public: `/api/editor/upload/remote/${this.$router.currentRoute.params.token}`,
|
||||
}[this.$router.currentRoute.name] || '/api/upload/remote'
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ export default {
|
||||
this.isSendingBillingAlert = true
|
||||
|
||||
axios
|
||||
.patch(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`, {
|
||||
.put('/api/subscriptions/billing-alert', {
|
||||
amount: this.billingAlertAmount,
|
||||
})
|
||||
.then(() => {
|
||||
@@ -184,7 +184,7 @@ export default {
|
||||
this.isSendingBillingAlert = true
|
||||
|
||||
axios
|
||||
.post('/api/subscriptions/billing-alerts', {
|
||||
.post('/api/subscriptions/billing-alert', {
|
||||
amount: this.billingAlertAmount,
|
||||
})
|
||||
.then(() => {
|
||||
@@ -222,7 +222,7 @@ export default {
|
||||
events.$on('action:confirmed', (data) => {
|
||||
if (data.operation === 'delete-billing-alert')
|
||||
axios
|
||||
.delete(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`)
|
||||
.delete('/api/subscriptions/billing-alert')
|
||||
.then(() => {
|
||||
this.$store.dispatch('getAppData')
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@ export default {
|
||||
|
||||
// Send request to get share link
|
||||
axios
|
||||
.post(`/api/upload-request`, this.form)
|
||||
.post(`/api/file-request`, this.form)
|
||||
.then((response) => {
|
||||
this.generatedUploadRequest = response.data
|
||||
})
|
||||
|
||||
35
resources/js/helpers/functionHelpers.js
vendored
35
resources/js/helpers/functionHelpers.js
vendored
@@ -63,6 +63,27 @@ const FunctionHelpers = {
|
||||
})
|
||||
}
|
||||
|
||||
Vue.prototype.$updateAvatar = function (image) {
|
||||
// Create form
|
||||
let formData = new FormData()
|
||||
|
||||
// Add image to form
|
||||
formData.append('avatar', image)
|
||||
|
||||
axios
|
||||
.post(`${store.getters.api}/user/avatar`, formData, {
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
})
|
||||
.catch(() => {
|
||||
events.$emit('alert:open', {
|
||||
title: this.$t('popup_error.title'),
|
||||
message: this.$t('popup_error.message'),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Vue.prototype.$scrollTop = function () {
|
||||
const container = document.getElementsByTagName('html')[0]
|
||||
|
||||
@@ -226,17 +247,21 @@ const FunctionHelpers = {
|
||||
'.part'
|
||||
|
||||
do {
|
||||
let isLast = chunks.length === 1,
|
||||
let isLastChunk = chunks.length === 1 ? 1 : 0,
|
||||
chunk = chunks.shift(),
|
||||
attempts = 0
|
||||
|
||||
// Set form data
|
||||
formData.set('name', item.file.name)
|
||||
formData.set('file', chunk, source_name)
|
||||
formData.set('path', item.path)
|
||||
formData.set('parent_id', item.parent_id)
|
||||
formData.set('chunk', chunk, source_name)
|
||||
formData.set('extension', item.file.name.split('.').pop())
|
||||
formData.set('is_last', isLast)
|
||||
formData.set('is_last_chunk', isLastChunk)
|
||||
|
||||
if (item.path && item.path !== '/')
|
||||
formData.set('path', item.path)
|
||||
|
||||
if (item.parent_id)
|
||||
formData.set('parent_id', item.parent_id)
|
||||
|
||||
// Upload chunks
|
||||
do {
|
||||
|
||||
6
resources/js/store/modules/fileBrowser.js
vendored
6
resources/js/store/modules/fileBrowser.js
vendored
@@ -19,7 +19,7 @@ const actions = {
|
||||
commit('LOADING_STATE', { loading: true, data: [] })
|
||||
|
||||
axios
|
||||
.get(`${getters.api}/browse/folders/${id}${getters.sorting.URI}`)
|
||||
.get(`${getters.api}/browse/folders/${id || 'all'}${getters.sorting.URI}`)
|
||||
.then((response) => {
|
||||
let folders = response.data.folders.data
|
||||
let files = response.data.files.data
|
||||
@@ -85,7 +85,7 @@ const actions = {
|
||||
commit('LOADING_STATE', { loading: true, data: [] })
|
||||
|
||||
axios
|
||||
.get(`${getters.api}/browse/trash/${id}${getters.sorting.URI}`)
|
||||
.get(`${getters.api}/browse/trash/${id || 'all'}${getters.sorting.URI}`)
|
||||
.then((response) => {
|
||||
let folders = response.data.folders.data
|
||||
let files = response.data.files.data
|
||||
@@ -104,7 +104,7 @@ const actions = {
|
||||
return new Promise((resolve, reject) => {
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/navigation`,
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/navigation`,
|
||||
Public: `/api/browse/navigation/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/browse/navigation'
|
||||
|
||||
|
||||
14
resources/js/store/modules/fileFunctions.js
vendored
14
resources/js/store/modules/fileFunctions.js
vendored
@@ -59,7 +59,7 @@ const actions = {
|
||||
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/move`,
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/move`,
|
||||
Public: `/api/editor/move/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/move'
|
||||
|
||||
@@ -87,7 +87,7 @@ const actions = {
|
||||
createFolder: ({ commit, getters, dispatch }, folder) => {
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/create-folder`,
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/create-folder`,
|
||||
Public: `/api/editor/create-folder/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/create-folder'
|
||||
|
||||
@@ -126,7 +126,7 @@ const actions = {
|
||||
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/rename/${data.id}`,
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/rename/${data.id}`,
|
||||
Public: `/api/editor/rename/${data.id}/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || `/api/rename/${data.id}`
|
||||
|
||||
@@ -149,9 +149,9 @@ const actions = {
|
||||
return new Promise((resolve, reject) => {
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/upload`,
|
||||
Public: `/api/editor/upload/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/upload'
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/upload/chunks`,
|
||||
Public: `/api/editor/upload/chunks/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/upload/chunks'
|
||||
|
||||
// Create cancel token for axios cancellation
|
||||
const CancelToken = axios.CancelToken,
|
||||
@@ -319,7 +319,7 @@ const actions = {
|
||||
|
||||
// Get route
|
||||
let route = {
|
||||
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/remove`,
|
||||
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/remove`,
|
||||
Public: `/api/editor/remove/${router.currentRoute.params.token}`,
|
||||
}[router.currentRoute.name] || '/api/remove'
|
||||
|
||||
|
||||
4
resources/js/store/modules/teams.js
vendored
4
resources/js/store/modules/teams.js
vendored
@@ -17,7 +17,7 @@ const actions = {
|
||||
}
|
||||
|
||||
axios
|
||||
.get(`${getters.api}/teams/folders/${id}${getters.sorting.URI}`)
|
||||
.get(`${getters.api}/teams/folders/${id || 'all'}${getters.sorting.URI}`)
|
||||
.then((response) => {
|
||||
let folders = response.data.folders.data
|
||||
let files = response.data.files.data
|
||||
@@ -59,7 +59,7 @@ const actions = {
|
||||
}
|
||||
|
||||
axios
|
||||
.get(`${getters.api}/teams/shared-with-me/${id}${getters.sorting.URI}`)
|
||||
.get(`${getters.api}/teams/shared-with-me/${id || 'all'}${getters.sorting.URI}`)
|
||||
.then((response) => {
|
||||
let folders = response.data.folders.data
|
||||
let files = response.data.files.data
|
||||
|
||||
6
resources/js/store/modules/uploadRequest.js
vendored
6
resources/js/store/modules/uploadRequest.js
vendored
@@ -13,7 +13,7 @@ const actions = {
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
axios
|
||||
.get(`/api/upload-request/${router.currentRoute.params.token}/browse/${id}${getters.sorting.URI}`)
|
||||
.get(`/api/file-request/${router.currentRoute.params.token}/browse/${id || 'all'}${getters.sorting.URI}`)
|
||||
.then((response) => {
|
||||
let folders = response.data.folders.data
|
||||
let files = response.data.files.data
|
||||
@@ -37,7 +37,7 @@ const actions = {
|
||||
},
|
||||
getUploadRequestDetail: ({ commit }) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
axios.get(`/api/upload-request/${router.currentRoute.params.token}`)
|
||||
axios.get(`/api/file-request/${router.currentRoute.params.token}`)
|
||||
.then((response) => {
|
||||
resolve(response)
|
||||
|
||||
@@ -56,7 +56,7 @@ const actions = {
|
||||
},
|
||||
closeUploadRequest: ({ commit }) => {
|
||||
axios
|
||||
.delete(`/api/upload-request/${router.currentRoute.params.token}`)
|
||||
.delete(`/api/file-request/${router.currentRoute.params.token}`)
|
||||
.then((response) => {
|
||||
commit('LOADING_STATE', { loading: false, data: [] })
|
||||
commit('SET_UPLOAD_REQUEST', response.data)
|
||||
|
||||
8
resources/js/store/modules/userAuth.js
vendored
8
resources/js/store/modules/userAuth.js
vendored
@@ -93,7 +93,7 @@ const actions = {
|
||||
context.commit('ADD_TO_FAVOURITES', favouritesWidget)
|
||||
|
||||
axios
|
||||
.post(context.getters.api + '/folders/favourites', {
|
||||
.post(context.getters.api + '/favourites', {
|
||||
ids: itemsToFavourites,
|
||||
})
|
||||
.catch(() => {
|
||||
@@ -105,19 +105,19 @@ const actions = {
|
||||
commit('REMOVE_ITEM_FROM_FAVOURITES', folder)
|
||||
|
||||
axios
|
||||
.post(getters.api + '/folders/favourites/' + folder.data.id, {
|
||||
.post(getters.api + '/favourites/' + folder.data.id, {
|
||||
_method: 'delete',
|
||||
})
|
||||
.catch(() => Vue.prototype.$isSomethingWrong())
|
||||
},
|
||||
readAllNotifications: ({ commit }) => {
|
||||
axios.post('/api/user/notifications/read')
|
||||
axios.post('/api/notifications/read')
|
||||
.then(() => {
|
||||
commit('UPDATE_NOTIFICATION_COUNT', 0)
|
||||
})
|
||||
},
|
||||
deleteAllNotifications: ({ commit }) => {
|
||||
axios.delete('/api/user/notifications')
|
||||
axios.delete('/api/notifications')
|
||||
.then(() => {
|
||||
commit('FLUSH_NOTIFICATIONS')
|
||||
})
|
||||
|
||||
@@ -119,7 +119,7 @@ export default {
|
||||
|
||||
// Send request to get user reset link
|
||||
axios
|
||||
.post('/api/password/email', {
|
||||
.post('/api/password/recover', {
|
||||
email: this.recoverEmail,
|
||||
})
|
||||
.then(() => {
|
||||
|
||||
@@ -275,7 +275,7 @@ export default {
|
||||
},
|
||||
resendEmail() {
|
||||
axios
|
||||
.post('/api/user/email/verify/resend', {
|
||||
.post('/api/user/verify', {
|
||||
email: this.loginEmail,
|
||||
})
|
||||
.then(() => {
|
||||
|
||||
@@ -1,70 +1,15 @@
|
||||
@php
|
||||
use Monolog\Handler\MissingExtensionException;
|
||||
use VueFileManager\Subscription\Domain\Plans\Models\Plan;
|
||||
use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
|
||||
use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
|
||||
|
||||
try {
|
||||
// Bcmath Extension
|
||||
$storageDefaultSpaceFormatted = isset($settings->default_max_storage_amount)
|
||||
? format_gigabytes($settings->default_max_storage_amount)
|
||||
: format_gigabytes(5);
|
||||
|
||||
$uploadLimit = isset($settings->upload_limit)
|
||||
? format_bytes($settings->upload_limit)
|
||||
: 'undefined';
|
||||
|
||||
$chunkSize = isset($settings->chunk_size)
|
||||
? format_bytes($settings->chunk_size)
|
||||
: format_bytes(64);
|
||||
|
||||
$uploadLimitFormatted = isset($settings->upload_limit)
|
||||
? format_megabytes($settings->upload_limit)
|
||||
: null;
|
||||
|
||||
} catch (MissingExtensionException $exception) {
|
||||
$storageDefaultSpaceFormatted = '5GB';
|
||||
$uploadLimit = 'undefined';
|
||||
$uploadLimitFormatted = 5;
|
||||
$chunkSize = 64000000;
|
||||
}
|
||||
|
||||
try {
|
||||
// Subscription
|
||||
$isEmptySubscriptions = Subscription::count() === 0;
|
||||
$isEmptyTransactions = Transaction::count() === 0;
|
||||
$isEmptyPlans = Plan::count() === 0;
|
||||
$plan = Plan::where('status', 'active')
|
||||
->where('type', 'metered');
|
||||
|
||||
// User
|
||||
$isUser = auth()->check();
|
||||
$user = Auth::user();
|
||||
|
||||
// Default user settings
|
||||
$defaultEmoji = $isUser ? $user->settings->emoji_type : 'twemoji';
|
||||
$defaultThemeMode = $isUser ? $user->settings->theme_mode : 'system';
|
||||
} catch (PDOException $e) {
|
||||
[$isUser, $isEmptyPlans, $isEmptyTransactions, $isEmptySubscriptions] = false;
|
||||
|
||||
$plan = null;
|
||||
$defaultEmoji = 'twemoji';
|
||||
$defaultThemeMode = 'system';
|
||||
}
|
||||
@endphp
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html class="{{ $installation === 'installation-needed' ? 'dark:bg-dark-background bg-light-background' : '' }}" style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
<html class="{{ $config->installation === 'installation-needed' ? 'dark:bg-dark-background bg-light-background' : '' }}" style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
|
||||
<head>
|
||||
<meta name="theme-color" content="{{ $settings->app_color ?? '#00BC7E' }}">
|
||||
<meta name="theme-color" content="{{ $config->app_color ?? '#00BC7E' }}">
|
||||
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
|
||||
<meta name="description" content="{{ $settings->app_description ?? __t('app_description') }}">
|
||||
<meta name="description" content="{{ $config->app_description ?? __t('app_description') }}">
|
||||
|
||||
<title>
|
||||
{{ $settings->app_title ?? 'VueFileManager' }} | {{ $settings->app_description ?? __t('app_description') }}
|
||||
{{ $config->app_title ?? 'VueFileManager' }} | {{ $config->app_description ?? __t('app_description') }}
|
||||
</title>
|
||||
|
||||
{{--StyleSheet--}}
|
||||
@@ -73,18 +18,18 @@
|
||||
|
||||
{{--OG items--}}
|
||||
<meta property="og:url" content="{{ url('/') }}">
|
||||
<meta property="og:title" content="{{ $settings->app_title ?? 'VueFileManager' }} | {{ $settings->app_description ?? __t('app_description') }}">
|
||||
<meta property="og:description" content="{{ $settings->app_description ?? __t('app_description') }}">
|
||||
<meta property="og:image" content="{{ isset($settings->app_og_image) ? url($settings->app_og_image) : '' }}">
|
||||
<meta property="og:title" content="{{ $config->app_title ?? 'VueFileManager' }} | {{ $config->app_description ?? __t('app_description') }}">
|
||||
<meta property="og:description" content="{{ $config->app_description ?? __t('app_description') }}">
|
||||
<meta property="og:image" content="{{ isset($config->app_og_image) ? url($config->app_og_image) : '' }}">
|
||||
|
||||
{{-- Apple Mobile Web App--}}
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="white">
|
||||
<meta name="apple-mobile-web-app-title" content="{{ $settings->app_title ?? 'VueFileManager' }}">
|
||||
<meta name="apple-mobile-web-app-title" content="{{ $config->app_title ?? 'VueFileManager' }}">
|
||||
|
||||
{{--Icons--}}
|
||||
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ isset($settings->app_touch_icon) ? url($settings->app_touch_icon) : '' }}">
|
||||
<link rel="icon" href="{{ isset($settings->app_favicon) ? url($settings->app_favicon) : asset('favicon.png') }}?v={{ get_version() }}">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ isset($config->app_touch_icon) ? url($config->app_touch_icon) : '' }}">
|
||||
<link rel="icon" href="{{ isset($config->app_favicon) ? url($config->app_favicon) : asset('favicon.png') }}?v={{ get_version() }}">
|
||||
|
||||
{{--Format Detection--}}
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
@@ -97,115 +42,113 @@
|
||||
<div id="app"></div>
|
||||
|
||||
<script>
|
||||
// todo: refactoring
|
||||
|
||||
let config = {
|
||||
host: '{{ url('/') }}',
|
||||
api: '{{ url('/api') }}',
|
||||
locale: '{{ app()->getLocale() }}',
|
||||
host: '{{ $config->host }}',
|
||||
api: '{{ $config->api }}',
|
||||
locale: '{{ $config->locale }}',
|
||||
|
||||
broadcasting: '{{ config('broadcasting.default') }}',
|
||||
broadcastingKey: '{{ config('broadcasting.connections.pusher.key') }}',
|
||||
broadcastingHost: '{{ config('broadcasting.connections.pusher.options.host') }}',
|
||||
broadcastingPort: '{{ config('broadcasting.connections.pusher.options.port') }}',
|
||||
broadcastingCluster: '{{ config('broadcasting.connections.pusher.options.cluster') }}',
|
||||
broadcasting: '{{ $config->broadcasting }}',
|
||||
broadcastingKey: '{{ $config->broadcastingKey }}',
|
||||
broadcastingHost: '{{ $config->broadcastingHost }}',
|
||||
broadcastingPort: '{{ $config->broadcastingPort }}',
|
||||
broadcastingCluster: '{{ $config->broadcastingCluster }}',
|
||||
|
||||
app_logo: '{{ $settings->app_logo ?? null }}',
|
||||
app_logo_dark: '{{ $settings->app_logo_dark ?? null }}',
|
||||
app_logo_horizontal: '{{ $settings->app_logo_horizontal ?? null }}',
|
||||
app_logo_horizontal_dark: '{{ $settings->app_logo_horizontal_dark ?? null }}',
|
||||
app_logo: '{{ $config->app_logo }}',
|
||||
app_logo_dark: '{{ $config->app_logo_dark }}',
|
||||
app_logo_horizontal: '{{ $config->app_logo_horizontal }}',
|
||||
app_logo_horizontal_dark: '{{ $config->app_logo_horizontal_dark }}',
|
||||
|
||||
app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
|
||||
app_footer: '{!! $settings->footer_content ?? null !!}',
|
||||
app_name: '{{ $settings->app_title ?? 'VueFileManager' }}',
|
||||
app_description: '{{ $settings->app_description ?? __t('app_description') }}',
|
||||
app_color: '{{ $config->app_color }}',
|
||||
app_footer: '{!! $config->app_footer !!}',
|
||||
app_name: '{{ $config->app_name }}',
|
||||
app_description: '{{ $config->app_description }}',
|
||||
|
||||
allowHomepage: {{ $settings->allow_homepage ?? 1 }},
|
||||
storageLimit: {{ $settings->storage_limitation ?? 1 }},
|
||||
teamsDefaultMembers: {{ $settings->default_max_team_member ?? 10 }},
|
||||
storageDefaultSpace: {{ $settings->default_max_storage_amount ?? 5 }},
|
||||
storageDefaultSpaceFormatted: '{{ $storageDefaultSpaceFormatted }}',
|
||||
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
|
||||
uploadLimit: {{ $uploadLimit }},
|
||||
uploadLimitFormatted: '{{ $uploadLimitFormatted }}',
|
||||
chunkSize: {{ $chunkSize }},
|
||||
allowHomepage: {{ $config->allowHomepage }},
|
||||
storageLimit: {{ $config->storageLimit }},
|
||||
teamsDefaultMembers: {{ $config->teamsDefaultMembers }},
|
||||
storageDefaultSpace: {{ $config->storageDefaultSpace }},
|
||||
storageDefaultSpaceFormatted: '{{ $config->storageDefaultSpaceFormatted }}',
|
||||
mimetypesBlacklist: '{{ $config->mimetypesBlacklist }}',
|
||||
uploadLimit: {{ $config->uploadLimit }},
|
||||
uploadLimitFormatted: '{{ $config->uploadLimitFormatted }}',
|
||||
chunkSize: {{ $config->chunkSize }},
|
||||
|
||||
isAuthenticated: {{ $isUser ? 1 : 0 }},
|
||||
isSaaS: {{ $settings && optional($settings)->license === 'extended' ? 1 : 0 }},
|
||||
isAuthenticated: {{ $config->isAuthenticated }},
|
||||
isSaaS: {{ $config->isSaaS }},
|
||||
|
||||
isDev: {{ is_dev() ? 1 : 0 }},
|
||||
isDemo: {{ config('vuefilemanager.is_demo') ? 1 : 0 }},
|
||||
isDev: {{ $config->isDev }},
|
||||
isDemo: {{ $config->isDemo }},
|
||||
|
||||
legal: {!! $legal ?? 'undefined' !!},
|
||||
legal: {!! $config->legal !!},
|
||||
|
||||
installation: '{{ $installation ?? 'initial' }}',
|
||||
statusCheck: {!! json_encode($status_check) ?? 'undefined' !!},
|
||||
isSetupWizardDemo: {{ config('vuefilemanager.is_setup_wizard_demo') ? 1 : 0 }},
|
||||
isSetupWizardDebug: {{ config('vuefilemanager.is_setup_wizard_debug') ? 1 : 0 }},
|
||||
installation: '{{ $config->installation }}',
|
||||
statusCheck: {!! $config->statusCheck !!},
|
||||
isSetupWizardDemo: {{ $config->isSetupWizardDemo }},
|
||||
isSetupWizardDebug: {{ $config->isSetupWizardDebug }},
|
||||
|
||||
// States
|
||||
isEmptyPlans: {{ $isEmptyPlans ? 1 : 0 }},
|
||||
isEmptyTransactions: {{ $isEmptyTransactions ? 1 : 0 }},
|
||||
isEmptySubscriptions: {{ $isEmptySubscriptions ? 1 : 0 }},
|
||||
isEmptyPlans: {{ $config->isEmptyPlans }},
|
||||
isEmptyTransactions: {{ $config->isEmptyTransactions }},
|
||||
isEmptySubscriptions: {{ $config->isEmptySubscriptions }},
|
||||
|
||||
// Hidden set ups
|
||||
isAdminVueFileManagerBar: {{ config('vuefilemanager.is_admin_vuefilemanager_bar', 1) ? 1 : 0 }},
|
||||
isAdminVueFileManagerBar: {{ $config->isAdminVueFileManagerBar }},
|
||||
|
||||
// Metered
|
||||
allowed_registration_bonus: {{ $settings->allowed_registration_bonus ?? 0 }},
|
||||
registration_bonus_amount: {{ $settings->registration_bonus_amount ?? 0 }},
|
||||
isCreatedMeteredPlan: {{ $plan && $plan->exists() ? 1 : 0 }},
|
||||
meteredPlanId: '{{ $plan && $plan->exists() ? $plan->first()->id : null }}',
|
||||
allowed_registration_bonus: {{ $config->allowed_registration_bonus }},
|
||||
registration_bonus_amount: {{ $config->registration_bonus_amount }},
|
||||
isCreatedMeteredPlan: {{ $config->isCreatedMeteredPlan }},
|
||||
meteredPlanId: '{{ $config->meteredPlanId }}',
|
||||
|
||||
// Payments
|
||||
allowed_payments: {{ $settings->allowed_payments ?? 0 }},
|
||||
subscriptionType: '{{ $settings->subscription_type ?? 'none' }}',
|
||||
allowed_payments: {{ $config->allowed_payments }},
|
||||
subscriptionType: '{{ $config->subscriptionType }}',
|
||||
|
||||
// PayPal
|
||||
isPayPal: {{ $settings->allowed_paypal ?? 0 }},
|
||||
isPayPalLive: {{ config('subscription.credentials.paypal.is_live') ? 1 : 0 }},
|
||||
paypal_client_id: '{{ config('subscription.credentials.paypal.id') }}',
|
||||
paypal_payment_description: '{{ $settings->paypal_payment_description ?? '' }}',
|
||||
isPayPal: {{ $config->isPayPal }},
|
||||
isPayPalLive: {{ $config->isPayPalLive }},
|
||||
paypal_client_id: '{{ $config->paypal_client_id }}',
|
||||
paypal_payment_description: '{{ $config->paypal_payment_description }}',
|
||||
|
||||
// Paystack
|
||||
isPaystack: {{ $settings->allowed_paystack ?? 0 }},
|
||||
paystack_public_key: '{{ config('subscription.credentials.paystack.public_key') }}',
|
||||
paystack_payment_description: '{{ $settings->paystack_payment_description ?? '' }}',
|
||||
isPaystack: {{ $config->isPaystack }},
|
||||
paystack_public_key: '{{ $config->paystack_public_key }}',
|
||||
paystack_payment_description: '{{ $config->paystack_payment_description }}',
|
||||
|
||||
// Stripe
|
||||
isStripe: {{ $settings->allowed_stripe ?? 0 }},
|
||||
stripe_public_key: '{{ config('subscription.credentials.stripe.public_key') }}',
|
||||
stripe_payment_description: '{{ $settings->stripe_payment_description ?? '' }}',
|
||||
isStripe: {{ $config->isStripe }},
|
||||
stripe_public_key: '{{ $config->stripe_public_key }}',
|
||||
stripe_payment_description: '{{ $config->stripe_payment_description }}',
|
||||
|
||||
// ReCaptcha
|
||||
recaptcha_client_id: '{{ config('services.recaptcha.client_id') }}',
|
||||
allowedRecaptcha: {{ $settings->allowed_recaptcha ?? 0 }},
|
||||
isRecaptchaConfigured: {{ config('services.recaptcha.client_id') ? 1 : 0 }},
|
||||
recaptcha_client_id: '{{ $config->recaptcha_client_id }}',
|
||||
allowedRecaptcha: {{ $config->allowedRecaptcha }},
|
||||
isRecaptchaConfigured: {{ $config->isRecaptchaConfigured }},
|
||||
|
||||
// Social logins
|
||||
allowedFacebookLogin: {{ $settings->allowed_facebook_login ?? 0 }},
|
||||
isFacebookLoginConfigured: {{ config('services.facebook.client_id') ? 1 : 0 }},
|
||||
allowedFacebookLogin: {{ $config->allowedFacebookLogin }},
|
||||
isFacebookLoginConfigured: {{ $config->isFacebookLoginConfigured }},
|
||||
|
||||
allowedGoogleLogin: {{ $settings->allowed_google_login ?? 0 }},
|
||||
isGoogleLoginConfigured: {{ config('services.google.client_id') ? 1 : 0 }},
|
||||
allowedGoogleLogin: {{ $config->allowedGoogleLogin }},
|
||||
isGoogleLoginConfigured: {{ $config->isGoogleLoginConfigured }},
|
||||
|
||||
allowedGithubLogin: {{ $settings->allowed_github_login ?? 0 }},
|
||||
isGithubLoginConfigured: {{ config('services.github.client_id') ? 1 : 0 }},
|
||||
allowedGithubLogin: {{ $config->allowedGithubLogin }},
|
||||
isGithubLoginConfigured: {{ $config->isGithubLoginConfigured }},
|
||||
|
||||
// Adsense
|
||||
allowedAdsense: {{ $settings?->allowed_adsense ?? 0 }},
|
||||
adsenseClientId: '{{ $settings->adsense_client_id ?? '' }}',
|
||||
adsenseBanner01: `{!! $settings->adsense_banner_01 ?? '' !!}`,
|
||||
adsenseBanner02: `{!! $settings->adsense_banner_02 ?? '' !!}`,
|
||||
adsenseBanner03: `{!! $settings->adsense_banner_03 ?? '' !!}`,
|
||||
allowedAdsense: {{ $config->allowedAdsense }},
|
||||
adsenseClientId: '{{ $config->adsenseClientId }}',
|
||||
adsenseBanner01: `{!! $config->adsenseBanner01 !!}`,
|
||||
adsenseBanner02: `{!! $config->adsenseBanner02 !!}`,
|
||||
adsenseBanner03: `{!! $config->adsenseBanner03 !!}`,
|
||||
|
||||
// User settings
|
||||
defaultEmoji: '{{ $defaultEmoji }}',
|
||||
defaultThemeMode: '{{ $defaultThemeMode }}',
|
||||
defaultEmoji: '{{ $config->defaultEmoji }}',
|
||||
defaultThemeMode: '{{ $config->defaultThemeMode }}',
|
||||
|
||||
// App settings
|
||||
userRegistration: {{ $settings->registration ?? 1 }},
|
||||
userVerification: {{ $settings->user_verification ?? 0 }},
|
||||
userRegistration: {{ $config->userRegistration }},
|
||||
userVerification: {{ $config->userVerification }},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -215,14 +158,14 @@
|
||||
<script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script>
|
||||
|
||||
{{--Global site tag (gtag.js) - Google Analytics--}}
|
||||
@if(isset($settings->google_analytics) && $settings->google_analytics)
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id={{ $settings->google_analytics }}"></script>
|
||||
@if(isset($config->google_analytics) && $config->google_analytics)
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id={{ $config->google_analytics }}"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag('js', new Date());
|
||||
|
||||
gtag('config', '{{ $settings->google_analytics }}');
|
||||
gtag('config', '{{ $config->google_analytics }}');
|
||||
</script>
|
||||
@endif
|
||||
@else
|
||||
@@ -231,8 +174,8 @@
|
||||
@endif
|
||||
|
||||
{{--Adsense code--}}
|
||||
@if(optional($settings)->allowed_adsense)
|
||||
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client={{ $settings->adsense_client_id ?? '' }}" crossorigin="anonymous"></script>
|
||||
@if(optional($config)->allowed_adsense)
|
||||
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client={{ $config->adsense_client_id ?? '' }}" crossorigin="anonymous"></script>
|
||||
|
||||
<script>
|
||||
(adsbygoogle = window.adsbygoogle || []).push({});
|
||||
|
||||
@@ -9,10 +9,12 @@ use Domain\Files\Controllers\UploadFileController;
|
||||
use App\Users\Controllers\ForgotPasswordController;
|
||||
use Domain\Folders\Controllers\FavouriteController;
|
||||
use Domain\Sharing\Controllers\ShareItemController;
|
||||
use Domain\Settings\Controllers\GetConfigController;
|
||||
use Domain\SetupWizard\Controllers\PingAPIController;
|
||||
use Domain\Folders\Controllers\CreateFolderController;
|
||||
use Domain\Browsing\Controllers\BrowseFolderController;
|
||||
use Domain\Sharing\Controllers\ShareViaEmailController;
|
||||
use Domain\Files\Controllers\UploadFileChunksController;
|
||||
use Domain\Folders\Controllers\NavigationTreeController;
|
||||
use Domain\Items\Controllers\MoveFileOrFolderController;
|
||||
use App\Socialite\Controllers\SocialiteRedirectController;
|
||||
@@ -28,9 +30,15 @@ use Domain\Homepage\Controllers\SendContactMessageController;
|
||||
use Domain\RemoteUpload\Controllers\RemoteUploadFileController;
|
||||
use Domain\Sharing\Controllers\GetShareLinkViaQrCodeController;
|
||||
use App\Users\Controllers\Authentication\RegisterUserController;
|
||||
use Domain\Notifications\Controllers\GetUserNotificationsController;
|
||||
use Domain\Notifications\Controllers\FlushUserNotificationsController;
|
||||
use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
|
||||
use App\Users\Controllers\Authentication\DestroyActiveBearerTokenController;
|
||||
use App\Users\Controllers\Authentication\AuthenticateAndReturnBearerTokenController;
|
||||
|
||||
// Ping Pong
|
||||
Route::get('/ping', PingAPIController::class);
|
||||
Route::get('/config', GetConfigController::class);
|
||||
|
||||
// Pages
|
||||
Route::apiResource('/page', PagesController::class);
|
||||
@@ -39,15 +47,18 @@ Route::apiResource('/page', PagesController::class);
|
||||
Route::post('/contact', SendContactMessageController::class);
|
||||
Route::get('/settings', GetSettingsValueController::class);
|
||||
|
||||
// Register user
|
||||
// Register/login user
|
||||
Route::post('/register', RegisterUserController::class);
|
||||
Route::post('/login', AuthenticateAndReturnBearerTokenController::class)
|
||||
->middleware('throttle:login');
|
||||
Route::post('/logout', DestroyActiveBearerTokenController::class);
|
||||
|
||||
// Socialite
|
||||
Route::get('/socialite/{provider}/redirect', SocialiteRedirectController::class);
|
||||
|
||||
// Password reset
|
||||
Route::group(['prefix' => 'password'], function () {
|
||||
Route::post('/email', [ForgotPasswordController::class, 'sendResetLinkEmail']);
|
||||
Route::post('/recover', [ForgotPasswordController::class, 'sendResetLinkEmail']);
|
||||
Route::post('/reset', [ResetPasswordController::class, 'reset']);
|
||||
});
|
||||
|
||||
@@ -74,8 +85,13 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
|
||||
Route::apiResource('/share', ShareController::class);
|
||||
Route::post('/share/{id}', ShareItemController::class);
|
||||
|
||||
// Notifications
|
||||
Route::post('/notifications/read', MarkUserNotificationsAsReadController::class);
|
||||
Route::delete('/notifications', FlushUserNotificationsController::class);
|
||||
Route::get('/notifications', GetUserNotificationsController::class);
|
||||
|
||||
// Favourites
|
||||
Route::apiResource('/folders/favourites', FavouriteController::class);
|
||||
Route::apiResource('/favourites', FavouriteController::class);
|
||||
|
||||
// Search
|
||||
Route::get('/search', SpotlightSearchController::class);
|
||||
@@ -84,9 +100,11 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
|
||||
// User master,editor routes
|
||||
Route::group(['middleware' => ['auth:sanctum']], function () {
|
||||
Route::post('/upload/remote', RemoteUploadFileController::class);
|
||||
Route::post('/create-folder', CreateFolderController::class);
|
||||
Route::post('/upload/chunks', UploadFileChunksController::class);
|
||||
Route::post('/upload', UploadFileController::class);
|
||||
|
||||
Route::post('/create-folder', CreateFolderController::class);
|
||||
|
||||
Route::patch('/rename/{id}', RenameFileOrFolderController::class);
|
||||
Route::post('/remove', DeleteFileOrFolderController::class);
|
||||
Route::post('/move', MoveFileOrFolderController::class);
|
||||
|
||||
@@ -8,8 +8,9 @@ use Domain\UploadRequest\Controllers\BrowseUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\CreateUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\MoveItemInUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\SetUploadRequestAsFilledController;
|
||||
use Domain\UploadRequest\Controllers\UploadFilesForUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\UploadFileForUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController;
|
||||
use Domain\UploadRequest\Controllers\UploadFileChunksForUploadRequestController;
|
||||
use Domain\RemoteUpload\Controllers\UploadFilesRemotelyForUploadRequestController;
|
||||
|
||||
Route::get('/{uploadRequest}', GetUploadRequestController::class);
|
||||
@@ -21,7 +22,10 @@ Route::group(['middleware' => 'upload-request'], function () {
|
||||
|
||||
// Edit
|
||||
Route::post('/{uploadRequest}/upload/remote', UploadFilesRemotelyForUploadRequestController::class);
|
||||
Route::post('/{uploadRequest}/upload', UploadFilesForUploadRequestController::class);
|
||||
Route::post('/{uploadRequest}/upload/chunks', UploadFileChunksForUploadRequestController::class);
|
||||
Route::post('/{uploadRequest}/upload', UploadFileForUploadRequestController::class);
|
||||
Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
|
||||
|
||||
Route::patch('/{uploadRequest}/rename/{id}', RenameFileOrFolderController::class);
|
||||
Route::post('/{uploadRequest}/create-folder', CreateFolderController::class);
|
||||
Route::post('/{uploadRequest}/remove', DeleteFileOrFolderController::class);
|
||||
@@ -29,7 +33,6 @@ Route::group(['middleware' => 'upload-request'], function () {
|
||||
// Browsing
|
||||
Route::get('/{uploadRequest}/navigation', GetFolderTreeForUploadRequestController::class);
|
||||
Route::get('/{uploadRequest}/browse/{folder?}', BrowseUploadRequestController::class);
|
||||
Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
|
||||
});
|
||||
|
||||
// User functionality
|
||||
@@ -3,10 +3,10 @@
|
||||
use Domain\Sharing\Controllers\ShareController;
|
||||
use Domain\Zip\Controllers\VisitorZipController;
|
||||
use Domain\Files\Controllers\VisitorShowFileController;
|
||||
use Domain\Files\Controllers\VisitorUploadFileController;
|
||||
use Domain\Folders\Controllers\VisitorCreateFolderController;
|
||||
use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
|
||||
use Domain\Browsing\Controllers\VisitorBrowseFolderController;
|
||||
use Domain\Files\Controllers\VisitorUploadFileChunksController;
|
||||
use Domain\Items\Controllers\VisitorMoveFileOrFolderController;
|
||||
use Domain\Items\Controllers\VisitorDeleteFileOrFolderController;
|
||||
use Domain\Items\Controllers\VisitorRenameFileOrFolderController;
|
||||
@@ -18,8 +18,9 @@ use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
|
||||
// Browse functions
|
||||
Route::group(['prefix' => 'editor'], function () {
|
||||
Route::post('/upload/remote/{shared}', VisitorRemoteUploadFileController::class);
|
||||
Route::post('/upload/chunks/{shared}', VisitorUploadFileChunksController::class);
|
||||
|
||||
Route::post('/create-folder/{shared}', VisitorCreateFolderController::class);
|
||||
Route::post('/upload/{shared}', VisitorUploadFileController::class);
|
||||
|
||||
Route::patch('/rename/{id}/{shared}', VisitorRenameFileOrFolderController::class);
|
||||
Route::post('/remove/{shared}', VisitorDeleteFileOrFolderController::class);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use App\Users\Controllers\Account\UpdateAvatarController;
|
||||
use App\Users\Controllers\Account\AccountDetailsController;
|
||||
use App\Users\Controllers\Account\UpdatePasswordController;
|
||||
use App\Users\Controllers\Account\StorageCapacityController;
|
||||
@@ -7,34 +8,27 @@ use App\Users\Controllers\Verification\VerifyEmailController;
|
||||
use Domain\Transactions\Controllers\GetTransactionsController;
|
||||
use App\Users\Controllers\Authentication\CheckAccountController;
|
||||
use App\Users\Controllers\Account\UpdateProfileSettingsController;
|
||||
use Domain\Notifications\Controllers\GetUserNotificationsController;
|
||||
use App\Users\Controllers\Authentication\AccountAccessTokenController;
|
||||
use Domain\Notifications\Controllers\FlushUserNotificationsController;
|
||||
use App\Users\Controllers\Verification\ResendVerificationEmailController;
|
||||
use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
|
||||
|
||||
Route::post('/check', CheckAccountController::class);
|
||||
|
||||
// Email verification
|
||||
Route::get('/email/verify/{id}', VerifyEmailController::class)
|
||||
Route::get('/verify/{id}', VerifyEmailController::class)
|
||||
->name('verification.verify');
|
||||
|
||||
Route::post('/email/verify/resend', ResendVerificationEmailController::class)
|
||||
Route::post('/verify', ResendVerificationEmailController::class)
|
||||
->name('verification.send');
|
||||
|
||||
Route::group(['middleware' => ['auth:sanctum']], function () {
|
||||
// User Access Token
|
||||
Route::apiResource('/tokens', AccountAccessTokenController::class);
|
||||
|
||||
// Notifications
|
||||
Route::post('/notifications/read', MarkUserNotificationsAsReadController::class);
|
||||
Route::delete('/notifications', FlushUserNotificationsController::class);
|
||||
Route::get('/notifications', GetUserNotificationsController::class);
|
||||
|
||||
// Account
|
||||
Route::patch('/settings', UpdateProfileSettingsController::class);
|
||||
Route::get('/transactions', GetTransactionsController::class);
|
||||
Route::post('/password', UpdatePasswordController::class);
|
||||
Route::get('/storage', StorageCapacityController::class);
|
||||
Route::post('/avatar', UpdateAvatarController::class);
|
||||
Route::get('/', AccountDetailsController::class);
|
||||
});
|
||||
|
||||
@@ -43,9 +43,9 @@ class RouteServiceProvider extends ServiceProvider
|
||||
->middleware('api')
|
||||
->group(base_path('routes/share.php'));
|
||||
|
||||
Route::prefix('api/upload-request')
|
||||
Route::prefix('api/file-request')
|
||||
->middleware('api')
|
||||
->group(base_path('routes/upload-request.php'));
|
||||
->group(base_path('routes/file-request.php'));
|
||||
|
||||
Route::prefix('api/admin')
|
||||
->middleware(['api', 'auth:sanctum', 'admin'])
|
||||
@@ -85,5 +85,7 @@ class RouteServiceProvider extends ServiceProvider
|
||||
? Limit::perMinute(1000)->by($request->user()->id)
|
||||
: Limit::perMinute(100)->by($request->ip());
|
||||
});
|
||||
|
||||
RateLimiter::for('login', fn (Request $request) => Limit::perMinute(5)->by($request->ip()));
|
||||
}
|
||||
}
|
||||
|
||||
35
src/App/Users/Controllers/Account/UpdateAvatarController.php
Normal file
35
src/App/Users/Controllers/Account/UpdateAvatarController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
namespace App\Users\Controllers\Account;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Users\Requests\UpdateAvatarRequest;
|
||||
|
||||
class UpdateAvatarController extends Controller
|
||||
{
|
||||
/**
|
||||
* Update user settings
|
||||
*/
|
||||
public function __invoke(
|
||||
UpdateAvatarRequest $request
|
||||
): JsonResponse {
|
||||
$successMessage = [
|
||||
'type' => 'success',
|
||||
'message' => 'The avatar was successfully updated.',
|
||||
];
|
||||
|
||||
// Check if is demo
|
||||
if (isDemoAccount()) {
|
||||
return response()->json($successMessage);
|
||||
}
|
||||
|
||||
$request
|
||||
->user()
|
||||
->settings()
|
||||
->update([
|
||||
'avatar' => store_avatar($request, 'avatar'),
|
||||
]);
|
||||
|
||||
return response()->json($successMessage);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,6 @@ namespace App\Users\Controllers\Account;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Database\QueryException;
|
||||
use App\Users\Requests\UpdateUserProfileSettingsRequest;
|
||||
|
||||
@@ -25,23 +24,10 @@ class UpdateProfileSettingsController extends Controller
|
||||
return response()->json($successMessage);
|
||||
}
|
||||
|
||||
// Get user
|
||||
$user = Auth::user();
|
||||
|
||||
// Update avatar
|
||||
if ($request->hasFile('avatar')) {
|
||||
$user
|
||||
->settings()
|
||||
->update([
|
||||
'avatar' => store_avatar($request, 'avatar'),
|
||||
]);
|
||||
|
||||
return response()->json($successMessage);
|
||||
}
|
||||
|
||||
// Try to store user option
|
||||
try {
|
||||
$user
|
||||
$request
|
||||
->user()
|
||||
->settings()
|
||||
->update(make_single_input($request));
|
||||
} catch (QueryException $e) {
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
namespace App\Users\Controllers\Authentication;
|
||||
|
||||
use Hash;
|
||||
use App\Users\Models\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Users\Requests\LoginUserRequest;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
class AuthenticateAndReturnBearerTokenController extends Controller
|
||||
{
|
||||
/**
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function __invoke(LoginUserRequest $request): JsonResponse
|
||||
{
|
||||
// Get user
|
||||
$user = User::where('email', $request->input('email'))
|
||||
->firstOrFail();
|
||||
|
||||
// Check the credentials
|
||||
if (! Hash::check($request->input('password'), $user->password)) {
|
||||
throw ValidationException::withMessages(['email' => ['The provided credentials are incorrect.'], ]);
|
||||
}
|
||||
|
||||
// Create access token
|
||||
$token = $user->createToken('login');
|
||||
|
||||
// Return token
|
||||
return response()->json([
|
||||
'type' => 'success',
|
||||
'message' => 'You were successfully authenticated',
|
||||
'data' => [
|
||||
'token' => $token->plainTextToken,
|
||||
],
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ class CheckAccountController extends Controller
|
||||
return response()->json([
|
||||
'type' => 'error',
|
||||
'message' => __t('user_not_fount'),
|
||||
]);
|
||||
], 404);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
namespace App\Users\Controllers\Authentication;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Laravel\Sanctum\PersonalAccessToken;
|
||||
|
||||
class DestroyActiveBearerTokenController extends Controller
|
||||
{
|
||||
public function __invoke(): JsonResponse
|
||||
{
|
||||
[$id, $token] = explode('|', request()->bearerToken(), 2);
|
||||
|
||||
// Get token
|
||||
$instance = PersonalAccessToken::findOrFail($id);
|
||||
|
||||
// Check the correct token
|
||||
if (hash_equals($instance->token, hash('sha256', $token))) {
|
||||
// Delete token
|
||||
$instance->delete();
|
||||
|
||||
return response()->json([
|
||||
'type' => 'success',
|
||||
'message' => 'You were successfully logged out',
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'type' => 'error',
|
||||
'message' => 'You are not authorized',
|
||||
], 401);
|
||||
}
|
||||
}
|
||||
@@ -109,7 +109,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
||||
'used' => (float) get_storage_percentage($this->usedCapacity, $this->limitations->max_storage_amount),
|
||||
'used_formatted' => get_storage_percentage($this->usedCapacity, $this->limitations->max_storage_amount) . '%',
|
||||
'capacity' => $this->limitations->max_storage_amount,
|
||||
'capacity_formatted' => format_gigabytes($this->limitations->max_storage_amount),
|
||||
'capacity_formatted' => toGigabytes($this->limitations->max_storage_amount),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ class UserLimitation extends Model
|
||||
|
||||
return [
|
||||
'use' => Metric::bytes($userCapacity)->format(),
|
||||
'total' => format_gigabytes($this->max_storage_amount),
|
||||
'total' => toGigabytes($this->max_storage_amount),
|
||||
'percentage' => get_storage_percentage($userCapacity, $this->max_storage_amount),
|
||||
];
|
||||
}
|
||||
|
||||
30
src/App/Users/Requests/LoginUserRequest.php
Normal file
30
src/App/Users/Requests/LoginUserRequest.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
namespace App\Users\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class LoginUserRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|string',
|
||||
];
|
||||
}
|
||||
}
|
||||
29
src/App/Users/Requests/UpdateAvatarRequest.php
Normal file
29
src/App/Users/Requests/UpdateAvatarRequest.php
Normal file
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
namespace App\Users\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateAvatarRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'avatar' => 'required|file',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -24,8 +24,7 @@ class UpdateUserProfileSettingsRequest extends FormRequest
|
||||
{
|
||||
return [
|
||||
'name' => 'required|string',
|
||||
'value' => 'sometimes|string',
|
||||
'avatar' => 'sometimes|file',
|
||||
'value' => 'required|string',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class UserStorageResource extends JsonResource
|
||||
'type' => 'storage',
|
||||
'attributes' => [
|
||||
'used' => Metric::bytes($this->usedCapacity)->format(),
|
||||
'capacity' => format_gigabytes($totalCapacity),
|
||||
'capacity' => toGigabytes($totalCapacity),
|
||||
'percentage' => (float) get_storage_percentage($this->usedCapacity, $totalCapacity),
|
||||
],
|
||||
'meta' => [
|
||||
|
||||
@@ -30,7 +30,7 @@ class UserSubscription extends JsonResource
|
||||
'canceled' => $this->subscription('main')->cancelled(),
|
||||
'name' => $subscription['product']['name'],
|
||||
'capacity' => (int) $subscription['product']['metadata']['capacity'],
|
||||
'capacity_formatted' => format_gigabytes($subscription['product']['metadata']['capacity']),
|
||||
'capacity_formatted' => toGigabytes($subscription['product']['metadata']['capacity']),
|
||||
'slug' => $subscription['plan']['id'],
|
||||
'canceled_at' => format_date($active_subscription['canceled_at'], 'd. M. Y'),
|
||||
'created_at' => format_date($active_subscription['current_period_start'], 'd. M. Y'),
|
||||
|
||||
@@ -3,11 +3,12 @@ namespace Domain\Files\Actions;
|
||||
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Support\Collection;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Requests\UploadFileRequest;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
|
||||
class GetFileParentId
|
||||
{
|
||||
public function __invoke(UploadRequest $request, string $userId): ?string
|
||||
public function __invoke(UploadChunkRequest|UploadFileRequest $request, string $userId): ?string
|
||||
{
|
||||
// extract file path
|
||||
$directoryPath = collect(
|
||||
|
||||
@@ -4,7 +4,8 @@ namespace Domain\Files\Actions;
|
||||
use App\Users\Models\User;
|
||||
use Domain\Files\Models\File;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Requests\UploadFileRequest;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
use Domain\Traffic\Actions\RecordUploadAction;
|
||||
use League\Flysystem\UnableToRetrieveMetadata;
|
||||
|
||||
@@ -24,7 +25,7 @@ class ProcessFileAction
|
||||
* Upload new file
|
||||
*/
|
||||
public function __invoke(
|
||||
UploadRequest $request,
|
||||
UploadChunkRequest|UploadFileRequest $request,
|
||||
User $user,
|
||||
string $name,
|
||||
): File {
|
||||
@@ -50,7 +51,7 @@ class ProcessFileAction
|
||||
}
|
||||
|
||||
// File size handling
|
||||
if ($uploadLimit && $size > format_bytes($uploadLimit)) {
|
||||
if ($uploadLimit && $size > toBytes($uploadLimit)) {
|
||||
abort(413);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ namespace Domain\Files\Actions;
|
||||
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
|
||||
class StoreFileChunksAction
|
||||
@@ -11,10 +11,10 @@ class StoreFileChunksAction
|
||||
/**
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public function __invoke(UploadRequest $request)
|
||||
public function __invoke(UploadChunkRequest $request)
|
||||
{
|
||||
// Get uploaded file
|
||||
$file = $request->file('file');
|
||||
$file = $request->file('chunk');
|
||||
|
||||
// Get chunk name
|
||||
$name = $file->getClientOriginalName();
|
||||
@@ -26,7 +26,7 @@ class StoreFileChunksAction
|
||||
File::append($path, $file->get());
|
||||
|
||||
// If last chunk, then return file path
|
||||
if ($request->boolean('is_last')) {
|
||||
if ($request->boolean('is_last_chunk')) {
|
||||
return "chunks/$name";
|
||||
}
|
||||
}
|
||||
|
||||
59
src/Domain/Files/Controllers/UploadFileChunksController.php
Normal file
59
src/Domain/Files/Controllers/UploadFileChunksController.php
Normal file
@@ -0,0 +1,59 @@
|
||||
<?php
|
||||
namespace Domain\Files\Controllers;
|
||||
|
||||
use Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Files\Resources\FileResource;
|
||||
use Domain\Files\Actions\ProcessFileAction;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
use Support\Demo\Actions\FakeUploadFileAction;
|
||||
use Domain\Files\Actions\StoreFileChunksAction;
|
||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
|
||||
class UploadFileChunksController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
public ProcessFileAction $processFie,
|
||||
public FakeUploadFileAction $fakeUploadFile,
|
||||
public StoreFileChunksAction $storeFileChunks,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload file for authenticated master|editor user
|
||||
*
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public function __invoke(UploadChunkRequest $request)
|
||||
{
|
||||
if (isDemoAccount()) {
|
||||
return ($this->fakeUploadFile)($request);
|
||||
}
|
||||
|
||||
// Store file chunks
|
||||
$chunkPath = ($this->storeFileChunks)($request);
|
||||
|
||||
// Proceed after last chunk
|
||||
if ($request->boolean('is_last_chunk')) {
|
||||
// Get user
|
||||
$user = $request->filled('parent_id')
|
||||
? Folder::find($request->input('parent_id'))
|
||||
->getLatestParent()
|
||||
->user
|
||||
: auth()->user();
|
||||
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
|
||||
// Move file to user directory
|
||||
Storage::disk('local')->move($chunkPath, "files/$user->id/$name");
|
||||
|
||||
// Process file
|
||||
$file = ($this->processFie)($request, $user, $name);
|
||||
|
||||
return response(new FileResource($file), 201);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,56 +4,43 @@ namespace Domain\Files\Controllers;
|
||||
use Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Resources\FileResource;
|
||||
use Domain\Files\Actions\ProcessFileAction;
|
||||
use Domain\Files\Requests\UploadFileRequest;
|
||||
use Support\Demo\Actions\FakeUploadFileAction;
|
||||
use Domain\Files\Actions\StoreFileChunksAction;
|
||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
|
||||
class UploadFileController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
public ProcessFileAction $processFie,
|
||||
public FakeUploadFileAction $fakeUploadFile,
|
||||
public StoreFileChunksAction $storeFileChunks,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload file for authenticated master|editor user
|
||||
*
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public function __invoke(UploadRequest $request)
|
||||
public function __invoke(UploadFileRequest $request): JsonResponse
|
||||
{
|
||||
if (isDemoAccount()) {
|
||||
return ($this->fakeUploadFile)($request);
|
||||
return response()->json(($this->fakeUploadFile)($request), 201);
|
||||
}
|
||||
|
||||
// Store file chunks
|
||||
$chunkPath = ($this->storeFileChunks)($request);
|
||||
// Get user
|
||||
$user = $request->filled('parent_id')
|
||||
? Folder::find($request->input('parent_id'))
|
||||
->getLatestParent()
|
||||
->user
|
||||
: auth()->user();
|
||||
|
||||
// Proceed after last chunk
|
||||
if ($request->boolean('is_last')) {
|
||||
// Get user
|
||||
$user = $request->filled('parent_id')
|
||||
? Folder::find($request->input('parent_id'))
|
||||
->getLatestParent()
|
||||
->user
|
||||
: auth()->user();
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
// Put file to user directory
|
||||
Storage::disk('local')->put("files/$user->id/$name", $request->file('file')->get());
|
||||
|
||||
// Move file to user directory
|
||||
Storage::disk('local')->move($chunkPath, "files/$user->id/$name");
|
||||
// Process file
|
||||
$file = ($this->processFie)($request, $user, $name);
|
||||
|
||||
// Process file
|
||||
$file = ($this->processFie)($request, $user, $name);
|
||||
|
||||
return response(new FileResource($file), 201);
|
||||
}
|
||||
return response()->json(new FileResource($file), 201);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@ use Str;
|
||||
use Storage;
|
||||
use Domain\Sharing\Models\Share;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Resources\FileResource;
|
||||
use Domain\Files\Actions\ProcessFileAction;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
use Support\Demo\Actions\FakeUploadFileAction;
|
||||
use Domain\Files\Actions\StoreFileChunksAction;
|
||||
use Domain\Sharing\Actions\ProtectShareRecordAction;
|
||||
@@ -17,7 +17,7 @@ use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
/**
|
||||
* guest user upload file into shared folder
|
||||
*/
|
||||
class VisitorUploadFileController extends Controller
|
||||
class VisitorUploadFileChunksController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
public ProcessFileAction $processFie,
|
||||
@@ -32,7 +32,7 @@ class VisitorUploadFileController extends Controller
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public function __invoke(
|
||||
UploadRequest $request,
|
||||
UploadChunkRequest $request,
|
||||
Share $shared,
|
||||
) {
|
||||
if (isDemoAccount()) {
|
||||
@@ -54,7 +54,7 @@ class VisitorUploadFileController extends Controller
|
||||
$chunkPath = ($this->storeFileChunks)($request);
|
||||
|
||||
// Proceed after last chunk
|
||||
if ($request->boolean('is_last')) {
|
||||
if ($request->boolean('is_last_chunk')) {
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
|
||||
35
src/Domain/Files/Requests/UploadChunkRequest.php
Normal file
35
src/Domain/Files/Requests/UploadChunkRequest.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
namespace Domain\Files\Requests;
|
||||
|
||||
use Domain\Admin\Rules\DisabledMimetypes;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UploadChunkRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'name' => 'required|string',
|
||||
'parent_id' => 'sometimes|uuid',
|
||||
'path' => 'sometimes|string',
|
||||
'is_last_chunk' => 'required|boolean',
|
||||
'extension' => 'required|string|nullable',
|
||||
'chunk' => ['required', 'file', new DisabledMimetypes],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ namespace Domain\Files\Requests;
|
||||
use Domain\Admin\Rules\DisabledMimetypes;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UploadRequest extends FormRequest
|
||||
class UploadFileRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
@@ -24,12 +24,11 @@ class UploadRequest extends FormRequest
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'name' => 'required|string',
|
||||
'parent_id' => 'nullable|uuid',
|
||||
'path' => 'sometimes|string',
|
||||
'is_last' => 'sometimes|string',
|
||||
'extension' => 'sometimes|string|nullable',
|
||||
'file' => ['required', 'file', new DisabledMimetypes],
|
||||
'name' => 'required|string',
|
||||
'parent_id' => 'sometimes|uuid',
|
||||
'path' => 'sometimes|string',
|
||||
'extension' => 'required|string|nullable',
|
||||
'file' => ['required', 'file', new DisabledMimetypes],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,51 +1,22 @@
|
||||
<?php
|
||||
namespace Domain\Homepage\Controllers;
|
||||
|
||||
use DB;
|
||||
use PDOException;
|
||||
use Domain\Pages\Models\Page;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Support\Status\Actions\GetServerSetupStatusAction;
|
||||
use Domain\Settings\Actions\GetConfigAction;
|
||||
|
||||
class IndexController
|
||||
{
|
||||
public function __construct(
|
||||
public GetServerSetupStatusAction $getServerSetupStatus,
|
||||
public GetConfigAction $getConfig,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Show index page
|
||||
*/
|
||||
public function __invoke(): Application|Factory|View
|
||||
public function __invoke(): View
|
||||
{
|
||||
$setup_status = 'installation-needed';
|
||||
|
||||
try {
|
||||
// Try to connect to database
|
||||
DB::getPdo();
|
||||
|
||||
// Get setup status
|
||||
$setup_status = get_setup_status();
|
||||
|
||||
// Get app pages
|
||||
$pages = Page::all();
|
||||
|
||||
// Get all settings
|
||||
$settings = get_settings_in_json();
|
||||
} catch (PDOException $e) {
|
||||
}
|
||||
|
||||
if ($setup_status === 'installation-needed') {
|
||||
$status_check = ($this->getServerSetupStatus)();
|
||||
}
|
||||
|
||||
return view('index')
|
||||
->with('status_check', $status_check ?? [])
|
||||
->with('settings', $settings ?? null)
|
||||
->with('legal', $pages ?? null)
|
||||
->with('installation', $setup_status);
|
||||
->with('config', json_decode(json_encode(($this->getConfig)())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
<?php
|
||||
namespace Domain\RemoteUpload\Controllers;
|
||||
|
||||
use DB;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
|
||||
use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
|
||||
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
|
||||
|
||||
class UploadFilesRemotelyForUploadRequestController
|
||||
{
|
||||
public function __construct(
|
||||
private GetContentFromExternalSource $getContentFromExternalSource,
|
||||
public GetContentFromExternalSource $getContentFromExternalSource,
|
||||
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -26,7 +27,7 @@ class UploadFilesRemotelyForUploadRequestController
|
||||
|
||||
// Create folder if not exist
|
||||
if ($folder->doesntExist()) {
|
||||
$this->createFolder($uploadRequest);
|
||||
($this->createUploadRequestRootFolder)($uploadRequest);
|
||||
}
|
||||
|
||||
// Set default parent_id for uploaded file
|
||||
@@ -54,28 +55,4 @@ class UploadFilesRemotelyForUploadRequestController
|
||||
'message' => 'Files were successfully added to the upload queue.',
|
||||
], 201);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create root Upload Request folder
|
||||
*/
|
||||
private function createFolder(UploadRequest $uploadRequest): void
|
||||
{
|
||||
// Format timestamp
|
||||
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
|
||||
|
||||
// Create folder
|
||||
DB::table('folders')->insert([
|
||||
'id' => $uploadRequest->id,
|
||||
'parent_id' => $uploadRequest->folder_id ?? null,
|
||||
'user_id' => $uploadRequest->user_id,
|
||||
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
// Update upload request status
|
||||
$uploadRequest->update([
|
||||
'status' => 'filling',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
192
src/Domain/Settings/Actions/GetConfigAction.php
Normal file
192
src/Domain/Settings/Actions/GetConfigAction.php
Normal file
@@ -0,0 +1,192 @@
|
||||
<?php
|
||||
namespace Domain\Settings\Actions;
|
||||
|
||||
use DB;
|
||||
use PDOException;
|
||||
use Domain\Pages\Models\Page;
|
||||
use Monolog\Handler\MissingExtensionException;
|
||||
use VueFileManager\Subscription\Domain\Plans\Models\Plan;
|
||||
use Domain\Settings\Controllers\GetServerStatusController;
|
||||
use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
|
||||
use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
|
||||
|
||||
class GetConfigAction
|
||||
{
|
||||
public function __construct(
|
||||
public GetServerStatusController $getServerSetupStatus,
|
||||
) {
|
||||
}
|
||||
|
||||
public function __invoke(): array
|
||||
{
|
||||
$setupStatus = 'installation-needed';
|
||||
$serverInfo = [];
|
||||
$settings = null;
|
||||
|
||||
try {
|
||||
// Try to connect to database
|
||||
DB::getPdo();
|
||||
|
||||
// Get setup status
|
||||
$setupStatus = getInstallationStatus();
|
||||
|
||||
// Get all settings
|
||||
$settings = getAllSettings();
|
||||
|
||||
// Get app pages
|
||||
$pages = Page::all();
|
||||
|
||||
// Subscription
|
||||
$isEmptySubscriptions = Subscription::count() === 0;
|
||||
$isEmptyTransactions = Transaction::count() === 0;
|
||||
$isEmptyPlans = Plan::count() === 0;
|
||||
$plan = Plan::where('status', 'active')
|
||||
->where('type', 'metered');
|
||||
|
||||
// User
|
||||
$isUser = auth()->check();
|
||||
$user = auth()->user();
|
||||
|
||||
// Default user settings
|
||||
$defaultEmoji = $isUser ? $user->settings->emoji_type : 'twemoji';
|
||||
$defaultThemeMode = $isUser ? $user->settings->theme_mode : 'system';
|
||||
} catch (PDOException $e) {
|
||||
[$isUser, $isEmptyPlans, $isEmptyTransactions, $isEmptySubscriptions] = false;
|
||||
|
||||
$pages = null;
|
||||
$plan = null;
|
||||
$defaultEmoji = 'twemoji';
|
||||
$defaultThemeMode = 'system';
|
||||
}
|
||||
|
||||
if ($setupStatus === 'installation-needed') {
|
||||
$serverInfo = ($this->getServerSetupStatus)();
|
||||
}
|
||||
|
||||
// Bcmath Extension
|
||||
try {
|
||||
$storageDefaultSpaceFormatted = isset($settings->default_max_storage_amount)
|
||||
? toGigabytes($settings->default_max_storage_amount)
|
||||
: toGigabytes(5);
|
||||
|
||||
$uploadLimit = isset($settings->upload_limit)
|
||||
? toBytes($settings->upload_limit)
|
||||
: 'undefined';
|
||||
|
||||
$chunkSize = isset($settings->chunk_size)
|
||||
? toBytes($settings->chunk_size)
|
||||
: toBytes(64);
|
||||
|
||||
$uploadLimitFormatted = isset($settings->upload_limit)
|
||||
? toMegabytes($settings->upload_limit)
|
||||
: null;
|
||||
} catch (MissingExtensionException $e) {
|
||||
$storageDefaultSpaceFormatted = '5GB';
|
||||
$uploadLimit = 'undefined';
|
||||
$uploadLimitFormatted = 5;
|
||||
$chunkSize = 64000000;
|
||||
}
|
||||
|
||||
return [
|
||||
// App
|
||||
'host' => url('/'),
|
||||
'api' => url('/api'),
|
||||
'locale' => app()->getLocale(),
|
||||
'isDev' => is_dev() ? 1 : 0,
|
||||
'isDemo' => config('vuefilemanager.is_demo') ? 1 : 0,
|
||||
'isSaaS' => $settings && optional($settings)->license === 'extended' ? 1 : 0,
|
||||
'isAuthenticated' => $isUser ? 1 : 0,
|
||||
'isSetupWizardDemo' => config('vuefilemanager.is_setup_wizard_demo') ? 1 : 0,
|
||||
'isSetupWizardDebug' => config('vuefilemanager.is_setup_wizard_debug') ? 1 : 0,
|
||||
'isAdminVueFileManagerBar' => config('vuefilemanager.is_admin_vuefilemanager_bar', 1) ? 1 : 0,
|
||||
'installation' => $setupStatus ?? 'initial',
|
||||
'statusCheck' => json_encode($serverInfo) ?? 'undefined',
|
||||
|
||||
// Broadcasting
|
||||
'broadcasting' => config('broadcasting.default'),
|
||||
'broadcastingKey' => config('broadcasting.connections.pusher.key'),
|
||||
'broadcastingHost' => config('broadcasting.connections.pusher.options.host'),
|
||||
'broadcastingPort' => config('broadcasting.connections.pusher.options.port'),
|
||||
'broadcastingCluster' => config('broadcasting.connections.pusher.options.cluster'),
|
||||
|
||||
// App Logos
|
||||
'app_logo' => $settings->app_logo ?? null,
|
||||
'app_logo_dark' => $settings->app_logo_dark ?? null,
|
||||
'app_logo_horizontal' => $settings->app_logo_horizontal ?? null,
|
||||
'app_logo_horizontal_dark' => $settings->app_logo_horizontal_dark ?? null,
|
||||
|
||||
// App theme
|
||||
'app_color' => $settings->app_color ?? '#00BC7E',
|
||||
'app_footer' => $settings->footer_content ?? null,
|
||||
|
||||
// App title & name
|
||||
'app_name' => $settings->app_title ?? 'VueFileManager',
|
||||
'app_description' => $settings->app_description ?? __t('app_description'),
|
||||
'defaultEmoji' => $defaultEmoji,
|
||||
'defaultThemeMode' => $defaultThemeMode,
|
||||
|
||||
// Upload settings
|
||||
'mimetypesBlacklist' => isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist : null,
|
||||
'storageDefaultSpace' => $settings->default_max_storage_amount ?? 5,
|
||||
'storageLimit' => $settings->storage_limitation ?? 1,
|
||||
'storageDefaultSpaceFormatted' => $storageDefaultSpaceFormatted,
|
||||
'uploadLimitFormatted' => $uploadLimitFormatted,
|
||||
'uploadLimit' => $uploadLimit,
|
||||
'chunkSize' => $chunkSize,
|
||||
|
||||
// Metered billings
|
||||
'allowed_registration_bonus' => $settings->allowed_registration_bonus ?? 0,
|
||||
'registration_bonus_amount' => $settings->registration_bonus_amount ?? 0,
|
||||
'isCreatedMeteredPlan' => $plan && $plan->exists() ? 1 : 0,
|
||||
'meteredPlanId' => $plan && $plan->exists() ? $plan->first()->id : null,
|
||||
|
||||
// Payments setup
|
||||
'allowed_payments' => $settings->allowed_payments ?? 0,
|
||||
'subscriptionType' => $settings->subscription_type ?? 'none',
|
||||
'isEmptyPlans' => $isEmptyPlans ? 1 : 0,
|
||||
'isEmptyTransactions' => $isEmptyTransactions ? 1 : 0,
|
||||
'isEmptySubscriptions' => $isEmptySubscriptions ? 1 : 0,
|
||||
|
||||
// Payment gateways
|
||||
'isPayPal' => $settings->allowed_paypal ?? 0,
|
||||
'isPaystack' => $settings->allowed_paystack ?? 0,
|
||||
'isStripe' => $settings->allowed_stripe ?? 0,
|
||||
'isPayPalLive' => config('subscription.credentials.paypal.is_live') ? 1 : 0,
|
||||
'paypal_client_id' => config('subscription.credentials.paypal.id'),
|
||||
'paystack_public_key' => config('subscription.credentials.paystack.public_key'),
|
||||
'stripe_public_key' => config('subscription.credentials.stripe.public_key'),
|
||||
'paypal_payment_description' => $settings->paypal_payment_description ?? null,
|
||||
'paystack_payment_description' => $settings->paystack_payment_description ?? null,
|
||||
'stripe_payment_description' => $settings->stripe_payment_description ?? null,
|
||||
|
||||
// Google reCaptcha
|
||||
'allowedRecaptcha' => $settings->allowed_recaptcha ?? 0,
|
||||
'recaptcha_client_id' => config('services.recaptcha.client_id'),
|
||||
'isRecaptchaConfigured' => config('services.recaptcha.client_id') ? 1 : 0,
|
||||
|
||||
// Social Authentication
|
||||
'allowedFacebookLogin' => $settings->allowed_facebook_login ?? 0,
|
||||
'allowedGoogleLogin' => $settings->allowed_google_login ?? 0,
|
||||
'allowedGithubLogin' => $settings->allowed_github_login ?? 0,
|
||||
'isFacebookLoginConfigured' => config('services.facebook.client_id') ? 1 : 0,
|
||||
'isGoogleLoginConfigured' => config('services.google.client_id') ? 1 : 0,
|
||||
'isGithubLoginConfigured' => config('services.github.client_id') ? 1 : 0,
|
||||
|
||||
// Google Adsense
|
||||
'allowedAdsense' => $settings?->allowed_adsense ?? 0,
|
||||
'adsenseClientId' => $settings->adsense_client_id ?? null,
|
||||
'adsenseBanner01' => $settings->adsense_banner_01 ?? null,
|
||||
'adsenseBanner02' => $settings->adsense_banner_02 ?? null,
|
||||
'adsenseBanner03' => $settings->adsense_banner_03 ?? null,
|
||||
|
||||
// Registration
|
||||
'userRegistration' => $settings->registration ?? 1,
|
||||
'userVerification' => $settings->user_verification ?? 0,
|
||||
|
||||
// Public Pages
|
||||
'allowHomepage' => $settings->allow_homepage ?? 1,
|
||||
'teamsDefaultMembers' => $settings->default_max_team_member ?? 10,
|
||||
'legal' => $pages ? json_encode($pages) : 'undefined',
|
||||
];
|
||||
}
|
||||
}
|
||||
19
src/Domain/Settings/Controllers/GetConfigController.php
Normal file
19
src/Domain/Settings/Controllers/GetConfigController.php
Normal file
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
namespace Domain\Settings\Controllers;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Settings\Actions\GetConfigAction;
|
||||
|
||||
class GetConfigController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
public GetConfigAction $getConfigAction,
|
||||
) {
|
||||
}
|
||||
|
||||
public function __invoke(): JsonResponse
|
||||
{
|
||||
return response()->json(($this->getConfigAction)());
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,7 @@ class WebCrawlerOpenGraphController extends Controller
|
||||
}
|
||||
|
||||
return view('vuefilemanager.crawler.og-view')
|
||||
->with('settings', get_settings_in_json())
|
||||
->with('settings', getAllSettings())
|
||||
->with('metadata', [
|
||||
'url' => url('/share', ['token' => $share->token]),
|
||||
'is_protected' => (int) $share->is_protected,
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
namespace Domain\UploadRequest\Actions;
|
||||
|
||||
use DB;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
|
||||
class CreateUploadRequestRootFolderAction
|
||||
{
|
||||
/**
|
||||
* Create root Upload Request folder
|
||||
*/
|
||||
public function __invoke(UploadRequest $uploadRequest): void
|
||||
{
|
||||
// Format timestamp
|
||||
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
|
||||
|
||||
// Create folder
|
||||
DB::table('folders')->insert([
|
||||
'id' => $uploadRequest->id,
|
||||
'parent_id' => $uploadRequest->folder_id ?? null,
|
||||
'user_id' => $uploadRequest->user_id,
|
||||
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
// Update upload request status
|
||||
$uploadRequest->update([
|
||||
'status' => 'filling',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
namespace Domain\UploadRequest\Controllers;
|
||||
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Domain\Folders\Resources\FolderResource;
|
||||
use Domain\Folders\Actions\CreateFolderAction;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
@@ -16,16 +17,21 @@ class CreateFolderController
|
||||
) {
|
||||
}
|
||||
|
||||
public function __invoke(CreateFolderRequest $request, UploadRequest $uploadRequest)
|
||||
{
|
||||
public function __invoke(
|
||||
CreateFolderRequest $request,
|
||||
UploadRequest $uploadRequest,
|
||||
): JsonResponse {
|
||||
// Check privileges
|
||||
if (! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
|
||||
return response('Access Denied', 403);
|
||||
if ($request->has('parent_id') && ! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
|
||||
return response()->json([
|
||||
'type' => 'error',
|
||||
'message' => "You don't have privileges to create folder here",
|
||||
], 403);
|
||||
}
|
||||
|
||||
// Create new folder
|
||||
$folder = Folder::create([
|
||||
'parent_id' => $request->input('parent_id'),
|
||||
'parent_id' => $request->input('parent_id') ?? $uploadRequest->id,
|
||||
'name' => $request->input('name'),
|
||||
'color' => $request->input('color') ?? null,
|
||||
'emoji' => $request->input('emoji') ?? null,
|
||||
@@ -35,6 +41,6 @@ class CreateFolderController
|
||||
]);
|
||||
|
||||
// Return new folder
|
||||
return response(new FolderResource($folder), 201);
|
||||
return response()->json(new FolderResource($folder), 201);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,14 +4,22 @@ namespace Domain\UploadRequest\Controllers;
|
||||
use Illuminate\Support\Arr;
|
||||
use Domain\Files\Models\File;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Domain\Items\Requests\DeleteItemRequest;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
|
||||
class DeleteFileOrFolderController
|
||||
{
|
||||
public function __invoke(DeleteItemRequest $request, UploadRequest $uploadRequest)
|
||||
{
|
||||
public function __invoke(
|
||||
DeleteItemRequest $request,
|
||||
UploadRequest $uploadRequest
|
||||
): JsonResponse {
|
||||
$successMessage = [
|
||||
'type' => 'success',
|
||||
'message' => 'Items was successfully deleted.',
|
||||
];
|
||||
|
||||
foreach ($request->input('items') as $file) {
|
||||
// Get file or folder item
|
||||
$item = get_item($file['type'], $file['id']);
|
||||
@@ -27,7 +35,7 @@ class DeleteFileOrFolderController
|
||||
}
|
||||
}
|
||||
|
||||
return response('Done', 204);
|
||||
return response()->json($successMessage);
|
||||
}
|
||||
|
||||
private function destroyFile(File $file): void
|
||||
|
||||
@@ -4,24 +4,28 @@ namespace Domain\UploadRequest\Controllers;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Items\Requests\MoveItemRequest;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
|
||||
class MoveItemInUploadRequestController extends Controller
|
||||
{
|
||||
public function __invoke(
|
||||
MoveItemRequest $request,
|
||||
UploadRequest $uploadRequest,
|
||||
) {
|
||||
): JsonResponse {
|
||||
foreach ($request->input('items') as $item) {
|
||||
$item = get_item($item['type'], $item['id']);
|
||||
|
||||
// Check privileges
|
||||
if (! in_array($item['parent_id'], getChildrenFolderIds($uploadRequest->id))) {
|
||||
return response('Access Denied', 403);
|
||||
return response()->json(accessDeniedError(), 403);
|
||||
}
|
||||
|
||||
$item->update(['parent_id' => $request->input('to_id') ?? $uploadRequest->id]);
|
||||
}
|
||||
|
||||
return response('Done.', 204);
|
||||
return response()->json([
|
||||
'type' => 'success',
|
||||
'message' => 'Items was successfully moved.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
<?php
|
||||
namespace Domain\UploadRequest\Controllers;
|
||||
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\Routing\ResponseFactory;
|
||||
use Domain\UploadRequest\Resources\UploadRequestResource;
|
||||
use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
|
||||
|
||||
class SetUploadRequestAsFilledController
|
||||
{
|
||||
public function __invoke(UploadRequest $uploadRequest): Response|Application|ResponseFactory
|
||||
public function __invoke(UploadRequest $uploadRequest): JsonResponse
|
||||
{
|
||||
$uploadRequest->update([
|
||||
'status' => 'filled',
|
||||
@@ -21,6 +18,9 @@ class SetUploadRequestAsFilledController
|
||||
$uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest));
|
||||
}
|
||||
|
||||
return response(new UploadRequestResource($uploadRequest), 201);
|
||||
return response()->json([
|
||||
'type' => 'success',
|
||||
'message' => 'File request was successfully set as filled',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,35 +1,37 @@
|
||||
<?php
|
||||
namespace Domain\UploadRequest\Controllers;
|
||||
|
||||
use DB;
|
||||
use Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Domain\Files\Resources\FileResource;
|
||||
use Domain\Files\Actions\ProcessFileAction;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Domain\Files\Actions\StoreFileChunksAction;
|
||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
|
||||
|
||||
class UploadFilesForUploadRequestController
|
||||
class UploadFileChunksForUploadRequestController
|
||||
{
|
||||
public function __construct(
|
||||
private ProcessFileAction $processFie,
|
||||
private StoreFileChunksAction $storeFileChunks,
|
||||
public ProcessFileAction $processFie,
|
||||
public StoreFileChunksAction $storeFileChunks,
|
||||
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public function __invoke(\Domain\Files\Requests\UploadRequest $request, UploadRequest $uploadRequest)
|
||||
public function __invoke(UploadChunkRequest $request, UploadRequest $uploadRequest)
|
||||
{
|
||||
// Get upload request root folder query
|
||||
$folder = Folder::where('id', $uploadRequest->id);
|
||||
|
||||
// Create folder if not exist
|
||||
if ($folder->doesntExist()) {
|
||||
$this->createFolder($uploadRequest);
|
||||
($this->createUploadRequestRootFolder)($uploadRequest);
|
||||
}
|
||||
|
||||
// Set default parent_id for uploaded file
|
||||
@@ -41,7 +43,7 @@ class UploadFilesForUploadRequestController
|
||||
$chunkPath = ($this->storeFileChunks)($request);
|
||||
|
||||
// Proceed after last chunk
|
||||
if ($request->boolean('is_last')) {
|
||||
if ($request->boolean('is_last_chunk')) {
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
|
||||
@@ -60,28 +62,4 @@ class UploadFilesForUploadRequestController
|
||||
return response(new FileResource($file), 201);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create root Upload Request folder
|
||||
*/
|
||||
private function createFolder(UploadRequest $uploadRequest): void
|
||||
{
|
||||
// Format timestamp
|
||||
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
|
||||
|
||||
// Create folder
|
||||
DB::table('folders')->insert([
|
||||
'id' => $uploadRequest->id,
|
||||
'parent_id' => $uploadRequest->folder_id ?? null,
|
||||
'user_id' => $uploadRequest->user_id,
|
||||
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
// Update upload request status
|
||||
$uploadRequest->update([
|
||||
'status' => 'filling',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
namespace Domain\UploadRequest\Controllers;
|
||||
|
||||
use Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Domain\Files\Resources\FileResource;
|
||||
use Domain\Files\Actions\ProcessFileAction;
|
||||
use Domain\Files\Requests\UploadFileRequest;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
|
||||
|
||||
class UploadFileForUploadRequestController
|
||||
{
|
||||
public function __construct(
|
||||
public ProcessFileAction $processFie,
|
||||
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
|
||||
) {
|
||||
}
|
||||
|
||||
public function __invoke(
|
||||
UploadFileRequest $request,
|
||||
UploadRequest $uploadRequest
|
||||
): JsonResponse {
|
||||
// Get upload request root folder query
|
||||
$folder = Folder::where('id', $uploadRequest->id);
|
||||
|
||||
// Create folder if it doesn't exist
|
||||
if ($folder->doesntExist()) {
|
||||
($this->createUploadRequestRootFolder)($uploadRequest);
|
||||
}
|
||||
|
||||
// Set default parent_id for uploaded file
|
||||
if (is_null($request->input('parent_id'))) {
|
||||
$request->merge(['parent_id' => $uploadRequest->id]);
|
||||
}
|
||||
|
||||
// Get file name
|
||||
$name = Str::uuid() . '.' . $request->input('extension');
|
||||
|
||||
// Move file to user directory
|
||||
Storage::disk('local')->put("files/{$uploadRequest->user->id}/$name", $request->file('file')->get());
|
||||
|
||||
// Process file
|
||||
$file = ($this->processFie)($request, $uploadRequest->user, $name);
|
||||
|
||||
// Set public access url
|
||||
$file->setUploadRequestPublicUrl($uploadRequest->id);
|
||||
|
||||
// Set timestamp for auto filling
|
||||
cache()->set("auto-filling.$uploadRequest->id", now()->toString());
|
||||
|
||||
return response()->json(new FileResource($file), 201);
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,10 @@ class ProtectUploadRequestRoutes
|
||||
|
||||
// Check if upload request is active
|
||||
if (! in_array($uploadRequest->status, ['active', 'filling'])) {
|
||||
return response('Gone', 410);
|
||||
return response()->json([
|
||||
'type' => 'gone',
|
||||
'message' => 'The file request is not active anymore',
|
||||
], 410);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
|
||||
@@ -3,7 +3,8 @@ namespace Support\Demo\Actions;
|
||||
|
||||
use ByteUnits\Metric;
|
||||
use Illuminate\Support\Str;
|
||||
use Domain\Files\Requests\UploadRequest;
|
||||
use Domain\Files\Requests\UploadFileRequest;
|
||||
use Domain\Files\Requests\UploadChunkRequest;
|
||||
|
||||
class FakeUploadFileAction
|
||||
{
|
||||
@@ -11,7 +12,7 @@ class FakeUploadFileAction
|
||||
* Upload file
|
||||
*/
|
||||
public function __invoke(
|
||||
UploadRequest $request
|
||||
UploadChunkRequest|UploadFileRequest $request
|
||||
): array {
|
||||
$file = $request->file('file');
|
||||
$thumbnail = 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file')));
|
||||
|
||||
@@ -142,11 +142,11 @@ if (! function_exists('get_settings')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('get_settings_in_json')) {
|
||||
if (! function_exists('getAllSettings')) {
|
||||
/**
|
||||
* Get all app settings and return them as json
|
||||
*/
|
||||
function get_settings_in_json()
|
||||
function getAllSettings()
|
||||
{
|
||||
return json_decode(
|
||||
Setting::all()
|
||||
@@ -156,13 +156,13 @@ if (! function_exists('get_settings_in_json')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('get_setup_status')) {
|
||||
if (! function_exists('getInstallationStatus')) {
|
||||
/**
|
||||
* Check if setup wizard was passed
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function get_setup_status()
|
||||
function getInstallationStatus()
|
||||
{
|
||||
$setup_success = get_settings('setup_wizard_success');
|
||||
|
||||
@@ -501,14 +501,14 @@ if (! function_exists('make_single_input')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('format_gigabytes')) {
|
||||
if (! function_exists('toGigabytes')) {
|
||||
/**
|
||||
* Format integer to gigabytes
|
||||
*
|
||||
* @param $gigabytes
|
||||
* @return string
|
||||
*/
|
||||
function format_gigabytes($gigabytes)
|
||||
function toGigabytes($gigabytes)
|
||||
{
|
||||
if ($gigabytes >= 1000) {
|
||||
return Metric::gigabytes($gigabytes)->format('Tb/');
|
||||
@@ -518,14 +518,14 @@ if (! function_exists('format_gigabytes')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('format_megabytes')) {
|
||||
if (! function_exists('toMegabytes')) {
|
||||
/**
|
||||
* Format string to formated megabytes string
|
||||
*
|
||||
* @param $megabytes
|
||||
* @return string
|
||||
*/
|
||||
function format_megabytes($megabytes)
|
||||
function toMegabytes($megabytes)
|
||||
{
|
||||
if ($megabytes >= 1000) {
|
||||
return $megabytes / 1000 . 'GB';
|
||||
@@ -539,14 +539,14 @@ if (! function_exists('format_megabytes')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('format_bytes')) {
|
||||
if (! function_exists('toBytes')) {
|
||||
/**
|
||||
* Convert megabytes to bytes
|
||||
*
|
||||
* @param $megabytes
|
||||
* @return int|string
|
||||
*/
|
||||
function format_bytes($megabytes)
|
||||
function toBytes($megabytes)
|
||||
{
|
||||
return Metric::megabytes($megabytes)->numberOfBytes();
|
||||
}
|
||||
|
||||
@@ -109,26 +109,32 @@ class FixedBillingRestrictionsTest extends TestCase
|
||||
'name' => 'Company Project',
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test2@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test3@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test4@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test5@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'test6@doe.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
@@ -143,6 +149,7 @@ class FixedBillingRestrictionsTest extends TestCase
|
||||
'name' => 'Company Project',
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => $members[0]->email,
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
|
||||
@@ -46,7 +46,7 @@ class PersonalAccessTokenTest extends TestCase
|
||||
$this
|
||||
->actingAs($user)
|
||||
->deleteJson("/api/user/tokens/$token_id")
|
||||
->assertStatus(204);
|
||||
->assertStatus(200);
|
||||
|
||||
$this->assertDatabaseMissing('personal_access_tokens', [
|
||||
'id' => $token_id,
|
||||
|
||||
@@ -309,7 +309,7 @@ class SignFlowTest extends TestCase
|
||||
$user = User::factory()
|
||||
->create(['email' => 'john@doe.com']);
|
||||
|
||||
$this->postJson('/api/password/email', [
|
||||
$this->postJson('/api/password/recover', [
|
||||
'email' => $user->email,
|
||||
])->assertStatus(200);
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ class UserAccountTest extends TestCase
|
||||
'current' => 'secret',
|
||||
'password' => 'VerySecretPassword',
|
||||
'password_confirmation' => 'VerySecretPassword',
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
@@ -101,7 +101,7 @@ class UserAccountTest extends TestCase
|
||||
->patchJson('/api/user/settings', [
|
||||
'name' => 'address',
|
||||
'value' => 'Jantar',
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
$this->assertDatabaseHas('user_settings', [
|
||||
'address' => 'Jantar',
|
||||
@@ -122,9 +122,13 @@ class UserAccountTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->patchJson('/api/user/settings', [
|
||||
->postJson('/api/user/avatar', [
|
||||
'avatar' => $avatar,
|
||||
])->assertStatus(204);
|
||||
])
|
||||
->assertStatus(200)
|
||||
->assertJsonFragment([
|
||||
'message' => 'The avatar was successfully updated.',
|
||||
]);
|
||||
|
||||
collect(config('vuefilemanager.avatar_sizes'))
|
||||
->each(
|
||||
@@ -246,10 +250,10 @@ class UserAccountTest extends TestCase
|
||||
'email_verified_at' => null,
|
||||
]);
|
||||
|
||||
$this->postJson('/api/user/email/verify/resend', [
|
||||
$this->postJson('/api/user/verify', [
|
||||
'email' => $user->email,
|
||||
])
|
||||
->assertStatus(204);
|
||||
->assertStatus(200);
|
||||
|
||||
Notification::assertTimesSent(1, VerifyEmail::class);
|
||||
}
|
||||
|
||||
@@ -278,13 +278,11 @@ class AdminTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
@@ -295,9 +293,9 @@ class AdminTest extends TestCase
|
||||
$avatar = UploadedFile::fake()
|
||||
->image('fake-image.jpg');
|
||||
|
||||
$this->patchJson('/api/user/settings', [
|
||||
$this->postJson('/api/user/avatar', [
|
||||
'avatar' => $avatar,
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
$user = User::whereRole('user')
|
||||
->first();
|
||||
|
||||
@@ -39,13 +39,11 @@ class FileTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => '.jpg',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => '.jpg',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$file = File::first();
|
||||
@@ -80,13 +78,11 @@ class FileTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$disk = Storage::disk('local');
|
||||
@@ -126,13 +122,11 @@ class FileTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'jpeg',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'jpeg',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(401);
|
||||
|
||||
Storage::disk('local')->assertMissing(
|
||||
@@ -159,12 +153,10 @@ class FileTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'file' => $file,
|
||||
'extension' => 'pdf',
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'chunk' => $file,
|
||||
'extension' => 'pdf',
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(422);
|
||||
|
||||
Storage::disk('local')
|
||||
@@ -351,13 +343,11 @@ class FileTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
@@ -405,13 +395,11 @@ class FileTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'jpg',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => '/' . $file->name,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'jpg',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$file = File::first();
|
||||
|
||||
@@ -21,7 +21,7 @@ class FavouriteFolderTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/folders/favourites', [
|
||||
->postJson('/api/favourites', [
|
||||
'ids' => [
|
||||
$folder->id,
|
||||
],
|
||||
@@ -51,7 +51,7 @@ class FavouriteFolderTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->deleteJson("/api/folders/favourites/$folder->id")
|
||||
->deleteJson("/api/favourites/$folder->id")
|
||||
->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseMissing('favourite_folder', [
|
||||
|
||||
@@ -370,13 +370,12 @@ class FolderTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
|
||||
@@ -29,13 +29,12 @@ class FolderUploadTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'path' => '/',
|
||||
'parent_id' => $folder->id,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$file = File::first();
|
||||
@@ -59,24 +58,22 @@ class FolderUploadTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'path' => "/level_1/level_2/level_3/$file->name",
|
||||
'parent_id' => null,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'path' => "/level_1/level_2/level_3/$file->name",
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'path' => "/level_1/level_2/level_3/$file->name",
|
||||
'parent_id' => null,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'path' => "/level_1/level_2/level_3/$file->name",
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$file = File::first();
|
||||
@@ -107,7 +104,6 @@ class FolderUploadTest extends TestCase
|
||||
->create([
|
||||
'name' => 'level_1',
|
||||
'user_id' => $user->id,
|
||||
'parent_id' => null,
|
||||
]);
|
||||
|
||||
$level_2 = Folder::factory()
|
||||
@@ -129,13 +125,12 @@ class FolderUploadTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'path' => "/another_folder/level_2/level_3/$file->name",
|
||||
'parent_id' => null,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'path' => "/another_folder/level_2/level_3/$file->name",
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
// Root folders
|
||||
@@ -166,24 +161,22 @@ class FolderUploadTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $brother->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $brother,
|
||||
'path' => "/Folder/Brother/$brother->name",
|
||||
'parent_id' => null,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $brother->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $brother,
|
||||
'path' => "/Folder/Brother/$brother->name",
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $sister->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $sister,
|
||||
'path' => "/Folder/Sister/$sister->name",
|
||||
'parent_id' => null,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $sister->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $sister,
|
||||
'path' => "/Folder/Sister/$sister->name",
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$brotherFile = File::where('name', 'brother.pdf')->first();
|
||||
|
||||
@@ -42,7 +42,7 @@ class NotificationsTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->getJson('/api/user/notifications')
|
||||
->getJson('/api/notifications')
|
||||
->assertJsonFragment([
|
||||
'category' => 'file-request',
|
||||
])
|
||||
@@ -83,8 +83,8 @@ class NotificationsTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/user/notifications/read')
|
||||
->assertStatus(204);
|
||||
->postJson('/api/notifications/read')
|
||||
->assertStatus(200);
|
||||
|
||||
$this->assertDatabaseHas('notifications', [
|
||||
'read_at' => now(),
|
||||
@@ -125,8 +125,8 @@ class NotificationsTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->deleteJson('/api/user/notifications')
|
||||
->assertStatus(204);
|
||||
->deleteJson('/api/notifications')
|
||||
->assertStatus(200);
|
||||
|
||||
$this->assertDatabaseCount('notifications', 0);
|
||||
}
|
||||
|
||||
@@ -329,25 +329,23 @@ class VisitorManipulatingTest extends TestCase
|
||||
|
||||
$this
|
||||
->withUnencryptedCookies($cookie)
|
||||
->post("/api/editor/upload/$share->token", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->post("/api/editor/upload/chunks/$share->token", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
}
|
||||
|
||||
// Check public shared item
|
||||
if (! $is_protected) {
|
||||
$this->postJson("/api/editor/upload/$share->token", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson("/api/editor/upload/chunks/$share->token", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,13 +31,12 @@ class TeamFileAccessTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
@@ -80,13 +79,12 @@ class TeamFileAccessTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ class TeamManagementTest extends TestCase
|
||||
$this
|
||||
->actingAs($member)
|
||||
->putJson("/api/teams/invitations/{$invitation->id}")
|
||||
->assertNoContent();
|
||||
->assertOk();
|
||||
|
||||
// Get notification
|
||||
$notification = json_decode(DB::table('notifications')->first()->data);
|
||||
@@ -124,7 +124,7 @@ class TeamManagementTest extends TestCase
|
||||
|
||||
$this
|
||||
->putJson("/api/teams/invitations/{$invitation->id}")
|
||||
->assertNoContent();
|
||||
->assertOk();
|
||||
|
||||
$this
|
||||
->assertDatabaseHas('team_folder_invitations', [
|
||||
@@ -228,7 +228,7 @@ class TeamManagementTest extends TestCase
|
||||
$this
|
||||
->actingAs($member)
|
||||
->deleteJson("/api/teams/invitations/{$invitation->id}")
|
||||
->assertNoContent();
|
||||
->assertOk();
|
||||
|
||||
// Get notification
|
||||
$notification = json_decode(DB::table('notifications')->first()->data);
|
||||
@@ -300,11 +300,13 @@ class TeamManagementTest extends TestCase
|
||||
],
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'id' => null,
|
||||
'email' => 'existing@member.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'id' => null,
|
||||
'email' => 'added@member.com',
|
||||
'permission' => 'can-view',
|
||||
@@ -385,6 +387,7 @@ class TeamManagementTest extends TestCase
|
||||
],
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'id' => null,
|
||||
'email' => 'existing@member.com',
|
||||
'permission' => 'can-view',
|
||||
@@ -482,6 +485,7 @@ class TeamManagementTest extends TestCase
|
||||
'members' => [],
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'id' => null,
|
||||
'email' => 'existing@member.com',
|
||||
'permission' => 'can-edit',
|
||||
@@ -654,7 +658,7 @@ class TeamManagementTest extends TestCase
|
||||
$this
|
||||
->actingAs($user)
|
||||
->deleteJson("/api/teams/folders/{$folder->id}")
|
||||
->assertNoContent();
|
||||
->assertOk();
|
||||
|
||||
$this
|
||||
->assertDatabaseCount('team_folder_members', 0)
|
||||
@@ -698,7 +702,7 @@ class TeamManagementTest extends TestCase
|
||||
$this
|
||||
->actingAs($member)
|
||||
->deleteJson("/api/teams/folders/{$folder->id}/leave")
|
||||
->assertNoContent();
|
||||
->assertOk();
|
||||
|
||||
$this
|
||||
->assertDatabaseMissing('team_folder_members', [
|
||||
|
||||
@@ -56,10 +56,12 @@ class TeamsTest extends TestCase
|
||||
'name' => 'Company Project',
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'john@internal.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'jane@external.com',
|
||||
'permission' => 'can-view',
|
||||
],
|
||||
@@ -139,10 +141,12 @@ class TeamsTest extends TestCase
|
||||
->post("/api/teams/folders/{$folder->id}/convert", [
|
||||
'invitations' => [
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'john@internal.com',
|
||||
'permission' => 'can-edit',
|
||||
],
|
||||
[
|
||||
'type' => 'invitation',
|
||||
'email' => 'jane@external.com',
|
||||
'permission' => 'can-view',
|
||||
],
|
||||
@@ -282,13 +286,12 @@ class TeamsTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($member)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseHas('files', [
|
||||
|
||||
@@ -36,12 +36,11 @@ class TrafficTest extends TestCase
|
||||
{
|
||||
$this
|
||||
->actingAs($this->user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $this->file->name,
|
||||
'file' => $this->file,
|
||||
'parent_id' => null,
|
||||
'path' => '/' . $this->file->name,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $this->file->name,
|
||||
'chunk' => $this->file,
|
||||
'is_last_chunk' => 1,
|
||||
'extension' => 'jpg',
|
||||
])->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseHas('traffic', [
|
||||
@@ -57,12 +56,11 @@ class TrafficTest extends TestCase
|
||||
{
|
||||
$this
|
||||
->actingAs($this->user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $this->file->name,
|
||||
'file' => $this->file,
|
||||
'parent_id' => null,
|
||||
'path' => '/' . $this->file->name,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $this->file->name,
|
||||
'chunk' => $this->file,
|
||||
'is_last_chunk' => 1,
|
||||
'extension' => 'jpg',
|
||||
])->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseHas('traffic', [
|
||||
@@ -78,12 +76,11 @@ class TrafficTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($this->user)
|
||||
->postJson('/api/upload', [
|
||||
'name' => $secondFile->name,
|
||||
'file' => $secondFile,
|
||||
'parent_id' => null,
|
||||
'path' => '/' . $secondFile->name,
|
||||
'is_last' => 'true',
|
||||
->postJson('/api/upload/chunks', [
|
||||
'name' => $secondFile->name,
|
||||
'chunk' => $secondFile,
|
||||
'is_last_chunk' => 1,
|
||||
'extension' => 'jpg',
|
||||
])->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseHas('traffic', [
|
||||
@@ -116,12 +113,12 @@ class TrafficTest extends TestCase
|
||||
]);
|
||||
|
||||
// Check public shared item
|
||||
$this->postJson("/api/editor/upload/$share->token", [
|
||||
'name' => $this->file->name,
|
||||
'file' => $this->file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => '/' . $this->file->name,
|
||||
'is_last' => 'true',
|
||||
$this->postJson("/api/editor/upload/chunks/$share->token", [
|
||||
'name' => $this->file->name,
|
||||
'chunk' => $this->file,
|
||||
'parent_id' => $folder->id,
|
||||
'extension' => 'jpg',
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this->assertDatabaseHas('traffic', [
|
||||
|
||||
@@ -74,12 +74,11 @@ class TrashTest extends TestCase
|
||||
$image = UploadedFile::fake()
|
||||
->image('fake-image.jpg');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $image->name,
|
||||
'file' => $image,
|
||||
'parent_id' => null,
|
||||
'path' => '/' . $image->name,
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $image->name,
|
||||
'chunk' => $image,
|
||||
'is_last_chunk' => 1,
|
||||
'extension' => 'jpg',
|
||||
])->assertStatus(201);
|
||||
|
||||
$file = File::first();
|
||||
|
||||
@@ -47,7 +47,7 @@ class UploadRequestBrowsingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->getJson("/api/upload-request/$uploadRequest->id/navigation")
|
||||
->getJson("/api/file-request/$uploadRequest->id/navigation")
|
||||
->assertStatus(200)
|
||||
->assertExactJson([
|
||||
[
|
||||
@@ -115,7 +115,7 @@ class UploadRequestBrowsingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
|
||||
->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
|
||||
->assertStatus(200)
|
||||
->assertJsonFragment([
|
||||
'id' => $root->id,
|
||||
@@ -165,7 +165,7 @@ class UploadRequestBrowsingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
|
||||
->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
|
||||
->assertStatus(200)
|
||||
->assertJsonFragment([
|
||||
'id' => $root->id,
|
||||
|
||||
@@ -34,7 +34,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->patchJson("/api/upload-request/$uploadRequest->id/rename/$folder->id", [
|
||||
->patchJson("/api/file-request/$uploadRequest->id/rename/$folder->id", [
|
||||
'name' => 'Renamed Folder',
|
||||
'type' => 'folder',
|
||||
])
|
||||
@@ -71,7 +71,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->patchJson("/api/upload-request/$uploadRequest->id/rename/$file->id", [
|
||||
->patchJson("/api/file-request/$uploadRequest->id/rename/$file->id", [
|
||||
'name' => 'Renamed File',
|
||||
'type' => 'file',
|
||||
])
|
||||
@@ -102,7 +102,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson("/api/upload-request/$uploadRequest->id/create-folder", [
|
||||
->postJson("/api/file-request/$uploadRequest->id/create-folder", [
|
||||
'name' => 'New Folder',
|
||||
'parent_id' => $uploadRequest->id,
|
||||
])
|
||||
@@ -162,7 +162,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
});
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/remove", [
|
||||
->postJson("/api/file-request/$uploadRequest->id/remove", [
|
||||
'items' => [
|
||||
[
|
||||
'id' => $image->id,
|
||||
@@ -170,7 +170,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
'force_delete' => true,
|
||||
],
|
||||
],
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
// Assert primary file was deleted
|
||||
Storage::assertMissing("files/$user->id/fake-image.jpeg");
|
||||
@@ -209,7 +209,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/remove", [
|
||||
->postJson("/api/file-request/$uploadRequest->id/remove", [
|
||||
'items' => [
|
||||
[
|
||||
'id' => $file->id,
|
||||
@@ -217,7 +217,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
'force_delete' => true,
|
||||
],
|
||||
],
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
// Assert primary file was deleted
|
||||
Storage::assertMissing("files/$user->id/fake-file.pdf");
|
||||
@@ -264,7 +264,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/remove", [
|
||||
->postJson("/api/file-request/$uploadRequest->id/remove", [
|
||||
'items' => [
|
||||
[
|
||||
'id' => $folder->id,
|
||||
@@ -272,7 +272,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
'force_delete' => true,
|
||||
],
|
||||
],
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
$this
|
||||
->assertDatabaseMissing('folders', [
|
||||
@@ -317,7 +317,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
]);
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/move", [
|
||||
->postJson("/api/file-request/$uploadRequest->id/move", [
|
||||
'to_id' => $folder->id,
|
||||
'items' => [
|
||||
[
|
||||
@@ -325,7 +325,7 @@ class UploadRequestEditingTest extends TestCase
|
||||
'id' => $file->id,
|
||||
],
|
||||
],
|
||||
])->assertStatus(204);
|
||||
])->assertStatus(200);
|
||||
|
||||
$this->assertDatabaseHas('files', [
|
||||
'id' => $file->id,
|
||||
|
||||
@@ -6,6 +6,7 @@ use Notification;
|
||||
use Tests\TestCase;
|
||||
use App\Users\Models\User;
|
||||
use Domain\Files\Models\File;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Domain\UploadRequest\Models\UploadRequest;
|
||||
use Support\Scheduler\Actions\ExpireUnfilledUploadRequestAction;
|
||||
@@ -34,17 +35,22 @@ class UploadRequestTest extends TestCase
|
||||
->hasSettings()
|
||||
->create();
|
||||
|
||||
$folder = Folder::factory()
|
||||
->create([
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload-request', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
->postJson('/api/file-request', [
|
||||
'folder_id' => $folder->id,
|
||||
'email' => 'howdy@hi5ve.digital',
|
||||
'notes' => 'Please send me your files...',
|
||||
])
|
||||
->assertCreated();
|
||||
|
||||
$this->assertDatabasehas('upload_requests', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
'folder_id' => $folder->id,
|
||||
'email' => 'howdy@hi5ve.digital',
|
||||
'notes' => 'Please send me your files...',
|
||||
]);
|
||||
@@ -61,16 +67,21 @@ class UploadRequestTest extends TestCase
|
||||
->hasSettings()
|
||||
->create();
|
||||
|
||||
$folder = Folder::factory()
|
||||
->create([
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload-request', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
->postJson('/api/file-request', [
|
||||
'folder_id' => $folder->id,
|
||||
'notes' => 'Please send me your files...',
|
||||
])
|
||||
->assertCreated();
|
||||
|
||||
$this->assertDatabasehas('upload_requests', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
'folder_id' => $folder->id,
|
||||
'notes' => 'Please send me your files...',
|
||||
'email' => null,
|
||||
]);
|
||||
@@ -87,17 +98,22 @@ class UploadRequestTest extends TestCase
|
||||
->hasSettings()
|
||||
->create();
|
||||
|
||||
$folder = Folder::factory()
|
||||
->create([
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
$this
|
||||
->actingAs($user)
|
||||
->postJson('/api/upload-request', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
->postJson('/api/file-request', [
|
||||
'folder_id' => $folder->id,
|
||||
'notes' => 'Please send me your files...',
|
||||
'name' => 'My name',
|
||||
])
|
||||
->assertCreated();
|
||||
|
||||
$this->assertDatabasehas('upload_requests', [
|
||||
'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
|
||||
'folder_id' => $folder->id,
|
||||
'notes' => 'Please send me your files...',
|
||||
'email' => null,
|
||||
'name' => 'My name',
|
||||
@@ -121,7 +137,7 @@ class UploadRequestTest extends TestCase
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
$this->getJson("/api/upload-request/$uploadRequest->id")
|
||||
$this->getJson("/api/file-request/$uploadRequest->id")
|
||||
->assertOk()
|
||||
->assertJsonFragment([
|
||||
'id' => $uploadRequest->id,
|
||||
@@ -149,13 +165,11 @@ class UploadRequestTest extends TestCase
|
||||
->create('fake-file.pdf', 12000000, 'application/pdf');
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/upload", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this
|
||||
@@ -195,13 +209,11 @@ class UploadRequestTest extends TestCase
|
||||
->create('fake-file.pdf', 12000000, 'application/pdf');
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/upload", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
|
||||
$this
|
||||
@@ -240,12 +252,10 @@ class UploadRequestTest extends TestCase
|
||||
->create('fake-file.pdf', 12000000, 'application/pdf');
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/upload", [
|
||||
'name' => $file->name,
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
|
||||
'name' => $file->name,
|
||||
'file' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(410);
|
||||
}
|
||||
|
||||
@@ -265,12 +275,8 @@ class UploadRequestTest extends TestCase
|
||||
]);
|
||||
|
||||
$this
|
||||
->deleteJson("/api/upload-request/$uploadRequest->id")
|
||||
->assertStatus(201)
|
||||
->assertJsonFragment([
|
||||
'id' => $uploadRequest->id,
|
||||
'status' => 'filled',
|
||||
]);
|
||||
->deleteJson("/api/file-request/$uploadRequest->id")
|
||||
->assertStatus(200);
|
||||
|
||||
Notification::assertSentTo($user, UploadRequestFulfilledNotification::class);
|
||||
}
|
||||
@@ -313,13 +319,11 @@ class UploadRequestTest extends TestCase
|
||||
->create('fake-file.pdf', 12000000, 'application/pdf');
|
||||
|
||||
$this
|
||||
->postJson("/api/upload-request/$uploadRequest->id/upload", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertCreated();
|
||||
|
||||
$this->travel(3)->hours();
|
||||
|
||||
@@ -31,13 +31,12 @@ class UserZippingTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-inner-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
@@ -46,13 +45,11 @@ class UserZippingTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => null,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
@@ -88,13 +85,12 @@ class UserZippingTest extends TestCase
|
||||
$file = UploadedFile::fake()
|
||||
->create("fake-file-$index.pdf", 1200, 'application/pdf');
|
||||
|
||||
$this->postJson('/api/upload', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'file' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'path' => "/$file->name",
|
||||
'is_last' => 'true',
|
||||
$this->postJson('/api/upload/chunks', [
|
||||
'name' => $file->name,
|
||||
'extension' => 'pdf',
|
||||
'chunk' => $file,
|
||||
'parent_id' => $folder->id,
|
||||
'is_last_chunk' => 1,
|
||||
])->assertStatus(201);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user