Files
zitadel/internal/command/command_test.go
2a2d5392a3 fix: correctly send links to login v2 in email notifications (#10711)
# Which Problems Are Solved

There were still some emails (passkey registration and domain claimed)
sent with links pointing to login v1 even when the login v2 was enabled
for the instance.
Also while looking into the issue, it was discovered that some links
pointing to login V2 were not correctly generated.


# How the Problems Are Solved

- Added default paths for passkey registration and domain claimed
notifications
- Fixed the existing paths to properly handle concatenation (resp. use
`url.ResolveReference`)
  - Change their go types (from string) to `*url.URL` 
  - Added a mapstructure hook for string to url
- Removed unnecessary `InstanceSetupFeatures` and corresponding
conversions
- Refactored the methods on the `login.DefaultPaths` struct and added an
interface to the `Commands` to only need to pass a single config (and
not every method)
- Added an `OriginURL` method to the `DomainCtx` to prevent going from
url to string and back
- Added the use of the templates in case of enabled login v2 for passkey
registration and domain claimed)

# Additional Changes

None

# Additional Context

closes #10643

---------

Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Livio Spring <livio@zitadel.com>
Co-authored-by: Max Peintner <peintnerm@gmail.com>
Co-authored-by: Gayathri Vijayan <66356931+grvijayan@users.noreply.github.com>
2026-02-13 13:06:56 +00:00

184 lines
5.1 KiB
Go

package command
import (
"context"
"io"
"os"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/i18n"
"github.com/zitadel/zitadel/internal/repository/user"
)
var (
SupportedLanguages = []language.Tag{language.English, language.German}
OnlyAllowedLanguages = []language.Tag{language.English}
AllowedLanguage = language.English
DisallowedLanguage = language.German
UnsupportedLanguage = language.Spanish
)
func TestMain(m *testing.M) {
i18n.SupportLanguages(SupportedLanguages...)
os.Exit(m.Run())
}
func TestCommands_asyncPush(t *testing.T) {
// make sure the test terminates on deadlock
background := context.Background()
agg := user.NewAggregate("userID", "orgID")
cmd := user.NewMachineSecretHashUpdatedEvent(background, &agg.Aggregate, "updatedSecret")
tests := []struct {
name string
pushCtx func() (context.Context, context.CancelFunc)
eventstore func(*testing.T) *eventstore.Eventstore
closeCtx func() (context.Context, context.CancelFunc)
wantCloseErr bool
}{
{
name: "push error",
pushCtx: func() (context.Context, context.CancelFunc) {
return context.WithCancel(background)
},
eventstore: expectEventstore(
expectPushFailed(io.ErrClosedPipe, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second)
},
wantCloseErr: false,
},
{
name: "success",
pushCtx: func() (context.Context, context.CancelFunc) {
return context.WithCancel(background)
},
eventstore: expectEventstore(
expectPushSlow(time.Second/10, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second)
},
wantCloseErr: false,
},
{
name: "success after push context cancels",
pushCtx: func() (context.Context, context.CancelFunc) {
ctx, cancel := context.WithCancel(background)
cancel()
return ctx, cancel
},
eventstore: expectEventstore(
expectPushSlow(time.Second/10, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second)
},
wantCloseErr: false,
},
{
name: "success after push context timeout",
pushCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second/100)
},
eventstore: expectEventstore(
expectPushSlow(time.Second/10, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second)
},
wantCloseErr: false,
},
{
name: "success after push context timeout",
pushCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second/100)
},
eventstore: expectEventstore(
expectPushSlow(time.Second/10, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second)
},
wantCloseErr: false,
},
{
name: "close timeout error",
pushCtx: func() (context.Context, context.CancelFunc) {
return context.WithCancel(background)
},
eventstore: expectEventstore(
expectPushSlow(time.Second/10, cmd),
),
closeCtx: func() (context.Context, context.CancelFunc) {
return context.WithTimeout(background, time.Second/100)
},
wantCloseErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &Commands{
eventstore: tt.eventstore(t),
}
c.eventstore.PushTimeout = 10 * time.Second
pushCtx, cancel := tt.pushCtx()
c.asyncPush(pushCtx, cmd)
cancel()
closeCtx, cancel := tt.closeCtx()
defer cancel()
err := c.Close(closeCtx)
if tt.wantCloseErr {
assert.Error(t, err)
return
}
require.NoError(t, err)
})
}
}
func expectLoginPathsNoCall(t *testing.T) LoginPaths {
return NewMockLoginPaths(gomock.NewController(t))
}
func expectLoginPathsDefaultEmailCodeURLTemplate(tmpl string) func(t *testing.T) LoginPaths {
return func(t *testing.T) LoginPaths {
m := NewMockLoginPaths(gomock.NewController(t))
m.EXPECT().DefaultEmailCodeURLTemplate(gomock.Any()).Return(tmpl)
return m
}
}
func expectLoginPathsDefaultDomainClaimedURLTemplate(tmpl string) func(t *testing.T) LoginPaths {
return func(t *testing.T) LoginPaths {
m := NewMockLoginPaths(gomock.NewController(t))
m.EXPECT().DefaultDomainClaimedURLTemplate(gomock.Any()).Return(tmpl)
return m
}
}
func expectLoginPathsDefaultPasswordSetURLTemplate(tmpl string) func(t *testing.T) LoginPaths {
return func(t *testing.T) LoginPaths {
m := NewMockLoginPaths(gomock.NewController(t))
m.EXPECT().DefaultPasswordSetURLTemplate(gomock.Any()).Return(tmpl)
return m
}
}
func expectLoginPathsDefaultPasskeySetURLTemplate(tmpl string) func(t *testing.T) LoginPaths {
return func(t *testing.T) LoginPaths {
m := NewMockLoginPaths(gomock.NewController(t))
m.EXPECT().DefaultPasskeySetURLTemplate(gomock.Any()).Return(tmpl)
return m
}
}