Impl/code verification

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

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

apps/auth/internal/domain/impl.go

@@ -206,11 +206,20 @@ func (d *domainI) SignUp(ctx context.Context, name string, email string, passwor
 		return nil, errors.NewE(err)
 	}
 
-	err = d.generateAndSendVerificationToken(ctx, user)
-	if err != nil {
-		return nil, errors.NewE(err)
+	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)
+	//}
+
 	return newAuthSession(user.Id, user.Email, user.Name, user.Verified, "email/password"), nil
 }
 
@@ -264,7 +273,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 +421,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,
@@ -598,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
 }
 

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'