Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5fa0772c6 | ||
|
|
ba5c67d9da | ||
|
|
f3d007025e | ||
|
|
e7a39808dd | ||
|
|
2b7aa7a0c9 | ||
|
|
4d8f0c532b | ||
|
|
367e251a0e | ||
|
|
cc6f2f8bec | ||
|
|
007fde8186 | ||
|
|
552f8168ea | ||
|
|
42426e3e69 |
@@ -5,7 +5,6 @@ install: skip
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- docker-ce
|
||||
- pass
|
||||
env:
|
||||
global:
|
||||
|
||||
@@ -70,6 +70,10 @@ list or set it to 0.`,
|
||||
checkErr(usernameConflictError(user.Username, conflictuous.ID, user.ID))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// If it doesn't exist, set the ID to 0 to automatically get a new
|
||||
// one that make sense in this DB.
|
||||
user.ID = 0
|
||||
}
|
||||
|
||||
err = d.store.Users.Save(user)
|
||||
|
||||
+1
-1
Submodule frontend updated: 2ed87febcb...e370fbe500
+1
-1
@@ -30,7 +30,7 @@ type authToken struct {
|
||||
type extractor []string
|
||||
|
||||
func (e extractor) ExtractToken(r *http.Request) (string, error) {
|
||||
token, _ := request.AuthorizationHeaderExtractor.ExtractToken(r)
|
||||
token, _ := request.HeaderExtractor{"X-Auth"}.ExtractToken(r)
|
||||
|
||||
// Checks if the token isn't empty and if it contains two dots.
|
||||
// The former prevents incompatibility with URLs that previously
|
||||
|
||||
@@ -55,7 +55,6 @@ func convertUsersToNew(old []*oldUser) ([]*users.User, error) {
|
||||
|
||||
for _, oldUser := range old {
|
||||
user := &users.User{
|
||||
ID: uint(oldUser.ID),
|
||||
Username: oldUser.Username,
|
||||
Password: oldUser.Password,
|
||||
Scope: oldUser.Scope,
|
||||
|
||||
+3
-3
@@ -89,11 +89,11 @@ func (s *Storage) Save(user *User) error {
|
||||
// id must be a string for username lookup or a uint for id lookup. If id
|
||||
// is neither, a ErrInvalidDataType will be returned.
|
||||
func (s *Storage) Delete(id interface{}) (err error) {
|
||||
switch id.(type) {
|
||||
switch id := id.(type) {
|
||||
case string:
|
||||
err = s.back.DeleteByUsername(id.(string))
|
||||
err = s.back.DeleteByUsername(id)
|
||||
case uint:
|
||||
err = s.back.DeleteByID(id.(uint))
|
||||
err = s.back.DeleteByID(id)
|
||||
default:
|
||||
err = errors.ErrInvalidDataType
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@ package version
|
||||
|
||||
const (
|
||||
// Version is the current File Browser version.
|
||||
Version = "v2.0.0"
|
||||
Version = "v2.0.2"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user