Skip to content

Commit 59a8cc5

Browse files
committed
removed Requests.go
1 parent 22a82de commit 59a8cc5

6 files changed

Lines changed: 16 additions & 101 deletions

File tree

handlers/FileAttrHandler.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/DataManager-Go/DataManagerServer/handlers/web"
77
"github.com/DataManager-Go/DataManagerServer/models"
8+
libdm "github.com/DataManager-Go/libdatamanager"
89
"github.com/JojiiOfficial/gaw"
910
"github.com/gorilla/mux"
1011
"gorm.io/gorm"
@@ -29,7 +30,7 @@ func AttributeHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
2930
}
3031

3132
// Read request body
32-
var request models.UpdateAttributeRequest
33+
var request libdm.UpdateAttributeRequest
3334
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
3435
return nil
3536
}

handlers/FileHandler.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
//UploadfileHandler handler for uploading files
2525
func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
26-
var request models.UploadRequest
26+
var request libdm.UploadRequestStruct
2727

2828
// Get data from header
2929
requestData := r.Header.Get(models.HeaderRequest)
@@ -50,14 +50,14 @@ func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *ht
5050

5151
// Validating request, for desired upload Type
5252
switch request.UploadType {
53-
case models.FileUploadType:
53+
case libdm.FileUploadType:
5454
{
5555
// Check if user is allowed to upload files
5656
if !handlerData.User.CanUploadFiles() {
5757
return RErrNotAllowed.Append("to upload files")
5858
}
5959
}
60-
case models.URLUploadType:
60+
case libdm.URLUploadType:
6161
{
6262
// Check if user is allowed to upload URLs
6363
if !handlerData.User.AllowedToUploadURLs() {
@@ -167,7 +167,7 @@ func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *ht
167167

168168
// Read from the desired source (file/url)
169169
switch request.UploadType {
170-
case models.FileUploadType:
170+
case libdm.FileUploadType:
171171
{
172172
// Read requestd file
173173
size, checksum, err := readMultipartToFile(f, r.Body, w)
@@ -194,7 +194,7 @@ func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *ht
194194
file.FileSize = size
195195
file.Checksum = checksum
196196
}
197-
case models.URLUploadType:
197+
case libdm.URLUploadType:
198198
{
199199
// Read from HTTP request
200200
status, err := downloadHTTP(handlerData.User, request.URL, f, file)
@@ -243,7 +243,7 @@ func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *ht
243243

244244
// ListFilesHandler handler for listing files
245245
func ListFilesHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
246-
var request models.FileListRequest
246+
var request libdm.FileListRequest
247247
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
248248
return nil
249249
}
@@ -340,7 +340,7 @@ func ListFilesHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
340340

341341
// FileHandler handler for updating files
342342
func FileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
343-
var request models.FileRequest
343+
var request libdm.FileRequest
344344
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
345345
return nil
346346
}

handlers/NamespaceHandler.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/DataManager-Go/DataManagerServer/handlers/web"
88
"github.com/DataManager-Go/DataManagerServer/models"
9+
libdm "github.com/DataManager-Go/libdatamanager"
910
"github.com/JojiiOfficial/gaw"
1011
"github.com/gorilla/mux"
1112
)
@@ -20,7 +21,7 @@ func NamespaceActionHandler(handlerData web.HandlerData, w http.ResponseWriter,
2021
return RErrBadRequest
2122
}
2223

23-
var request models.NamespaceRequest
24+
var request libdm.NamespaceRequest
2425
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
2526
return nil
2627
}

handlers/PingHandler.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55

66
"github.com/DataManager-Go/DataManagerServer/handlers/web"
77
"github.com/DataManager-Go/DataManagerServer/models"
8+
libdm "github.com/DataManager-Go/libdatamanager"
89
)
910

1011
// Ping handles ping request
1112
func Ping(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
12-
var request models.PingRequest
13+
var request libdm.PingRequest
1314
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
1415
return nil
1516
}

handlers/UserHandler.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import (
55

66
"github.com/DataManager-Go/DataManagerServer/handlers/web"
77
"github.com/DataManager-Go/DataManagerServer/models"
8+
libdm "github.com/DataManager-Go/libdatamanager"
89

910
"github.com/JojiiOfficial/gaw"
1011
)
1112

1213
// Login login handler
1314
func Login(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
14-
var request models.CredentialsRequest
15+
var request libdm.CredentialsRequest
1516

1617
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
1718
return nil
@@ -50,7 +51,7 @@ func Register(handlerData web.HandlerData, w http.ResponseWriter, r *http.Reques
5051
return nil
5152
}
5253

53-
var request models.CredentialsRequest
54+
var request libdm.CredentialsRequest
5455

5556
if !readRequestLimited(w, r, &request, handlerData.Config.Webserver.MaxRequestBodyLength) {
5657
return nil

models/Requests.go

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)