Check if roles are present in user object before looking those up
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
Bugfix: Check if roles are present in user object before looking those up
|
||||||
|
|
||||||
|
https://github.com/owncloud/ocis/pull/1388
|
||||||
@@ -67,7 +67,11 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler
|
|||||||
ctx = context.WithValue(ctx, UUIDKey, u.Id.OpaqueId)
|
ctx = context.WithValue(ctx, UUIDKey, u.Id.OpaqueId)
|
||||||
// TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header.
|
// TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header.
|
||||||
ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId)
|
ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId)
|
||||||
ctx = metadata.Set(ctx, RoleIDs, string(u.Opaque.Map["roles"].Value))
|
if u.Opaque != nil {
|
||||||
|
if roles, ok := u.Opaque.Map["roles"]; ok {
|
||||||
|
ctx = metadata.Set(ctx, RoleIDs, string(roles.Value))
|
||||||
|
}
|
||||||
|
}
|
||||||
next.ServeHTTP(w, r.WithContext(ctx))
|
next.ServeHTTP(w, r.WithContext(ctx))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user