Skip to content

Commit 9969421

Browse files
committed
share: fixed another possible panic in GetShare
1 parent 165a578 commit 9969421

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

share/sql/sql.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,10 @@ func (m *mgr) GetShare(ctx context.Context, ref *collaboration.ShareReference) (
236236
err = errtypes.NotFound(ref.String())
237237
}
238238

239-
// resolve grantee's user type
240-
s.Grantee.GetUserId().Type, _ = m.getUserType(ctx, s.Grantee.GetUserId().OpaqueId)
239+
// resolve grantee's user type if applicable
240+
if s.Grantee.Type == provider.GranteeType_GRANTEE_TYPE_USER {
241+
s.Grantee.GetUserId().Type, _ = m.getUserType(ctx, s.Grantee.GetUserId().OpaqueId)
242+
}
241243

242244
path, err := m.getPath(ctx, s.ResourceId)
243245
if err != nil {
@@ -602,8 +604,10 @@ func (m *mgr) GetReceivedShare(ctx context.Context, ref *collaboration.ShareRefe
602604
return nil, err
603605
}
604606

605-
// resolve grantee's user type
606-
s.Share.Grantee.GetUserId().Type, _ = m.getUserType(ctx, s.Share.Grantee.GetUserId().OpaqueId)
607+
// resolve grantee's user type if applicable
608+
if s.Share.Grantee.Type == provider.GranteeType_GRANTEE_TYPE_USER {
609+
s.Share.Grantee.GetUserId().Type, _ = m.getUserType(ctx, s.Share.Grantee.GetUserId().OpaqueId)
610+
}
607611

608612
return s, nil
609613
}

0 commit comments

Comments
 (0)