satellite/console: payments api #3297
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crawter
changed the title
ghost
removed their request for review
crawter
added
Request Code Review
egonelbre
requested changes
Oct 17, 2019
|
|
||
| err = json.NewEncoder(w).Encode(balanceResponse) | ||
| if err != nil { | ||
| p.serveJSONError(w, http.StatusInternalServerError, err) |
There was a problem hiding this comment.
Since the json NewEncoder already started writing something, it will double write the header.
egonelbre
previously approved these changes
Oct 17, 2019
| mux.Handle("/api/v0/token", http.HandlerFunc(server.tokenHandler)) | ||
| paymentController := consoleapi.NewPayments(logger, service) | ||
| paymentsRouter := router.PathPrefix("/api/v0/payments").Subrouter() | ||
| paymentsRouter.Handle("/cards", http.HandlerFunc(paymentController.AddCreditCard)).Methods(http.MethodPost) |
There was a problem hiding this comment.
Ah, just noticed this... mux.Router has HandleFunc, so you don't have to cast everything to HandlerFunc
rikysya
reviewed
Oct 17, 2019
satellite/api.go
Outdated
| @@ -363,11 +364,16 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, pointerDB metai | |||
| if consoleConfig.AuthTokenSecret == "" { | |||
| return nil, errs.New("Auth token secret required") | |||
| } | |||
|
|
|||
| paymentsConfig := stripecoinpayments.Config{} | |||
There was a problem hiding this comment.
Why do we have to create config here?
rikysya
reviewed
Oct 17, 2019
| var err error | ||
| defer mon.Task()(&ctx)(&err) | ||
|
|
||
| balance, err := p.service.Payments().AccountBalance(ctx) |
| return | ||
| } | ||
|
|
||
| err = p.service.Payments().AddCreditCard(ctx, requestBody.Token) |
satellite/peer.go
Outdated
| @@ -592,11 +592,15 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, pointerDB metainfo | |||
| return nil, errs.New("Auth token secret required") | |||
| } | |||
|
|
|||
| paymentsConfig := stripecoinpayments.Config{} | |||
There was a problem hiding this comment.
Why do we create config here
rikysya
reviewed
Oct 17, 2019
| var err error | ||
| defer mon.Task()(&ctx)(&err) | ||
|
|
||
| err = p.service.Payments().SetupAccount(ctx) |
rikysya
changed the title
rikysya
reviewed
Oct 17, 2019
|
|
||
| // authorize checks request for authorization token, validates it and updates context with auth data. | ||
| func (p *Payments) authorize(ctx context.Context, r *http.Request) (context.Context, error) { | ||
| tokenCookie, err := r.Cookie("_tokenKey") |
There was a problem hiding this comment.
api doesn't use coockie auth
| } | ||
|
|
||
| auth, err := p.service.Authorize(auth.WithAPIKey(ctx, []byte(tokenCookie.Value))) | ||
| if err != nil { |
There was a problem hiding this comment.
if err add error to context
rikysya
reviewed
Oct 17, 2019
satellite/api.go
Outdated
| @@ -363,11 +364,16 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, pointerDB metai | |||
| if consoleConfig.AuthTokenSecret == "" { | |||
| return nil, errs.New("Auth token secret required") | |||
| } | |||
|
|
|||
| paymentsConfig := config.Payments | |||
| payments := stripecoinpayments.NewService(paymentsConfig, peer.DB.Customers()) | |||
There was a problem hiding this comment.
you can use config.Payments directly
| @@ -49,11 +50,15 @@ func TestGrapqhlMutation(t *testing.T) { | |||
|
|
|||
| log := zaptest.NewLogger(t) | |||
|
|
|||
| paymentsConfig := stripecoinpayments.Config{} | |||
| payments := stripecoinpayments.NewService(paymentsConfig, db.Customers()) | |||
There was a problem hiding this comment.
you can use config.Payments directly
|
|
||
| passwordCost int | ||
| } | ||
|
|
||
| // PaymentsService separates all payment related functionality | ||
| type PaymentsService struct { | ||
| service *Service |
There was a problem hiding this comment.
smth with console would make more sense
rikysya
approved these changes
Oct 17, 2019
Qweder93
approved these changes
Oct 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What:
satellite/console/serviceextended with payments functionalityWhy:
Please describe the tests:
Please describe the performance impact:
Code Review Checklist (to be filled out by reviewer)