Skip to content

Commit

Permalink
satellite/console: add partner upgrade notice to user settings
Browse files Browse the repository at this point in the history
Added notice flag for a banner that will prompt eligible users to
upgrade their account.

Issue: storj/storj-private#559

Change-Id: Ibc2b0bbd59d48de15be5647dc87e4e1826d2f0e9
  • Loading branch information
wilfred-asomanii committed Jan 26, 2024
1 parent 9d9699b commit 179d156
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions satellite/console/consoleweb/endpoints_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ func TestAuth(t *testing.T) {
noticeDismissal := console.NoticeDismissal{
FileGuide: false,
ServerSideEncryption: false,
PartnerUpgradeBanner: false,
}

testGetSettings(expectedSettings{
Expand All @@ -155,6 +156,7 @@ func TestAuth(t *testing.T) {
duration := time.Duration(15) * time.Minute
noticeDismissal.FileGuide = true
noticeDismissal.ServerSideEncryption = true
noticeDismissal.PartnerUpgradeBanner = true
resp, _ := test.request(http.MethodPatch, "/auth/account/settings",
test.toJSON(map[string]interface{}{
"sessionDuration": duration,
Expand All @@ -165,6 +167,7 @@ func TestAuth(t *testing.T) {
"noticeDismissal": map[string]bool{
"fileGuide": noticeDismissal.FileGuide,
"serverSideEncryption": noticeDismissal.ServerSideEncryption,
"partnerUpgradeBanner": noticeDismissal.PartnerUpgradeBanner,
},
}))

Expand Down
2 changes: 2 additions & 0 deletions satellite/console/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,7 @@ func TestUserSettings(t *testing.T) {
noticeDismissal := console.NoticeDismissal{
FileGuide: false,
ServerSideEncryption: false,
PartnerUpgradeBanner: false,
}
require.Equal(t, noticeDismissal, settings.NoticeDismissal)

Expand Down Expand Up @@ -1412,6 +1413,7 @@ func TestUserSettings(t *testing.T) {
sessionDurPtr := &sessionDur
noticeDismissal.ServerSideEncryption = true
noticeDismissal.FileGuide = true
noticeDismissal.PartnerUpgradeBanner = true
settings, err = srv.SetUserSettings(userCtx, console.UpsertUserSettingsRequest{
SessionDuration: &sessionDurPtr,
OnboardingStart: &onboardingBool,
Expand Down
1 change: 1 addition & 0 deletions satellite/console/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ type UpsertUserSettingsRequest struct {
type NoticeDismissal struct {
FileGuide bool `json:"fileGuide"`
ServerSideEncryption bool `json:"serverSideEncryption"`
PartnerUpgradeBanner bool `json:"partnerUpgradeBanner"`
}

// SetUpAccountRequest holds data for completing account setup.
Expand Down
2 changes: 2 additions & 0 deletions satellite/satellitedb/users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ func TestUserSettings(t *testing.T) {
noticeDismissal := console.NoticeDismissal{
FileGuide: false,
ServerSideEncryption: false,
PartnerUpgradeBanner: false,
}

require.NoError(t, users.UpsertSettings(ctx, id, console.UpsertUserSettingsRequest{}))
Expand All @@ -479,6 +480,7 @@ func TestUserSettings(t *testing.T) {

noticeDismissal.FileGuide = true
noticeDismissal.ServerSideEncryption = true
noticeDismissal.PartnerUpgradeBanner = true
require.NoError(t, users.UpsertSettings(ctx, id, console.UpsertUserSettingsRequest{
NoticeDismissal: &noticeDismissal,
}))
Expand Down

0 comments on commit 179d156

Please sign in to comment.