From 0bf18bc5118bb5d2e37e91281e09f0f6d5098fe1 Mon Sep 17 00:00:00 2001 From: nxtcoder36 Date: Wed, 22 May 2024 12:42:28 +0530 Subject: [PATCH 1/3] progress: waiting mail impl done, testing in progress --- .../internal/app/graph/account.resolvers.go | 21 +- .../internal/app/graph/generated/generated.go | 117 +++-------- .../app/graph/invitation.resolvers.go | 21 +- .../graph/struct-to-graphql/account.graphqls | 2 +- .../struct-to-graphql/invitation.graphqls | 2 +- apps/auth/internal/domain/impl.go | 30 ++- apps/comms/email-templates/waiting/email.html | 182 ++++++++++++++++++ apps/comms/email-templates/waiting/email.mjml | 35 ++++ apps/comms/email-templates/waiting/email.txt | 10 + apps/comms/internal/app/app.go | 4 + apps/comms/internal/app/grpc-server.go | 30 ++- grpc-interfaces/comms.proto | 1 + .../container-registry.pb.go | 4 +- .../container-registry_grpc.pb.go | 2 +- grpc-interfaces/infra/infra.pb.go | 4 +- grpc-interfaces/infra/infra_grpc.pb.go | 2 +- .../kloudlite.io/rpc/accounts/accounts.pb.go | 4 +- .../rpc/accounts/accounts_grpc.pb.go | 2 +- .../kloudlite.io/rpc/agent/kubeagent.pb.go | 4 +- .../rpc/agent/kubeagent_grpc.pb.go | 2 +- .../kloudlite.io/rpc/auth/auth.pb.go | 4 +- .../kloudlite.io/rpc/auth/auth_grpc.pb.go | 2 +- grpc-interfaces/kloudlite.io/rpc/ci/ci.pb.go | 4 +- .../kloudlite.io/rpc/ci/ci_grpc.pb.go | 2 +- .../kloudlite.io/rpc/comms/comms.pb.go | 31 +-- .../kloudlite.io/rpc/comms/comms_grpc.pb.go | 39 +++- .../rpc/comms/mocks/comms-client.go | 9 + .../rpc/comms/mocks/comms-server.go | 9 + .../kloudlite.io/rpc/console/console.pb.go | 4 +- .../rpc/console/console_grpc.pb.go | 2 +- .../kloudlite.io/rpc/dns/dns.pb.go | 4 +- .../kloudlite.io/rpc/dns/dns_grpc.pb.go | 2 +- .../rpc/finance/finance-infra.pb.go | 4 +- .../rpc/finance/finance-infra_grpc.pb.go | 2 +- .../kloudlite.io/rpc/finance/finance.pb.go | 4 +- .../rpc/finance/finance_grpc.pb.go | 2 +- .../kloudlite.io/rpc/iam/iam.pb.go | 4 +- .../kloudlite.io/rpc/iam/iam_grpc.pb.go | 2 +- .../kloudlite.io/rpc/jseval/jseval.pb.go | 4 +- .../kloudlite.io/rpc/jseval/jseval_grpc.pb.go | 2 +- .../message-office-internal.pb.go | 4 +- .../message-office-internal_grpc.pb.go | 2 +- 42 files changed, 456 insertions(+), 165 deletions(-) create mode 100644 apps/comms/email-templates/waiting/email.html create mode 100644 apps/comms/email-templates/waiting/email.mjml create mode 100644 apps/comms/email-templates/waiting/email.txt diff --git a/apps/accounts/internal/app/graph/account.resolvers.go b/apps/accounts/internal/app/graph/account.resolvers.go index db94608c3..a32ceafe8 100644 --- a/apps/accounts/internal/app/graph/account.resolvers.go +++ b/apps/accounts/internal/app/graph/account.resolvers.go @@ -23,14 +23,6 @@ func (r *accountResolver) CreationTime(ctx context.Context, obj *entities.Accoun return obj.BaseEntity.CreationTime.Format(time.RFC3339), nil } -// ID is the resolver for the id field. -func (r *accountResolver) ID(ctx context.Context, obj *entities.Account) (string, error) { - if obj == nil { - return "", errors.Newf("resource is nil") - } - return string(obj.Id), nil -} - // UpdateTime is the resolver for the updateTime field. func (r *accountResolver) UpdateTime(ctx context.Context, obj *entities.Account) (string, error) { if obj == nil { @@ -55,3 +47,16 @@ func (r *Resolver) AccountIn() generated.AccountInResolver { return &accountInRe type accountResolver struct{ *Resolver } type accountInResolver struct{ *Resolver } + +// !!! WARNING !!! +// The code below was going to be deleted when updating resolvers. It has been copied here so you have +// one last chance to move it out of harms way if you want. There are two reasons this happens: +// - When renaming or deleting a resolver the old code will be put in here. You can safely delete +// it when you're done. +// - You have helper methods in this file. Move them out to keep these resolver files clean. +func (r *accountResolver) ID(ctx context.Context, obj *entities.Account) (string, error) { + if obj == nil { + return "", errors.Newf("resource is nil") + } + return string(obj.Id), nil +} diff --git a/apps/accounts/internal/app/graph/generated/generated.go b/apps/accounts/internal/app/graph/generated/generated.go index e52856a89..28fbe048c 100644 --- a/apps/accounts/internal/app/graph/generated/generated.go +++ b/apps/accounts/internal/app/graph/generated/generated.go @@ -69,7 +69,7 @@ type ComplexityRoot struct { CreatedBy func(childComplexity int) int CreationTime func(childComplexity int) int DisplayName func(childComplexity int) int - ID func(childComplexity int) int + Id func(childComplexity int) int IsActive func(childComplexity int) int LastUpdatedBy func(childComplexity int) int Logo func(childComplexity int) int @@ -106,7 +106,7 @@ type ComplexityRoot struct { Accepted func(childComplexity int) int AccountName func(childComplexity int) int CreationTime func(childComplexity int) int - ID func(childComplexity int) int + Id func(childComplexity int) int InviteToken func(childComplexity int) int InvitedBy func(childComplexity int) int MarkedForDeletion func(childComplexity int) int @@ -180,8 +180,6 @@ type ComplexityRoot struct { type AccountResolver interface { CreationTime(ctx context.Context, obj *entities.Account) (string, error) - ID(ctx context.Context, obj *entities.Account) (string, error) - UpdateTime(ctx context.Context, obj *entities.Account) (string, error) } type AccountMembershipResolver interface { @@ -196,7 +194,6 @@ type Github__com___kloudlite___api___common__CreatedOrUpdatedByResolver interfac } type InvitationResolver interface { CreationTime(ctx context.Context, obj *entities.Invitation) (string, error) - ID(ctx context.Context, obj *entities.Invitation) (string, error) UpdateTime(ctx context.Context, obj *entities.Invitation) (string, error) } @@ -295,11 +292,11 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Account.DisplayName(childComplexity), true case "Account.id": - if e.complexity.Account.ID == nil { + if e.complexity.Account.Id == nil { break } - return e.complexity.Account.ID(childComplexity), true + return e.complexity.Account.Id(childComplexity), true case "Account.isActive": if e.complexity.Account.IsActive == nil { @@ -454,11 +451,11 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Invitation.CreationTime(childComplexity), true case "Invitation.id": - if e.complexity.Invitation.ID == nil { + if e.complexity.Invitation.Id == nil { break } - return e.complexity.Invitation.ID(childComplexity), true + return e.complexity.Invitation.Id(childComplexity), true case "Invitation.inviteToken": if e.complexity.Invitation.InviteToken == nil { @@ -1090,7 +1087,7 @@ extend type User @key(fields: "id") { createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy! creationTime: Date! displayName: String! - id: String! + id: ID! isActive: Boolean lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy! logo: String @@ -1174,7 +1171,7 @@ directive @goField( accepted: Boolean accountName: String! creationTime: Date! - id: String! + id: ID! invitedBy: String! inviteToken: String! markedForDeletion: Boolean @@ -1966,7 +1963,7 @@ func (ec *executionContext) _Account_id(ctx context.Context, field graphql.Colle }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Account().ID(rctx, obj) + return obj.Id, nil }) if err != nil { ec.Error(ctx, err) @@ -1978,19 +1975,19 @@ func (ec *executionContext) _Account_id(ctx context.Context, field graphql.Colle } return graphql.Null } - res := resTmp.(string) + res := resTmp.(repos.ID) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋkloudliteᚋapiᚋpkgᚋreposᚐID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Account_id(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ Object: "Account", Field: field, - IsMethod: true, - IsResolver: true, + IsMethod: false, + IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type ID does not have child fields") }, } return fc, nil @@ -2964,7 +2961,7 @@ func (ec *executionContext) _Invitation_id(ctx context.Context, field graphql.Co }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Invitation().ID(rctx, obj) + return obj.Id, nil }) if err != nil { ec.Error(ctx, err) @@ -2976,19 +2973,19 @@ func (ec *executionContext) _Invitation_id(ctx context.Context, field graphql.Co } return graphql.Null } - res := resTmp.(string) + res := resTmp.(repos.ID) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋkloudliteᚋapiᚋpkgᚋreposᚐID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Invitation_id(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ Object: "Invitation", Field: field, - IsMethod: true, - IsResolver: true, + IsMethod: false, + IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type ID does not have child fields") }, } return fc, nil @@ -8300,41 +8297,10 @@ func (ec *executionContext) _Account(ctx context.Context, sel ast.SelectionSet, atomic.AddUint32(&out.Invalids, 1) } case "id": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Account_id(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue + out.Values[i] = ec._Account_id(ctx, field, obj) + if out.Values[i] == graphql.Null { + atomic.AddUint32(&out.Invalids, 1) } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "isActive": out.Values[i] = ec._Account_isActive(ctx, field, obj) case "lastUpdatedBy": @@ -8770,41 +8736,10 @@ func (ec *executionContext) _Invitation(ctx context.Context, sel ast.SelectionSe out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "id": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Invitation_id(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue + out.Values[i] = ec._Invitation_id(ctx, field, obj) + if out.Values[i] == graphql.Null { + atomic.AddUint32(&out.Invalids, 1) } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "invitedBy": out.Values[i] = ec._Invitation_invitedBy(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/apps/accounts/internal/app/graph/invitation.resolvers.go b/apps/accounts/internal/app/graph/invitation.resolvers.go index 1a69605ad..6a3d9e625 100644 --- a/apps/accounts/internal/app/graph/invitation.resolvers.go +++ b/apps/accounts/internal/app/graph/invitation.resolvers.go @@ -21,14 +21,6 @@ func (r *invitationResolver) CreationTime(ctx context.Context, obj *entities.Inv return obj.CreationTime.Format(time.RFC3339), nil } -// ID is the resolver for the id field. -func (r *invitationResolver) ID(ctx context.Context, obj *entities.Invitation) (string, error) { - if obj == nil { - return "", errors.Newf("invitation obj is nil") - } - return string(obj.Id), nil -} - // UpdateTime is the resolver for the updateTime field. func (r *invitationResolver) UpdateTime(ctx context.Context, obj *entities.Invitation) (string, error) { if obj == nil { @@ -41,3 +33,16 @@ func (r *invitationResolver) UpdateTime(ctx context.Context, obj *entities.Invit func (r *Resolver) Invitation() generated.InvitationResolver { return &invitationResolver{r} } type invitationResolver struct{ *Resolver } + +// !!! WARNING !!! +// The code below was going to be deleted when updating resolvers. It has been copied here so you have +// one last chance to move it out of harms way if you want. There are two reasons this happens: +// - When renaming or deleting a resolver the old code will be put in here. You can safely delete +// it when you're done. +// - You have helper methods in this file. Move them out to keep these resolver files clean. +func (r *invitationResolver) ID(ctx context.Context, obj *entities.Invitation) (string, error) { + if obj == nil { + return "", errors.Newf("invitation obj is nil") + } + return string(obj.Id), nil +} diff --git a/apps/accounts/internal/app/graph/struct-to-graphql/account.graphqls b/apps/accounts/internal/app/graph/struct-to-graphql/account.graphqls index 5214c4a61..c7d6b3de2 100644 --- a/apps/accounts/internal/app/graph/struct-to-graphql/account.graphqls +++ b/apps/accounts/internal/app/graph/struct-to-graphql/account.graphqls @@ -3,7 +3,7 @@ type Account @shareable { createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy! creationTime: Date! displayName: String! - id: String! + id: ID! isActive: Boolean lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy! logo: String diff --git a/apps/accounts/internal/app/graph/struct-to-graphql/invitation.graphqls b/apps/accounts/internal/app/graph/struct-to-graphql/invitation.graphqls index 60360e2b4..1fa58aa5d 100644 --- a/apps/accounts/internal/app/graph/struct-to-graphql/invitation.graphqls +++ b/apps/accounts/internal/app/graph/struct-to-graphql/invitation.graphqls @@ -2,7 +2,7 @@ type Invitation @shareable { accepted: Boolean accountName: String! creationTime: Date! - id: String! + id: ID! invitedBy: String! inviteToken: String! markedForDeletion: Boolean diff --git a/apps/auth/internal/domain/impl.go b/apps/auth/internal/domain/impl.go index fa16ae73e..0f6a2c9c9 100644 --- a/apps/auth/internal/domain/impl.go +++ b/apps/auth/internal/domain/impl.go @@ -206,6 +206,16 @@ func (d *domainI) SignUp(ctx context.Context, name string, email string, passwor return nil, errors.NewE(err) } + //TODO: Mohit: remove below + if _, err := d.commsClient.SendWaitingEmail( + ctx, &comms.WelcomeEmailInput{ + Email: user.Email, + Name: user.Name, + }, + ); err != nil { + d.logger.Errorf(err) + } + err = d.generateAndSendVerificationToken(ctx, user) if err != nil { return nil, errors.NewE(err) @@ -264,7 +274,15 @@ func (d *domainI) VerifyEmail(ctx context.Context, token string) (*common.AuthSe if err != nil { return nil, errors.NewE(err) } - if _, err := d.commsClient.SendWelcomeEmail( + //if _, err := d.commsClient.SendWelcomeEmail( + // ctx, &comms.WelcomeEmailInput{ + // Email: user.Email, + // Name: user.Name, + // }, + //); err != nil { + // d.logger.Errorf(err) + //} + if _, err := d.commsClient.SendWaitingEmail( ctx, &comms.WelcomeEmailInput{ Email: user.Email, Name: user.Name, @@ -404,7 +422,15 @@ func (d *domainI) addOAuthLogin(ctx context.Context, provider string, token *oau user = u user.Joined = time.Now() user, err = d.userRepo.Create(ctx, user) - if _, err := d.commsClient.SendWelcomeEmail( + //if _, err := d.commsClient.SendWelcomeEmail( + // ctx, &comms.WelcomeEmailInput{ + // Email: user.Email, + // Name: user.Name, + // }, + //); err != nil { + // d.logger.Errorf(err) + //} + if _, err := d.commsClient.SendWaitingEmail( ctx, &comms.WelcomeEmailInput{ Email: user.Email, Name: user.Name, diff --git a/apps/comms/email-templates/waiting/email.html b/apps/comms/email-templates/waiting/email.html new file mode 100644 index 000000000..26f29ad06 --- /dev/null +++ b/apps/comms/email-templates/waiting/email.html @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + +
+ + + + + + +
+ +
+
+
+ +
+
+ +
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
Hello {{.Name}},
+
+
I’m Karthik, the founder of Kloudlite Inc, and I’d like to personally thank you for signing up for our service.
+
+
We established Kloudlite to make DevOps simple, cloud-agnostic, and cost-effective for you.
+
+
Currently, You are on our waiting list. Our team will reach out to you ASAP.
+
+
Best Regards,
+
+
Karthik
+
+
+ +
+
+ +
+ + + diff --git a/apps/comms/email-templates/waiting/email.mjml b/apps/comms/email-templates/waiting/email.mjml new file mode 100644 index 000000000..7ac366f78 --- /dev/null +++ b/apps/comms/email-templates/waiting/email.mjml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + Hello {{.Name}}, + + + I’m Karthik, the founder of Kloudlite Inc, and I’d like to personally thank you for signing up for our service. + + + We established Kloudlite to make DevOps simple, cloud-agnostic, and cost-effective for you. + + + Currently, You are on our waiting list. Our team will reach out to you ASAP. + + + Best Regards, + + + Karthik + + + + + + diff --git a/apps/comms/email-templates/waiting/email.txt b/apps/comms/email-templates/waiting/email.txt new file mode 100644 index 000000000..2d501c0d3 --- /dev/null +++ b/apps/comms/email-templates/waiting/email.txt @@ -0,0 +1,10 @@ +Hello {{.Name}}, + +I’m Karthik, the founder of Kloudlite Inc and I’d like to personally thank you for signing up to our service. + +We established Kloudlite in order to make your DevOps Simple, Cloud Agnostic & Cost Effective. + +Currently, You are on our waiting list. Our team will reach out to you ASAP. + +Best Regards, +Karthik diff --git a/apps/comms/internal/app/app.go b/apps/comms/internal/app/app.go index 71b1e6838..7737c6c50 100644 --- a/apps/comms/internal/app/app.go +++ b/apps/comms/internal/app/app.go @@ -29,6 +29,7 @@ type ProjectInviteEmail *EmailTemplate type RestPasswordEmail *EmailTemplate type UserVerificationEmail *EmailTemplate type WelcomeEmail *EmailTemplate +type WaitingEmail *EmailTemplate func parseTemplate(et EmailTemplatesDir, templateName string, subject string) (*EmailTemplate, error) { txtFile, err := et.ReadFile(fmt.Sprintf("email-templates/%v/email.txt", templateName)) @@ -72,6 +73,9 @@ var Module = fx.Module("app", fx.Provide(func(et EmailTemplatesDir) (WelcomeEmail, error) { return parseTemplate(et, "welcome", "[Kloudlite] Welcome to Kloudlite") }), + fx.Provide(func(et EmailTemplatesDir) (WaitingEmail, error) { + return parseTemplate(et, "welcome", "[Kloudlite] Welcome to Kloudlite") + }), fx.Provide(newCommsSvc), diff --git a/apps/comms/internal/app/grpc-server.go b/apps/comms/internal/app/grpc-server.go index d1df87bda..08f48fe00 100644 --- a/apps/comms/internal/app/grpc-server.go +++ b/apps/comms/internal/app/grpc-server.go @@ -24,6 +24,7 @@ type commsSvc struct { resetPasswordEmail RestPasswordEmail userVerificationEmail UserVerificationEmail welcomeEmail WelcomeEmail + waitingEmail WaitingEmail } func (r *commsSvc) sendSupportEmail(ctx context.Context, subject string, toEmail string, toName string, plainText string, htmlContent string) error { @@ -156,6 +157,32 @@ func (r *commsSvc) SendWelcomeEmail(ctx context.Context, input *comms.WelcomeEma return &comms.Void{}, nil } +func (r *commsSvc) SendWaitingEmail(ctx context.Context, input *comms.WelcomeEmailInput) (*comms.Void, error) { + plainText := new(bytes.Buffer) + args := map[string]any{ + "Name": func() string { + if input.Name != "" { + return input.Name + } + return "there" + }(), + } + + if err := r.waitingEmail.PlainText.Execute(plainText, args); err != nil { + return nil, errors.NewEf(err, "failed to execute plain text template") + } + + html := new(bytes.Buffer) + if err := r.waitingEmail.Html.Execute(html, args); err != nil { + return nil, errors.NewEf(err, "failed to execute html template") + } + + if err := r.sendSupportEmail(ctx, r.waitingEmail.Subject, input.Email, input.Name, plainText.String(), html.String()); err != nil { + return nil, errors.NewE(err) + } + return &comms.Void{}, nil +} + func (r *commsSvc) SendVerificationEmail(ctx context.Context, input *comms.VerificationEmailInput) (*comms.Void, error) { plainText := new(bytes.Buffer) args := map[string]any{ @@ -182,7 +209,7 @@ func (r *commsSvc) SendVerificationEmail(ctx context.Context, input *comms.Verif } return &comms.Void{}, nil } -func newCommsSvc(mailer mail.Mailer, ev *env.Env, ai AccountInviteEmail, pi ProjectInviteEmail, rp RestPasswordEmail, uv UserVerificationEmail, wl WelcomeEmail) comms.CommsServer { +func newCommsSvc(mailer mail.Mailer, ev *env.Env, ai AccountInviteEmail, pi ProjectInviteEmail, rp RestPasswordEmail, uv UserVerificationEmail, nwl WaitingEmail, wl WelcomeEmail) comms.CommsServer { return &commsSvc{ mailer: mailer, supportEmail: ev.SupportEmail, @@ -192,5 +219,6 @@ func newCommsSvc(mailer mail.Mailer, ev *env.Env, ai AccountInviteEmail, pi Proj resetPasswordEmail: rp, userVerificationEmail: uv, welcomeEmail: wl, + waitingEmail: nwl, } } diff --git a/grpc-interfaces/comms.proto b/grpc-interfaces/comms.proto index 7c12af514..7ee2785ea 100644 --- a/grpc-interfaces/comms.proto +++ b/grpc-interfaces/comms.proto @@ -8,6 +8,7 @@ service Comms { rpc SendAccountMemberInviteEmail(AccountMemberInviteEmailInput) returns (Void); rpc SendProjectMemberInviteEmail(ProjectMemberInviteEmailInput) returns (Void); rpc SendWelcomeEmail(WelcomeEmailInput) returns (Void); + rpc SendWaitingEmail(WelcomeEmailInput) returns (Void); } message VerificationEmailInput{ diff --git a/grpc-interfaces/container_registry/container-registry.pb.go b/grpc-interfaces/container_registry/container-registry.pb.go index 70749cf56..175101792 100644 --- a/grpc-interfaces/container_registry/container-registry.pb.go +++ b/grpc-interfaces/container_registry/container-registry.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: container-registry.proto package container_registry diff --git a/grpc-interfaces/container_registry/container-registry_grpc.pb.go b/grpc-interfaces/container_registry/container-registry_grpc.pb.go index 5c0d88f1b..2a4c83aa0 100644 --- a/grpc-interfaces/container_registry/container-registry_grpc.pb.go +++ b/grpc-interfaces/container_registry/container-registry_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: container-registry.proto package container_registry diff --git a/grpc-interfaces/infra/infra.pb.go b/grpc-interfaces/infra/infra.pb.go index 6df04b4d7..9438a1a62 100644 --- a/grpc-interfaces/infra/infra.pb.go +++ b/grpc-interfaces/infra/infra.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: infra.proto package infra diff --git a/grpc-interfaces/infra/infra_grpc.pb.go b/grpc-interfaces/infra/infra_grpc.pb.go index 14d7614d2..3dafa3396 100644 --- a/grpc-interfaces/infra/infra_grpc.pb.go +++ b/grpc-interfaces/infra/infra_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: infra.proto package infra diff --git a/grpc-interfaces/kloudlite.io/rpc/accounts/accounts.pb.go b/grpc-interfaces/kloudlite.io/rpc/accounts/accounts.pb.go index f56956db4..e1536d1e0 100644 --- a/grpc-interfaces/kloudlite.io/rpc/accounts/accounts.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/accounts/accounts.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: accounts.proto package accounts diff --git a/grpc-interfaces/kloudlite.io/rpc/accounts/accounts_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/accounts/accounts_grpc.pb.go index 91b0b817c..7760e10f8 100644 --- a/grpc-interfaces/kloudlite.io/rpc/accounts/accounts_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/accounts/accounts_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: accounts.proto package accounts diff --git a/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent.pb.go b/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent.pb.go index df0445227..4674a6ef7 100644 --- a/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: kubeagent.proto package agent diff --git a/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent_grpc.pb.go index 0d761c0bd..3df005d82 100644 --- a/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/agent/kubeagent_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: kubeagent.proto package agent diff --git a/grpc-interfaces/kloudlite.io/rpc/auth/auth.pb.go b/grpc-interfaces/kloudlite.io/rpc/auth/auth.pb.go index bc0102096..f0e5c0269 100644 --- a/grpc-interfaces/kloudlite.io/rpc/auth/auth.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/auth/auth.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: auth.proto package auth diff --git a/grpc-interfaces/kloudlite.io/rpc/auth/auth_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/auth/auth_grpc.pb.go index d7b047468..1499fd687 100644 --- a/grpc-interfaces/kloudlite.io/rpc/auth/auth_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/auth/auth_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: auth.proto package auth diff --git a/grpc-interfaces/kloudlite.io/rpc/ci/ci.pb.go b/grpc-interfaces/kloudlite.io/rpc/ci/ci.pb.go index 7a6f793b5..025bc59cc 100644 --- a/grpc-interfaces/kloudlite.io/rpc/ci/ci.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/ci/ci.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: ci.proto package ci diff --git a/grpc-interfaces/kloudlite.io/rpc/ci/ci_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/ci/ci_grpc.pb.go index aa4fbd339..233961e9e 100644 --- a/grpc-interfaces/kloudlite.io/rpc/ci/ci_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/ci/ci_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: ci.proto package ci diff --git a/grpc-interfaces/kloudlite.io/rpc/comms/comms.pb.go b/grpc-interfaces/kloudlite.io/rpc/comms/comms.pb.go index 1cf5a8d98..cfec65dd9 100644 --- a/grpc-interfaces/kloudlite.io/rpc/comms/comms.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/comms/comms.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: comms.proto package comms @@ -441,7 +441,7 @@ var file_comms_proto_rawDesc = []byte{ 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x06, 0x0a, 0x04, 0x56, 0x6f, 0x69, 0x64, 0x32, 0xb8, 0x02, 0x0a, 0x05, 0x43, 0x6f, 0x6d, 0x6d, + 0x06, 0x0a, 0x04, 0x56, 0x6f, 0x69, 0x64, 0x32, 0xe7, 0x02, 0x0a, 0x05, 0x43, 0x6f, 0x6d, 0x6d, 0x73, 0x12, 0x37, 0x0a, 0x15, 0x53, 0x65, 0x6e, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x17, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x49, 0x6e, @@ -461,9 +461,12 @@ var file_comms_proto_rawDesc = []byte{ 0x6f, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x10, 0x53, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x12, 0x2e, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x1a, 0x05, 0x2e, 0x56, 0x6f, - 0x69, 0x64, 0x42, 0x18, 0x5a, 0x16, 0x6b, 0x6c, 0x6f, 0x75, 0x64, 0x6c, 0x69, 0x74, 0x65, 0x2e, - 0x69, 0x6f, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x10, 0x53, 0x65, 0x6e, 0x64, 0x57, 0x61, 0x69, 0x74, 0x69, 0x6e, + 0x67, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x12, 0x2e, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, + 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x1a, 0x05, 0x2e, 0x56, 0x6f, 0x69, + 0x64, 0x42, 0x18, 0x5a, 0x16, 0x6b, 0x6c, 0x6f, 0x75, 0x64, 0x6c, 0x69, 0x74, 0x65, 0x2e, 0x69, + 0x6f, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -493,13 +496,15 @@ var file_comms_proto_depIdxs = []int32{ 3, // 2: Comms.SendAccountMemberInviteEmail:input_type -> AccountMemberInviteEmailInput 4, // 3: Comms.SendProjectMemberInviteEmail:input_type -> ProjectMemberInviteEmailInput 1, // 4: Comms.SendWelcomeEmail:input_type -> WelcomeEmailInput - 5, // 5: Comms.SendVerificationEmail:output_type -> Void - 5, // 6: Comms.SendPasswordResetEmail:output_type -> Void - 5, // 7: Comms.SendAccountMemberInviteEmail:output_type -> Void - 5, // 8: Comms.SendProjectMemberInviteEmail:output_type -> Void - 5, // 9: Comms.SendWelcomeEmail:output_type -> Void - 5, // [5:10] is the sub-list for method output_type - 0, // [0:5] is the sub-list for method input_type + 1, // 5: Comms.SendWaitingEmail:input_type -> WelcomeEmailInput + 5, // 6: Comms.SendVerificationEmail:output_type -> Void + 5, // 7: Comms.SendPasswordResetEmail:output_type -> Void + 5, // 8: Comms.SendAccountMemberInviteEmail:output_type -> Void + 5, // 9: Comms.SendProjectMemberInviteEmail:output_type -> Void + 5, // 10: Comms.SendWelcomeEmail:output_type -> Void + 5, // 11: Comms.SendWaitingEmail:output_type -> Void + 6, // [6:12] is the sub-list for method output_type + 0, // [0:6] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name diff --git a/grpc-interfaces/kloudlite.io/rpc/comms/comms_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/comms/comms_grpc.pb.go index 68f1c675e..72c1ccbe9 100644 --- a/grpc-interfaces/kloudlite.io/rpc/comms/comms_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/comms/comms_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: comms.proto package comms @@ -24,6 +24,7 @@ const ( Comms_SendAccountMemberInviteEmail_FullMethodName = "/Comms/SendAccountMemberInviteEmail" Comms_SendProjectMemberInviteEmail_FullMethodName = "/Comms/SendProjectMemberInviteEmail" Comms_SendWelcomeEmail_FullMethodName = "/Comms/SendWelcomeEmail" + Comms_SendWaitingEmail_FullMethodName = "/Comms/SendWaitingEmail" ) // CommsClient is the client API for Comms service. @@ -35,6 +36,7 @@ type CommsClient interface { SendAccountMemberInviteEmail(ctx context.Context, in *AccountMemberInviteEmailInput, opts ...grpc.CallOption) (*Void, error) SendProjectMemberInviteEmail(ctx context.Context, in *ProjectMemberInviteEmailInput, opts ...grpc.CallOption) (*Void, error) SendWelcomeEmail(ctx context.Context, in *WelcomeEmailInput, opts ...grpc.CallOption) (*Void, error) + SendWaitingEmail(ctx context.Context, in *WelcomeEmailInput, opts ...grpc.CallOption) (*Void, error) } type commsClient struct { @@ -90,6 +92,15 @@ func (c *commsClient) SendWelcomeEmail(ctx context.Context, in *WelcomeEmailInpu return out, nil } +func (c *commsClient) SendWaitingEmail(ctx context.Context, in *WelcomeEmailInput, opts ...grpc.CallOption) (*Void, error) { + out := new(Void) + err := c.cc.Invoke(ctx, Comms_SendWaitingEmail_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // CommsServer is the server API for Comms service. // All implementations must embed UnimplementedCommsServer // for forward compatibility @@ -99,6 +110,7 @@ type CommsServer interface { SendAccountMemberInviteEmail(context.Context, *AccountMemberInviteEmailInput) (*Void, error) SendProjectMemberInviteEmail(context.Context, *ProjectMemberInviteEmailInput) (*Void, error) SendWelcomeEmail(context.Context, *WelcomeEmailInput) (*Void, error) + SendWaitingEmail(context.Context, *WelcomeEmailInput) (*Void, error) mustEmbedUnimplementedCommsServer() } @@ -121,6 +133,9 @@ func (UnimplementedCommsServer) SendProjectMemberInviteEmail(context.Context, *P func (UnimplementedCommsServer) SendWelcomeEmail(context.Context, *WelcomeEmailInput) (*Void, error) { return nil, status.Errorf(codes.Unimplemented, "method SendWelcomeEmail not implemented") } +func (UnimplementedCommsServer) SendWaitingEmail(context.Context, *WelcomeEmailInput) (*Void, error) { + return nil, status.Errorf(codes.Unimplemented, "method SendWaitingEmail not implemented") +} func (UnimplementedCommsServer) mustEmbedUnimplementedCommsServer() {} // UnsafeCommsServer may be embedded to opt out of forward compatibility for this service. @@ -224,6 +239,24 @@ func _Comms_SendWelcomeEmail_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } +func _Comms_SendWaitingEmail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WelcomeEmailInput) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommsServer).SendWaitingEmail(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Comms_SendWaitingEmail_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommsServer).SendWaitingEmail(ctx, req.(*WelcomeEmailInput)) + } + return interceptor(ctx, in, info, handler) +} + // Comms_ServiceDesc is the grpc.ServiceDesc for Comms service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -251,6 +284,10 @@ var Comms_ServiceDesc = grpc.ServiceDesc{ MethodName: "SendWelcomeEmail", Handler: _Comms_SendWelcomeEmail_Handler, }, + { + MethodName: "SendWaitingEmail", + Handler: _Comms_SendWaitingEmail_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "comms.proto", diff --git a/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-client.go b/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-client.go index 9dd36315a..a11cb7b80 100644 --- a/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-client.go +++ b/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-client.go @@ -17,6 +17,7 @@ type CommsClient struct { MockSendProjectMemberInviteEmail func(ctx context.Context, in *comms.ProjectMemberInviteEmailInput, opts ...grpc.CallOption) (*comms.Void, error) MockSendVerificationEmail func(ctx context.Context, in *comms.VerificationEmailInput, opts ...grpc.CallOption) (*comms.Void, error) MockSendWelcomeEmail func(ctx context.Context, in *comms.WelcomeEmailInput, opts ...grpc.CallOption) (*comms.Void, error) + MockSendWaitingEmail func(ctx context.Context, in *comms.WaitingEmailInput, opts ...grpc.CallOption) (*comms.Void, error) } func (m *CommsClient) registerCall(funcName string, args ...any) { @@ -66,6 +67,14 @@ func (cMock *CommsClient) SendWelcomeEmail(ctx context.Context, in *comms.Welcom panic("method 'SendWelcomeEmail' not implemented, yet") } +func (cMock *CommsClient) SendWaitingEmail(ctx context.Context, in *comms.WaitingEmailInput, opts ...grpc.CallOption) (*comms.Void, error) { + if cMock.MockSendWaitingEmail != nil { + cMock.registerCall("SendWaitingEmail", ctx, in, opts) + return cMock.MockSendWaitingEmail(ctx, in, opts...) + } + panic("method 'SendWaitingEmail' not implemented, yet") +} + func NewCommsClient() *CommsClient { return &CommsClient{} } diff --git a/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-server.go b/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-server.go index 93aeafa87..db0b9274b 100644 --- a/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-server.go +++ b/grpc-interfaces/kloudlite.io/rpc/comms/mocks/comms-server.go @@ -16,6 +16,7 @@ type CommsServer struct { MockSendProjectMemberInviteEmail func(ke context.Context, kf *comms.ProjectMemberInviteEmailInput) (*comms.Void, error) MockSendVerificationEmail func(kg context.Context, kh *comms.VerificationEmailInput) (*comms.Void, error) MockSendWelcomeEmail func(ki context.Context, kj *comms.WelcomeEmailInput) (*comms.Void, error) + MockSendWaitingEmail func(ki context.Context, kj *comms.WaitingEmailInput) (*comms.Void, error) } func (m *CommsServer) registerCall(funcName string, args ...any) { @@ -65,6 +66,14 @@ func (cMock *CommsServer) SendWelcomeEmail(ki context.Context, kj *comms.Welcome panic("method 'SendWelcomeEmail' not implemented, yet") } +func (cMock *CommsServer) SendWaitingEmail(ki context.Context, kj *comms.WaitingEmailInput) (*comms.Void, error) { + if cMock.MockSendWaitingEmail != nil { + cMock.registerCall("SendWaitingEmail", ki, kj) + return cMock.MockSendWaitingEmail(ki, kj) + } + panic("method 'SendWaitingEmail' not implemented, yet") +} + func NewCommsServer() *CommsServer { return &CommsServer{} } diff --git a/grpc-interfaces/kloudlite.io/rpc/console/console.pb.go b/grpc-interfaces/kloudlite.io/rpc/console/console.pb.go index c09616a9b..35af46990 100644 --- a/grpc-interfaces/kloudlite.io/rpc/console/console.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/console/console.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: console.proto package console diff --git a/grpc-interfaces/kloudlite.io/rpc/console/console_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/console/console_grpc.pb.go index d1ae92d93..b03f53d33 100644 --- a/grpc-interfaces/kloudlite.io/rpc/console/console_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/console/console_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: console.proto package console diff --git a/grpc-interfaces/kloudlite.io/rpc/dns/dns.pb.go b/grpc-interfaces/kloudlite.io/rpc/dns/dns.pb.go index a8931df2e..f2f91c9c6 100644 --- a/grpc-interfaces/kloudlite.io/rpc/dns/dns.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/dns/dns.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: dns.proto package dns diff --git a/grpc-interfaces/kloudlite.io/rpc/dns/dns_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/dns/dns_grpc.pb.go index 079d66d82..12acea557 100644 --- a/grpc-interfaces/kloudlite.io/rpc/dns/dns_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/dns/dns_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: dns.proto package dns diff --git a/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra.pb.go b/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra.pb.go index 9cf2a27a6..b96664c87 100644 --- a/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: finance-infra.proto package finance diff --git a/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra_grpc.pb.go index 417b15177..cc270869b 100644 --- a/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/finance/finance-infra_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: finance-infra.proto package finance diff --git a/grpc-interfaces/kloudlite.io/rpc/finance/finance.pb.go b/grpc-interfaces/kloudlite.io/rpc/finance/finance.pb.go index b13d5a015..ed766b86c 100644 --- a/grpc-interfaces/kloudlite.io/rpc/finance/finance.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/finance/finance.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: finance.proto package finance diff --git a/grpc-interfaces/kloudlite.io/rpc/finance/finance_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/finance/finance_grpc.pb.go index 61e0d9dd7..6d2911fc0 100644 --- a/grpc-interfaces/kloudlite.io/rpc/finance/finance_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/finance/finance_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: finance.proto package finance diff --git a/grpc-interfaces/kloudlite.io/rpc/iam/iam.pb.go b/grpc-interfaces/kloudlite.io/rpc/iam/iam.pb.go index e81e5472c..b713e006e 100644 --- a/grpc-interfaces/kloudlite.io/rpc/iam/iam.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/iam/iam.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: iam.proto package iam diff --git a/grpc-interfaces/kloudlite.io/rpc/iam/iam_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/iam/iam_grpc.pb.go index 1810941e2..cf37c6f23 100644 --- a/grpc-interfaces/kloudlite.io/rpc/iam/iam_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/iam/iam_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: iam.proto package iam diff --git a/grpc-interfaces/kloudlite.io/rpc/jseval/jseval.pb.go b/grpc-interfaces/kloudlite.io/rpc/jseval/jseval.pb.go index bdaa70343..31ae4803a 100644 --- a/grpc-interfaces/kloudlite.io/rpc/jseval/jseval.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/jseval/jseval.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: jseval.proto package jseval diff --git a/grpc-interfaces/kloudlite.io/rpc/jseval/jseval_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/jseval/jseval_grpc.pb.go index 8c2cb8221..da41427c8 100644 --- a/grpc-interfaces/kloudlite.io/rpc/jseval/jseval_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/jseval/jseval_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: jseval.proto package jseval diff --git a/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal.pb.go b/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal.pb.go index d6ce73674..ed7bfdfdf 100644 --- a/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.24.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.2 // source: message-office-internal.proto package message_office_internal diff --git a/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal_grpc.pb.go b/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal_grpc.pb.go index bc6c76b18..c03f924a9 100644 --- a/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal_grpc.pb.go +++ b/grpc-interfaces/kloudlite.io/rpc/message-office-internal/message-office-internal_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: message-office-internal.proto package message_office_internal From e9d09c0b10ac3854ccb490144463b0bd2e02ec1e Mon Sep 17 00:00:00 2001 From: nxtcoder36 Date: Wed, 22 May 2024 19:17:07 +0530 Subject: [PATCH 2/3] impl: waiting email impl done --- apps/auth/internal/domain/impl.go | 9 ++++----- apps/comms/Taskfile.yml | 4 ---- apps/comms/internal/app/app.go | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/auth/internal/domain/impl.go b/apps/auth/internal/domain/impl.go index 0f6a2c9c9..a8f8aa9e7 100644 --- a/apps/auth/internal/domain/impl.go +++ b/apps/auth/internal/domain/impl.go @@ -206,7 +206,6 @@ func (d *domainI) SignUp(ctx context.Context, name string, email string, passwor return nil, errors.NewE(err) } - //TODO: Mohit: remove below if _, err := d.commsClient.SendWaitingEmail( ctx, &comms.WelcomeEmailInput{ Email: user.Email, @@ -216,10 +215,10 @@ func (d *domainI) SignUp(ctx context.Context, name string, email string, passwor d.logger.Errorf(err) } - err = d.generateAndSendVerificationToken(ctx, user) - if err != nil { - return nil, errors.NewE(err) - } + //err = d.generateAndSendVerificationToken(ctx, user) + //if err != nil { + // return nil, errors.NewE(err) + //} return newAuthSession(user.Id, user.Email, user.Name, user.Verified, "email/password"), nil } diff --git a/apps/comms/Taskfile.yml b/apps/comms/Taskfile.yml index 180f157ab..7aa001ba3 100644 --- a/apps/comms/Taskfile.yml +++ b/apps/comms/Taskfile.yml @@ -9,10 +9,6 @@ vars: tasks: run: dotenv: [".secrets/env"] - env: - EMAIL_LINKS_BASE_URL: "https://auth.local.kl.madhouselabs.io" - GRPC_PORT: 50051 - SUPPORT_EMAIL: support@kloudlite.io cmds: - nodemon -e go --signal SIGKILL --exec 'go run -tags dynamic main.go --dev || exit 1' diff --git a/apps/comms/internal/app/app.go b/apps/comms/internal/app/app.go index 7737c6c50..d7908e52c 100644 --- a/apps/comms/internal/app/app.go +++ b/apps/comms/internal/app/app.go @@ -74,7 +74,7 @@ var Module = fx.Module("app", return parseTemplate(et, "welcome", "[Kloudlite] Welcome to Kloudlite") }), fx.Provide(func(et EmailTemplatesDir) (WaitingEmail, error) { - return parseTemplate(et, "welcome", "[Kloudlite] Welcome to Kloudlite") + return parseTemplate(et, "waiting", "[Kloudlite] Welcome to Kloudlite") }), fx.Provide(newCommsSvc), From b58dcb9b9343a8d0e859f6eafb21772aa144ff35 Mon Sep 17 00:00:00 2001 From: nxtcoder36 Date: Wed, 22 May 2024 19:19:28 +0530 Subject: [PATCH 3/3] minor change --- apps/auth/internal/domain/impl.go | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/auth/internal/domain/impl.go b/apps/auth/internal/domain/impl.go index a8f8aa9e7..15385b58d 100644 --- a/apps/auth/internal/domain/impl.go +++ b/apps/auth/internal/domain/impl.go @@ -623,7 +623,6 @@ func (d *domainI) GetAccessToken(ctx context.Context, provider string, userId st if err != nil { return nil, errors.NewEf(err, "could not update access token") } - // fmt.Println("accToken: ", accToken) return accToken, nil }