Skip to content

Commit fcaabfe

Browse files
authored
Merge pull request #375 from urnetwork/bugfix-delete-account-stripe-subscription
cancel stripe subscription on network delete
2 parents feca14d + 2a72769 commit fcaabfe

5 files changed

Lines changed: 945 additions & 739 deletions

File tree

controller/network_controller.go

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
// "time"
55
"fmt"
66

7+
"github.com/urnetwork/glog"
78
"github.com/urnetwork/server"
89
"github.com/urnetwork/server/jwt"
910
"github.com/urnetwork/server/model"
@@ -192,21 +193,39 @@ func UpgradeFromGuestExisting(
192193

193194
}
194195

195-
type NetworkRemoveResult struct{}
196+
type NetworkRemoveResultError struct {
197+
Message string `json:"message"`
198+
}
199+
200+
type NetworkRemoveResult struct {
201+
Error *NetworkRemoveResultError `json:"error,omitempty"`
202+
}
196203

197204
func NetworkRemove(session *session.ClientSession) (*NetworkRemoveResult, error) {
198205
success, userAuths := model.RemoveNetwork(
199206
session.Ctx,
200207
session.ByJwt.NetworkId,
201208
&session.ByJwt.UserId,
202209
)
210+
203211
if success {
204212
server.Tx(session.Ctx, func(tx server.PgTx) {
205213
for userAuth, _ := range userAuths {
206214
ScheduleRemoveProductUpdates(session, userAuth, tx)
207215
}
208216
})
209217

218+
// ensure we wrap up any Stripe subscriptions for the network
219+
err := UnsubscribeStripe(session)
220+
if err != nil {
221+
glog.Errorf("Failed to unsubscribe Stripe: %v", err)
222+
return &NetworkRemoveResult{
223+
Error: &NetworkRemoveResultError{
224+
Message: "Failed to unsubscribe Stripe",
225+
},
226+
}, nil
227+
}
228+
210229
return &NetworkRemoveResult{}, nil
211230
}
212231

0 commit comments

Comments
 (0)