Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add the send invitation email cli command for admin to compensate user invitation email failure #427

Merged
merged 2 commits into from
Sep 27, 2024
Merged

feat: add the send invitation email cli command for admin to compensate user invitation email failure #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55f557e
feat: add the cli command for compensating user invitation email failure
wood-push-melon Sep 25, 2024
34ba19d
refactor: improve the identity creation cli
wood-push-melon Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 119 additions & 0 deletions cmd/createEmail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package cmd

import (
"context"
"fmt"
"os"

"github.com/canonical/identity-platform-admin-ui/internal/authorization"
"github.com/canonical/identity-platform-admin-ui/internal/config"
"github.com/canonical/identity-platform-admin-ui/internal/kratos"
"github.com/canonical/identity-platform-admin-ui/internal/logging"
"github.com/canonical/identity-platform-admin-ui/internal/mail"
"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
"github.com/canonical/identity-platform-admin-ui/internal/openfga"
"github.com/canonical/identity-platform-admin-ui/internal/pool"
"github.com/canonical/identity-platform-admin-ui/internal/tracing"
"github.com/canonical/identity-platform-admin-ui/pkg/identities"
"github.com/kelseyhightower/envconfig"
"github.com/spf13/cobra"
)

var sendInvitationCmd = &cobra.Command{
Use: "send-invite [identity-id]",
Short: "Send an invitation email for an identity",
Example: `Send an invitation email:

identity-platform-admin-ui send-invite d0bebe60-f4fa-4bdc-b6d6-dff9eb42d287`,
Long: `Send an invitation email for an identity if previous email sending efforts failed.`,
Args: cobra.ExactArgs(1),
Run: sendInvitationHandler,
}

func init() {
rootCmd.AddCommand(sendInvitationCmd)
}

func sendInvitationHandler(cmd *cobra.Command, args []string) {
ctx := context.Background()

logger := logging.NewNoopLogger()
tracer := tracing.NewNoopTracer()
monitor := monitoring.NewNoopMonitor("", logger)
wpool := pool.NewWorkerPool(1, tracer, monitor, logger)
defer wpool.Stop()

// Initialize environment variables
specs, err := initializeEnv()
if err != nil {
panic(err)
}

// Initialize identity service
service := initializeIdentityService(specs, logger, tracer, monitor, wpool)

// Get the identity
identityID := args[0]
identityData, err := service.GetIdentity(ctx, identityID)
if err != nil {
panic(fmt.Errorf("failed to get the identity: %v", err))
wood-push-melon marked this conversation as resolved.
Show resolved Hide resolved
}

ids := identityData.Identities
if len(ids) == 0 {
cmd.PrintErrln("No identity found for identity:", identityID)
os.Exit(1)
}

identity := &ids[0]

// Send invitation email
err = service.SendUserCreationEmail(ctx, identity)
wood-push-melon marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
panic(fmt.Errorf("failed to send the invitation email: %v", err))
}

cmd.Printf("Invitation email sent for identity: %s\n", identity.GetId())
}

func initializeEnv() (*config.EnvSpec, error) {
wood-push-melon marked this conversation as resolved.
Show resolved Hide resolved
specs := new(config.EnvSpec)
if err := envconfig.Process("", specs); err != nil {
return nil, fmt.Errorf("failed to populate environment variables: %v", err)
}

return specs, nil
}

func initializeIdentityService(specs *config.EnvSpec, logger logging.LoggerInterface, tracer tracing.TracingInterface, monitor monitoring.MonitorInterface, wpool pool.WorkerPoolInterface) *identities.Service {
// Set up Kratos client
kratosClient := kratos.NewClient(specs.KratosAdminURL, specs.Debug)

// Set up OpenFGA authorization
openfgaConfig := openfga.NewConfig(
specs.ApiScheme,
specs.ApiHost,
specs.StoreId,
specs.ApiToken,
specs.ModelId,
specs.Debug,
tracer,
monitor,
logger,
)
openfgaClient := openfga.NewClient(openfgaConfig)
authorizer := authorization.NewAuthorizer(openfgaClient, wpool, tracer, monitor, logger)

// Set up mail service
mailConfig := mail.NewConfig(
specs.MailHost,
specs.MailPort,
specs.MailUsername,
specs.MailPassword,
specs.MailFromAddress,
specs.MailSendTimeoutSeconds,
)
mailService := mail.NewEmailService(mailConfig, tracer, monitor, logger)
wood-push-melon marked this conversation as resolved.
Show resolved Hide resolved

return identities.NewService(kratosClient.IdentityAPI(), authorizer, mailService, tracer, monitor, logger)
}
47 changes: 6 additions & 41 deletions cmd/createIdentity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@ import (
"io"
"os"

"github.com/canonical/identity-platform-admin-ui/internal/authorization"
"github.com/canonical/identity-platform-admin-ui/internal/config"
"github.com/canonical/identity-platform-admin-ui/internal/kratos"
"github.com/canonical/identity-platform-admin-ui/internal/logging"
"github.com/canonical/identity-platform-admin-ui/internal/mail"
"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
"github.com/canonical/identity-platform-admin-ui/internal/openfga"
"github.com/canonical/identity-platform-admin-ui/internal/pool"
"github.com/canonical/identity-platform-admin-ui/internal/tracing"
"github.com/canonical/identity-platform-admin-ui/pkg/identities"
"github.com/kelseyhightower/envconfig"
kClient "github.com/ory/kratos-client-go"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -91,42 +84,14 @@ func createIdentity(identity kClient.CreateIdentityBody) (*kClient.Identity, err
wpool := pool.NewWorkerPool(1, tracer, monitor, logger)
defer wpool.Stop()

specs := new(config.EnvSpec)
if err := envconfig.Process("", specs); err != nil {
return nil, fmt.Errorf("failed to populate environment variables: %v", err)
// Initialize environment variables
specs, err := initializeEnv()
if err != nil {
panic(err)
}

// Set up Kratos client
kratosClient := kratos.NewClient(specs.KratosAdminURL, specs.Debug)

// Set up authorization service
openfgaConfig := openfga.NewConfig(
specs.ApiScheme,
specs.ApiHost,
specs.StoreId,
specs.ApiToken,
specs.ModelId,
specs.Debug,
tracer,
monitor,
logger,
)
openfgaClient := openfga.NewClient(openfgaConfig)
authorizer := authorization.NewAuthorizer(openfgaClient, wpool, tracer, monitor, logger)

// Set up email service
mailConfig := mail.NewConfig(
specs.MailHost,
specs.MailPort,
specs.MailUsername,
specs.MailPassword,
specs.MailFromAddress,
specs.MailSendTimeoutSeconds,
)
mailService := mail.NewEmailService(mailConfig, tracer, monitor, logger)

// Set up identity service
service := identities.NewService(kratosClient.IdentityAPI(), authorizer, mailService, tracer, monitor, logger)
// Initialize identity service
service := initializeIdentityService(specs, logger, tracer, monitor, wpool)

// Create the identity
identityData, err := service.CreateIdentity(ctx, &identity)
Expand Down
Loading