feat: notifications (#109)

* implement notification providers * email provider * notification handler * notify users * implement code sent on user eventstore * send email implementation * send init code * handle codes * fix project member handler * add some logs for debug * send emails * text changes * send sms * notification process * send password code * format phone number * test format phone * remove fmts * remove unused code * rename files * add mocks * merge master * Update internal/notification/providers/email/message.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/notification/repository/eventsourcing/handler/notification.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/notification/repository/eventsourcing/handler/notification.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/notification/providers/email/provider.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * requested changes of mr * move locker to eventstore pkg * Update internal/notification/providers/chat/message.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * move locker to eventstore pkg * linebreak * Update internal/notification/providers/email/provider.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/notification/repository/eventsourcing/handler/notification.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/notification/repository/eventsourcing/handler/notification.go Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-12 04:07:31 +00:00 · 2020-05-20 14:28:08 +02:00
parent c365a98cc8
commit e318139b37
67 changed files with 3278 additions and 119 deletions
--- a/internal/user/model/notify_user.go
+++ b/internal/user/model/notify_user.go
@@ -0,0 +1,53 @@
+package model
+
+import (
+	"github.com/caos/zitadel/internal/model"
+	"time"
+)
+
+type NotifyUser struct {
+	ID                string
+	CreationDate      time.Time
+	ChangeDate        time.Time
+	ResourceOwner     string
+	UserName          string
+	FirstName         string
+	LastName          string
+	NickName          string
+	DisplayName       string
+	PreferredLanguage string
+	Gender            Gender
+	LastEmail         string
+	VerifiedEmail     string
+	LastPhone         string
+	VerifiedPhone     string
+	Sequence          uint64
+}
+
+type NotifyUserSearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn NotifyUserSearchKey
+	Asc           bool
+	Queries       []*NotifyUserSearchQuery
+}
+
+type NotifyUserSearchKey int32
+
+const (
+	NOTIFYUSERSEARCHKEY_UNSPECIFIED UserSearchKey = iota
+	NOTIFYUSERSEARCHKEY_USER_ID
+)
+
+type NotifyUserSearchQuery struct {
+	Key    NotifyUserSearchKey
+	Method model.SearchMethod
+	Value  string
+}
+
+type NotifyUserSearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*UserView
+}
--- a/internal/user/model/phone.go
+++ b/internal/user/model/phone.go
@@ -1,13 +1,18 @@
 package model

 import (
-	"encoding/json"
-	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
+	caos_errs "github.com/caos/zitadel/internal/errors"
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/ttacon/libphonenumber"
 	"time"
 )

+const (
+	//TODO: How do we get region?
+	defaultRegion = "CH"
+)
+
 type Phone struct {
 	es_models.ObjectRoot

@@ -23,27 +28,16 @@ type PhoneCode struct {
 }

 func (p *Phone) IsValid() bool {
-	return p.PhoneNumber != ""
+	err := p.formatPhone()
+	return p.PhoneNumber != "" && err == nil
 }

-func (u *User) appendUserPhoneChangedEvent(event *es_models.Event) error {
-	u.Phone = new(Phone)
-	u.Phone.setData(event)
-	u.IsPhoneVerified = false
-	return nil
-}
-
-func (u *User) appendUserPhoneVerifiedEvent() error {
-	u.IsPhoneVerified = true
-	return nil
-}
-
-func (p *Phone) setData(event *es_models.Event) error {
-	p.ObjectRoot.AppendEvent(event)
-	if err := json.Unmarshal(event.Data, p); err != nil {
-		logging.Log("EVEN-dlo9s").WithError(err).Error("could not unmarshal event data")
-		return err
+func (p *Phone) formatPhone() error {
+	phoneNr, err := libphonenumber.Parse(p.PhoneNumber, defaultRegion)
+	if err != nil {
+		return caos_errs.ThrowPreconditionFailed(nil, "EVENT-so0wa", "Phonenumber is invalid")
 	}
+	p.PhoneNumber = libphonenumber.Format(phoneNr, libphonenumber.E164)
 	return nil
 }

--- a/internal/user/model/phone_test.go
+++ b/internal/user/model/phone_test.go
@@ -0,0 +1,106 @@
+package model
+
+import (
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"testing"
+)
+
+func TestFormatPhoneNumber(t *testing.T) {
+	type args struct {
+		phone *Phone
+	}
+	tests := []struct {
+		name    string
+		args    args
+		result  *Phone
+		errFunc func(err error) bool
+	}{
+		{
+			name: "invalid phone number",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "PhoneNumber",
+				},
+			},
+			errFunc: caos_errs.IsPreconditionFailed,
+		},
+		{
+			name: "format phone 071...",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "0711234567",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+41711234567",
+			},
+		},
+		{
+			name: "format phone 0041...",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "0041711234567",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+41711234567",
+			},
+		},
+		{
+			name: "format phone 071 xxx xx xx",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "071 123 45 67",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+41711234567",
+			},
+		},
+		{
+			name: "format phone +4171 xxx xx xx",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "+4171 123 45 67",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+41711234567",
+			},
+		},
+		{
+			name: "format phone 004171 xxx xx xx",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "004171 123 45 67",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+41711234567",
+			},
+		},
+		{
+			name: "format non swiss phone 004371 xxx xx xx",
+			args: args{
+				phone: &Phone{
+					PhoneNumber: "004371 123 45 67",
+				},
+			},
+			result: &Phone{
+				PhoneNumber: "+43711234567",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.args.phone.formatPhone()
+
+			if tt.errFunc == nil && tt.result.PhoneNumber != tt.args.phone.PhoneNumber {
+				t.Errorf("got wrong result: expected: %v, actual: %v ", tt.args.phone.PhoneNumber, tt.result.PhoneNumber)
+			}
+			if tt.errFunc != nil && !tt.errFunc(err) {
+				t.Errorf("got wrong err: %v ", err)
+			}
+		})
+	}
+}
--- a/internal/user/model/user.go
+++ b/internal/user/model/user.go
@@ -58,7 +58,7 @@ func (u *User) SetEmailAsUsername() {
 }

 func (u *User) IsValid() bool {
-	return u.Profile != nil && u.FirstName != "" && u.LastName != "" && u.UserName != "" && u.Email != nil && u.EmailAddress != ""
+	return u.Profile != nil && u.FirstName != "" && u.LastName != "" && u.UserName != "" && u.Email != nil && u.Email.IsValid() && u.Phone == nil || (u.Phone != nil && u.Phone.IsValid())
 }

 func (u *User) IsInitialState() bool {