Merge branch 'master' into erwinpalma-patch-1

CHANGELOG.md

@@ -6,11 +6,16 @@ The following sections list the changes for unreleased.
 
 ## Summary
 
+* Bugfix - Check if roles are present in user object before looking those up: [#1388](https://github.com/owncloud/ocis/pull/1388)
 * Change - Move runtime code on refs/pman over to owncloud/ocis/ocis: [#1483](https://github.com/owncloud/ocis/pull/1483)
 * Enhancement - Update reva to v1.5.2-0.20210125114636-0c10b333ee69: [#1482](https://github.com/owncloud/ocis/pull/1482)
 
 ## Details
 
+* Bugfix - Check if roles are present in user object before looking those up: [#1388](https://github.com/owncloud/ocis/pull/1388)
+
+   https://github.com/owncloud/ocis/pull/1388
+
 * Change - Move runtime code on refs/pman over to owncloud/ocis/ocis: [#1483](https://github.com/owncloud/ocis/pull/1483)
 
    Tags: ocis, runtime

changelog/unreleased/account-roles-fix.md

@@ -0,0 +1,3 @@
+Bugfix: Check if roles are present in user object before looking those up
+
+https://github.com/owncloud/ocis/pull/1388

ocis-pkg/middleware/account.go

@@ -67,7 +67,11 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler
 			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.
 			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))
 		})
 	}