Change: Update Database auth to user method
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
)
|
||||
|
||||
type WalkRequest struct {
|
||||
Token string `json:"token"`
|
||||
Root string `json:"root"`
|
||||
Pattern []string `json:"pattern"`
|
||||
}
|
||||
@@ -24,7 +23,7 @@ func (api *API) HandleReset(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// check token
|
||||
err = api.CheckToken(w, r, resetRequest.Token)
|
||||
err = api.CheckAdmin(w, r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
@@ -53,7 +52,7 @@ func (api *API) HandleWalk(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// check token match
|
||||
err = api.CheckToken(w, r, walkRequest.Token)
|
||||
err = api.CheckAdmin(w, r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -4,6 +4,12 @@ import (
|
||||
"encoding/json"
|
||||
"log"
|
||||
"net/http"
|
||||
"errors"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrNotLoggedIn = errors.New("not logged in")
|
||||
ErrNotAdmin = errors.New("not admin")
|
||||
)
|
||||
|
||||
type Error struct {
|
||||
|
||||
@@ -143,3 +143,26 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error {
|
||||
session, _ := api.store.Get(r, api.defaultSessionName)
|
||||
userId, ok := session.Values["userId"]
|
||||
if !ok {
|
||||
api.HandleError(w, r, ErrNotLoggedIn)
|
||||
return ErrNotLoggedIn
|
||||
}
|
||||
|
||||
user, err := api.Db.GetUserById(userId.(int64))
|
||||
if err != nil {
|
||||
api.HandleError(w, r, err)
|
||||
return err
|
||||
}
|
||||
|
||||
if user.Role != database.RoleAdmin {
|
||||
api.HandleError(w, r, ErrNotAdmin)
|
||||
return ErrNotAdmin
|
||||
}
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -28,6 +28,12 @@ type User struct {
|
||||
AvatarId int64 `json:"avatar_id"`
|
||||
}
|
||||
|
||||
var (
|
||||
RoleAnonymous = int64(0)
|
||||
RoleAdmin = int64(1)
|
||||
RoleUser = int64(2)
|
||||
)
|
||||
|
||||
func (f *File) Path() (string, error) {
|
||||
folder, err := f.Db.GetFolder(f.Folder_id)
|
||||
if err != nil {
|
||||
|
||||
@@ -4,19 +4,27 @@ import { useNavigate } from "react-router";
|
||||
function Manage(props) {
|
||||
let navigate = useNavigate();
|
||||
|
||||
const [token, setToken] = useState("");
|
||||
const [walkPath, setWalkPath] = useState("");
|
||||
const [patternString, setPatternString] = useState("");
|
||||
|
||||
function updateDatabase() {
|
||||
// split pattern string into array
|
||||
let patternArray = patternString.split(" ");
|
||||
// remove whitespace from array
|
||||
patternArray = patternArray.map((item) => item.trim());
|
||||
// remove empty strings from array
|
||||
patternArray = patternArray.filter((item) => item !== "");
|
||||
// add dot before item array
|
||||
patternArray = patternArray.map((item) => "." + item);
|
||||
|
||||
fetch("/api/v1/walk", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
token: token,
|
||||
root: walkPath,
|
||||
pattern: [".wav", ".mp3"],
|
||||
pattern: patternArray
|
||||
}),
|
||||
})
|
||||
.then((res) => res.json())
|
||||
@@ -56,18 +64,19 @@ function Manage(props) {
|
||||
</button>
|
||||
)}
|
||||
<hr />
|
||||
<input
|
||||
type="text"
|
||||
value={token}
|
||||
placeholder="token"
|
||||
onChange={(e) => setToken(e.target.value)}
|
||||
/>
|
||||
<h3>Update Database</h3>
|
||||
<input
|
||||
type="text"
|
||||
value={walkPath}
|
||||
placeholder="walk path"
|
||||
onChange={(e) => setWalkPath(e.target.value)}
|
||||
/>
|
||||
<input
|
||||
type="text"
|
||||
value={patternString}
|
||||
placeholder="pattern wav flac mp3"
|
||||
onChange={(e) => setPatternString(e.target.value)}
|
||||
/>
|
||||
<button
|
||||
onClick={() => {
|
||||
updateDatabase();
|
||||
|
||||
Reference in New Issue
Block a user