clear up

2403905 · Jan 23, 2024 · bfb4df7 · bfb4df7
1 parent 4c4dcd4
commit bfb4df7
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/pkg/publicshare/manager/json/json.go b/pkg/publicshare/manager/json/json.go
@@ -450,7 +450,7 @@ func (m *manager) GetPublicShare(ctx context.Context, u *user.User, ref *link.Pu
 
 		if ref.GetId().GetOpaqueId() == ps.Id.OpaqueId {
 			if publicshare.IsExpired(ps) {
-				if err := m.revokeExpiredPublicShare(ctx, &ps, u); err != nil {
+				if err := m.revokeExpiredPublicShare(ctx, &ps); err != nil {
 					return nil, err
 				}
 				return nil, errtypes.NotFound("no shares found by id:" + ref.GetId().String())
@@ -494,7 +494,7 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []
 		}
 
 		if publicshare.IsExpired(local.PublicShare) {
-			if err := m.revokeExpiredPublicShare(ctx, &local.PublicShare, u); err != nil {
+			if err := m.revokeExpiredPublicShare(ctx, &local.PublicShare); err != nil {
 				log.Error().Err(err).
 					Str("share_token", local.Token).
 					Msg("failed to revoke expired public share")
@@ -564,18 +564,18 @@ func (m *manager) cleanupExpiredShares() {
 		_ = utils.UnmarshalJSONToProtoV1([]byte(d.(string)), &ps)
 
 		if publicshare.IsExpired(ps) {
-			_ = m.revokeExpiredPublicShare(context.Background(), &ps, nil)
+			_ = m.revokeExpiredPublicShare(context.Background(), &ps)
 		}
 	}
 }
 
 // revokeExpiredPublicShare doesn't have a lock inside, ensure a lock before call
-func (m *manager) revokeExpiredPublicShare(ctx context.Context, s *link.PublicShare, u *user.User) error {
+func (m *manager) revokeExpiredPublicShare(ctx context.Context, s *link.PublicShare) error {
 	if !m.enableExpiredSharesCleanup {
 		return nil
 	}
 
-	err := m.revokePublicShare(ctx, u, &link.PublicShareReference{
+	err := m.revokePublicShare(ctx, &link.PublicShareReference{
 		Spec: &link.PublicShareReference_Id{
 			Id: &link.PublicShareId{
 				OpaqueId: s.Id.OpaqueId,
@@ -591,14 +591,14 @@ func (m *manager) revokeExpiredPublicShare(ctx context.Context, s *link.PublicSh
 }
 
 // RevokePublicShare undocumented.
-func (m *manager) RevokePublicShare(ctx context.Context, u *user.User, ref *link.PublicShareReference) error {
+func (m *manager) RevokePublicShare(ctx context.Context, _ *user.User, ref *link.PublicShareReference) error {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
-	return m.revokePublicShare(ctx, u, ref)
+	return m.revokePublicShare(ctx, ref)
 }
 
 // revokePublicShare doesn't have a lock inside, ensure a lock before call
-func (m *manager) revokePublicShare(ctx context.Context, u *user.User, ref *link.PublicShareReference) error {
+func (m *manager) revokePublicShare(ctx context.Context, ref *link.PublicShareReference) error {
 	db, err := m.persistence.Read(ctx)
 	if err != nil {
 		return err
@@ -665,8 +665,7 @@ func (m *manager) GetPublicShareByToken(ctx context.Context, token string, auth
 
 		if local.Token == token {
 			if publicshare.IsExpired(local) {
-				// TODO user is not needed at all in this API.
-				if err := m.revokeExpiredPublicShare(ctx, &local, nil); err != nil {
+				if err := m.revokeExpiredPublicShare(ctx, &local); err != nil {
 					return nil, err
 				}
 				break