Skip to content

NOISSUE - Fix SMTP Notifier #73

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

Draft
ianmuchyri wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

NOISSUE - Fix SMTP Notifier #73

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
55730a6
update docker and authentication
ianmuchyri Mar 14, 2025
7185cb7
update smtp
ianmuchyri Mar 14, 2025
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
5 changes: 4 additions & 1 deletion cmd/smpp-notifier/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/absmach/supermq/pkg/ulid"
"github.com/absmach/supermq/pkg/uuid"
"github.com/caarlos0/env/v10"
"github.com/go-chi/chi/v5"
"github.com/jmoiron/sqlx"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -167,7 +168,9 @@ func main() {
return
}

hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger)
mux := chi.NewRouter()

hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, mux, logger, cfg.InstanceID, authn), logger)

if cfg.SendTelemetry {
chc := chclient.New(svcName, supermq.Version, logger, cancel)
Expand Down
5 changes: 4 additions & 1 deletion cmd/smtp-notifier/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/absmach/supermq/pkg/ulid"
"github.com/absmach/supermq/pkg/uuid"
"github.com/caarlos0/env/v10"
"github.com/go-chi/chi/v5"
"github.com/jmoiron/sqlx"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -166,7 +167,9 @@ func main() {
return
}

hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger)
mux := chi.NewRouter()

hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, mux, logger, cfg.InstanceID, authn), logger)

if cfg.SendTelemetry {
chc := chclient.New(svcName, supermq.Version, logger, cancel)
Expand Down
23 changes: 5 additions & 18 deletions consumers/notifiers/api/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ func createSubscriptionEndpoint(svc notifiers.Service) endpoint.Endpoint {
Contact: req.Contact,
Topic: req.Topic,
}
id, err := svc.CreateSubscription(ctx, session, sub)
newSub, err := svc.CreateSubscription(ctx, session, sub)
if err != nil {
return createSubRes{}, err
}

ucr := createSubRes{
ID: id,
Subscription: newSub,
}

return ucr, nil
Expand All @@ -56,10 +57,7 @@ func viewSubscriptionEndpint(svc notifiers.Service) endpoint.Endpoint {
return viewSubRes{}, err
}
res := viewSubRes{
ID: sub.ID,
OwnerID: sub.OwnerID,
Contact: sub.Contact,
Topic: sub.Topic,
Subscription: sub,
}
return res, nil
}
Expand All @@ -86,18 +84,7 @@ func listSubscriptionsEndpoint(svc notifiers.Service) endpoint.Endpoint {
return listSubsRes{}, err
}
res := listSubsRes{
Offset: page.Offset,
Limit: page.Limit,
Total: page.Total,
}
for _, sub := range page.Subscriptions {
r := viewSubRes{
ID: sub.ID,
OwnerID: sub.OwnerID,
Contact: sub.Contact,
Topic: sub.Topic,
}
res.Subscriptions = append(res.Subscriptions, r)
Page: page,
}

return res, nil
Expand Down
Loading
Loading