Fixes
This commit is contained in:
@@ -10,7 +10,7 @@ import (
|
|||||||
"github.com/go-chi/chi/middleware"
|
"github.com/go-chi/chi/middleware"
|
||||||
"github.com/go-chi/render"
|
"github.com/go-chi/render"
|
||||||
|
|
||||||
cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
"github.com/owncloud/ocis/proxy/pkg/cs3"
|
||||||
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
|
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
|
||||||
"github.com/owncloud/ocis/ocis-pkg/account"
|
"github.com/owncloud/ocis/ocis-pkg/account"
|
||||||
"github.com/owncloud/ocis/ocis-pkg/log"
|
"github.com/owncloud/ocis/ocis-pkg/log"
|
||||||
|
|||||||
@@ -189,7 +189,6 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var account *accounts.Account
|
var account *accounts.Account
|
||||||
var err error
|
|
||||||
|
|
||||||
switch o.config.AccountBackend {
|
switch o.config.AccountBackend {
|
||||||
case "accounts":
|
case "accounts":
|
||||||
@@ -611,9 +610,9 @@ func (o Ocs) fetchAccountFromCS3BackendByUsername(ctx context.Context, name stri
|
|||||||
OnPremisesSamAccountName: u.Username,
|
OnPremisesSamAccountName: u.Username,
|
||||||
DisplayName: u.DisplayName,
|
DisplayName: u.DisplayName,
|
||||||
Mail: u.Mail,
|
Mail: u.Mail,
|
||||||
UIDNumber: uid,
|
UidNumber: uid,
|
||||||
GIDNumber: gid,
|
GidNumber: gid,
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) (*accounts.Account, error) {
|
func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) (*accounts.Account, error) {
|
||||||
@@ -627,9 +626,9 @@ func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId)
|
|||||||
OnPremisesSamAccountName: u.Username,
|
OnPremisesSamAccountName: u.Username,
|
||||||
DisplayName: u.DisplayName,
|
DisplayName: u.DisplayName,
|
||||||
Mail: u.Mail,
|
Mail: u.Mail,
|
||||||
UIDNumber: uid,
|
UidNumber: uid,
|
||||||
GIDNumber: gid,
|
GidNumber: gid,
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) {
|
func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) {
|
||||||
|
|||||||
Reference in New Issue
Block a user