Browse Source

Add empty provider check

HEAD
Yang Luo 2 years ago
parent
commit
da3193673c
4 changed files with 19 additions and 3 deletions
  1. +16
    -0
      storage/storage.go
  2. +1
    -1
      web/src/FileTreePage.js
  3. +1
    -1
      web/src/HomePage.js
  4. +1
    -1
      web/src/StoreEditPage.js

+ 16
- 0
storage/storage.go View File

@@ -32,6 +32,10 @@ type Object struct {
} }


func ListObjects(provider string, prefix string) ([]*Object, error) { func ListObjects(provider string, prefix string) ([]*Object, error) {
if provider == "" {
return nil, fmt.Errorf("storage provider is empty")
}

resources, err := casdoor.ListResources(provider, prefix) resources, err := casdoor.ListResources(provider, prefix)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -50,6 +54,10 @@ func ListObjects(provider string, prefix string) ([]*Object, error) {
} }


func GetObject(provider string, key string) (io.ReadCloser, error) { func GetObject(provider string, key string) (io.ReadCloser, error) {
if provider == "" {
return nil, fmt.Errorf("storage provider is empty")
}

res, err := casdoor.GetResource(provider, key) res, err := casdoor.GetResource(provider, key)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -64,6 +72,10 @@ func GetObject(provider string, key string) (io.ReadCloser, error) {
} }


func PutObject(provider string, user string, parent string, key string, fileBuffer *bytes.Buffer) error { func PutObject(provider string, user string, parent string, key string, fileBuffer *bytes.Buffer) error {
if provider == "" {
return fmt.Errorf("storage provider is empty")
}

_, _, err := casdoorsdk.UploadResource(user, "Casibase", parent, fmt.Sprintf("Direct/%s/%s", provider, key), fileBuffer.Bytes()) _, _, err := casdoorsdk.UploadResource(user, "Casibase", parent, fmt.Sprintf("Direct/%s/%s", provider, key), fileBuffer.Bytes())
if err != nil { if err != nil {
return err return err
@@ -72,6 +84,10 @@ func PutObject(provider string, user string, parent string, key string, fileBuff
} }


func DeleteObject(provider string, key string) error { func DeleteObject(provider string, key string) error {
if provider == "" {
return fmt.Errorf("storage provider is empty")
}

_, err := casdoorsdk.DeleteResource(fmt.Sprintf("Direct/%s/%s", provider, key)) _, err := casdoorsdk.DeleteResource(fmt.Sprintf("Direct/%s/%s", provider, key))
if err != nil { if err != nil {
return err return err


+ 1
- 1
web/src/FileTreePage.js View File

@@ -38,7 +38,7 @@ class FileTreePage extends React.Component {
StoreBackend.getStore(this.state.owner, this.state.storeName) StoreBackend.getStore(this.state.owner, this.state.storeName)
.then((res) => { .then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
if (res.data2 !== null && res.data?.includes("error")) {
if (typeof res.data2 === "string" && res.data2 !== "") {
res.data.error = res.data2; res.data.error = res.data2;
} }


+ 1
- 1
web/src/HomePage.js View File

@@ -35,7 +35,7 @@ class HomePage extends React.Component {
StoreBackend.getStore("admin", "_casibase_default_store_") StoreBackend.getStore("admin", "_casibase_default_store_")
.then((res) => { .then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
if (res.data2 !== null && res.data2.includes("error")) {
if (typeof res.data2 === "string" && res.data2 !== "") {
res.data.error = res.data2; res.data.error = res.data2;
} }


+ 1
- 1
web/src/StoreEditPage.js View File

@@ -38,7 +38,7 @@ class StoreEditPage extends React.Component {
StoreBackend.getStore(this.state.owner, this.state.storeName) StoreBackend.getStore(this.state.owner, this.state.storeName)
.then((res) => { .then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
if (res.data2 !== null && res.data2.includes("error")) {
if (typeof res.data2 === "string" && res.data2 !== "") {
res.data.error = res.data2; res.data.error = res.data2;
} }


Loading…
Cancel
Save