Skip to content

Commit 3d0748d

Browse files
authored
Merge pull request #580 from textileio/jsign/disablesignups
signups: disable them
2 parents 83c7ba5 + 1395294 commit 3d0748d

1 file changed

Lines changed: 2 additions & 84 deletions

File tree

api/hubd/service.go

Lines changed: 2 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
pow "github.com/textileio/powergate/v2/api/client"
1919
"github.com/textileio/textile/v2/api/billingd/analytics"
2020
billing "github.com/textileio/textile/v2/api/billingd/client"
21-
"github.com/textileio/textile/v2/api/common"
2221
pb "github.com/textileio/textile/v2/api/hubd/pb"
2322
"github.com/textileio/textile/v2/buckets"
2423
bi "github.com/textileio/textile/v2/buildinfo"
@@ -27,7 +26,6 @@ import (
2726
mdb "github.com/textileio/textile/v2/mongodb"
2827
tdb "github.com/textileio/textile/v2/threaddb"
2928
"github.com/textileio/textile/v2/util"
30-
"go.mongodb.org/mongo-driver/mongo"
3129
"google.golang.org/grpc/codes"
3230
"google.golang.org/grpc/status"
3331
)
@@ -72,88 +70,8 @@ func (s *Service) BuildInfo(_ context.Context, _ *pb.BuildInfoRequest) (*pb.Buil
7270
func (s *Service) Signup(ctx context.Context, req *pb.SignupRequest) (*pb.SignupResponse, error) {
7371
log.Debugf("received signup request")
7472

75-
if err := s.Collections.Accounts.ValidateUsername(req.Username); err != nil {
76-
return nil, status.Error(codes.FailedPrecondition, err.Error())
77-
}
78-
if _, err := mail.ParseAddress(req.Email); err != nil {
79-
return nil, status.Error(codes.FailedPrecondition, "Email address in not valid")
80-
}
81-
82-
secret := getSessionSecret(s.EmailSessionSecret)
83-
ectx, cancel := context.WithTimeout(ctx, emailTimeout)
84-
defer cancel()
85-
if err := s.EmailClient.ConfirmAddress(ectx, req.Email, req.Username, req.Email, s.GatewayURL, secret); err != nil {
86-
return nil, err
87-
}
88-
if !s.awaitVerification(secret) {
89-
return nil, status.Error(codes.Unauthenticated, "Could not verify email address")
90-
}
91-
92-
var powInfo *mdb.PowInfo
93-
if s.PowergateClient != nil {
94-
res, err := s.PowergateClient.Admin.Users.Create(s.powergateAdminCtx(ctx))
95-
if err != nil {
96-
return nil, status.Errorf(codes.Internal, "Unable to create user: %v", err)
97-
}
98-
powInfo = &mdb.PowInfo{ID: res.User.Id, Token: res.User.Token}
99-
}
100-
101-
dev, err := s.Collections.Accounts.CreateDev(ctx, req.Username, req.Email, powInfo)
102-
if err != nil {
103-
return nil, status.Error(codes.FailedPrecondition, "Account exists")
104-
}
105-
session, err := s.Collections.Sessions.Create(ctx, dev.Key)
106-
if err != nil {
107-
return nil, err
108-
}
109-
ctx = common.NewSessionContext(ctx, session.ID)
110-
tok, err := s.Threads.GetToken(ctx, dev.Secret)
111-
if err != nil {
112-
return nil, err
113-
}
114-
if err := s.Collections.Accounts.SetToken(ctx, dev.Key, tok); err != nil {
115-
return nil, err
116-
}
117-
118-
// Check for pending invites
119-
invites, err := s.Collections.Invites.ListByEmail(ctx, dev.Email)
120-
if err != nil {
121-
return nil, err
122-
}
123-
for _, invite := range invites {
124-
if invite.Accepted {
125-
if err := s.Collections.Accounts.AddMember(ctx, invite.Org, mdb.Member{
126-
Key: dev.Key,
127-
Username: dev.Username,
128-
Role: mdb.OrgMember,
129-
}); err != nil {
130-
if err == mongo.ErrNoDocuments {
131-
if err := s.Collections.Invites.Delete(ctx, invite.Token); err != nil {
132-
return nil, err
133-
}
134-
} else {
135-
return nil, err
136-
}
137-
}
138-
if err := s.Collections.Invites.Delete(ctx, invite.Token); err != nil {
139-
return nil, err
140-
}
141-
}
142-
if time.Now().After(invite.ExpiresAt) {
143-
if err := s.Collections.Invites.Delete(ctx, invite.Token); err != nil {
144-
return nil, err
145-
}
146-
}
147-
}
148-
149-
key, err := dev.Key.MarshalBinary()
150-
if err != nil {
151-
return nil, err
152-
}
153-
return &pb.SignupResponse{
154-
Key: key,
155-
Session: session.ID,
156-
}, nil
73+
// NOTICE: this is an ad-hoc change to disable signups due to the Hub shutdown.
74+
return nil, fmt.Errorf("signups are disabled")
15775
}
15876

15977
func (s *Service) Signin(ctx context.Context, req *pb.SigninRequest) (*pb.SigninResponse, error) {

0 commit comments

Comments
 (0)