Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Use new hydra sdk #171

Merged
merged 2 commits into from
Nov 1, 2019
Merged

Use new hydra sdk #171

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
36793cb
go get -u -d github.com/ory/hydra/sdk/go/...
gedorinku Nov 1, 2019
aa36fe5
Use new hydra sdk
gedorinku Nov 1, 2019
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
23 changes: 14 additions & 9 deletions app/di/client_component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package di

import (
"context"
"net/url"

hydra "github.com/ory/hydra-legacy-sdk"
"github.com/ory/hydra/sdk/go/hydra/client"
"github.com/pkg/errors"

"github.com/ProgrammingLab/prolab-accounts/app/config"
Expand All @@ -13,7 +14,7 @@ import (

// ClientComponent is an interface of api clients
type ClientComponent interface {
HydraClient(ctx context.Context) *hydra.CodeGenSDK
HydraClient(ctx context.Context) *client.OryHydra
EmailSender(ctx context.Context) email.Sender
}

Expand All @@ -36,24 +37,28 @@ func NewClientComponent(cfg *config.Config) (ClientComponent, error) {
}, nil
}

func newHydraClient(cfg *config.Config) (*hydra.CodeGenSDK, error) {
hc := &hydra.Configuration{
AdminURL: cfg.HydraAdminURL,
}
cli, err := hydra.NewSDK(hc)
func newHydraClient(cfg *config.Config) (*client.OryHydra, error) {
adminURL, err := url.Parse(cfg.HydraAdminURL)
if err != nil {
return nil, errors.WithStack(err)
}

cliCfg := &client.TransportConfig{
Schemes: []string{adminURL.Scheme},
Host: adminURL.Host,
BasePath: adminURL.Path,
}
cli := client.NewHTTPClientWithConfig(nil, cliCfg)
return cli, nil
}

type clientComponentImpl struct {
cfg *config.Config
hydraCli *hydra.CodeGenSDK
hydraCli *client.OryHydra
emails *static.EmailAsset
}

func (c *clientComponentImpl) HydraClient(ctx context.Context) *hydra.CodeGenSDK {
func (c *clientComponentImpl) HydraClient(ctx context.Context) *client.OryHydra {
return c.hydraCli
}

Expand Down
157 changes: 76 additions & 81 deletions app/server/oauth_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@ package server
import (
"context"
"database/sql"
"encoding/json"
"net/http"
"strconv"
"time"

"github.com/izumin5210/grapi/pkg/grapiserver"
"github.com/ory/hydra-legacy-sdk/swagger"
"github.com/ory/hydra/sdk/go/hydra/client/admin"
"github.com/ory/hydra/sdk/go/hydra/models"
"github.com/pkg/errors"
"golang.org/x/crypto/bcrypt"
"google.golang.org/grpc/status"

api_pb "github.com/ProgrammingLab/prolab-accounts/api"
type_pb "github.com/ProgrammingLab/prolab-accounts/api/type"
"github.com/ProgrammingLab/prolab-accounts/app/di"
"github.com/ProgrammingLab/prolab-accounts/app/util"
)

// OAuthServiceServer is a composite interface of api_pb.OAuthServiceServer and grapiserver.Server.
Expand All @@ -42,26 +39,28 @@ type oAuthServiceServerImpl struct {
func (s *oAuthServiceServerImpl) StartOAuthLogin(ctx context.Context, req *api_pb.StartOAuthLoginRequest) (*api_pb.StartOAuthLoginResponse, error) {
cli := s.HydraClient(ctx)
challenge := req.GetLoginChallenge()
res, resp, err := cli.GetLoginRequest(challenge)
params := &admin.GetLoginRequestParams{
Context: ctx,
LoginChallenge: challenge,
}
res, err := cli.Admin.GetLoginRequest(params)
if err != nil {
return nil, errors.WithStack(err)
}
if err := hydraError(resp); err != nil {
return nil, err
}

if res.Skip {
res, resp, err := cli.AcceptLoginRequest(challenge, swagger.AcceptLoginRequest{})
if res.Payload.Skip {
params := &admin.AcceptLoginRequestParams{
Context: ctx,
LoginChallenge: challenge,
}
res, err := cli.Admin.AcceptLoginRequest(params)
if err != nil {
return nil, errors.WithStack(err)
}
if err := hydraError(resp); err != nil {
return nil, err
}

return &api_pb.StartOAuthLoginResponse{
Skip: true,
RedirectUrl: res.RedirectTo,
RedirectUrl: res.Payload.RedirectTo,
}, nil
}

Expand All @@ -81,130 +80,126 @@ func (s *oAuthServiceServerImpl) OAuthLogin(ctx context.Context, req *api_pb.OAu
}

cli := s.HydraClient(ctx)
acReq := swagger.AcceptLoginRequest{
Subject: strconv.FormatInt(int64(session.UserID), 10),
Remember: req.Remember,
RememberFor: int64(time.Hour.Seconds()),
}
res, resp, err := cli.AcceptLoginRequest(req.GetLoginChallenge(), acReq)
sub := strconv.FormatInt(int64(session.UserID), 10)
params := &admin.AcceptLoginRequestParams{
Context: ctx,
LoginChallenge: req.GetLoginChallenge(),
Body: &models.HandledLoginRequest{
Subject: &sub,
Remember: req.Remember,
RememberFor: int64(time.Hour.Seconds()),
},
}
res, err := cli.Admin.AcceptLoginRequest(params)
if err != nil {
return nil, err
}
if err := hydraError(resp); err != nil {
return nil, err
}

return &api_pb.OAuthLoginResponse{
RedirectUrl: res.RedirectTo,
RedirectUrl: res.Payload.RedirectTo,
}, nil
}

func (s *oAuthServiceServerImpl) StartOAuthConsent(ctx context.Context, req *api_pb.StartOAuthConsentRequest) (*api_pb.StartOAuthConsentResponse, error) {
cli := s.HydraClient(ctx)
challenge := req.GetConsentChallenge()
res, resp, err := cli.GetConsentRequest(challenge)
if err != nil {
return nil, err
params := &admin.GetConsentRequestParams{
Context: ctx,
ConsentChallenge: challenge,
}
if err := hydraError(resp); err != nil {
res, err := cli.Admin.GetConsentRequest(params)
if err != nil {
return nil, err
}

if res.Skip {
req := swagger.AcceptConsentRequest{
GrantScope: res.RequestedScope,
GrantAccessTokenAudience: res.RequestedAccessTokenAudience,
if res.Payload.Skip {
body := &models.HandledConsentRequest{
GrantedScope: res.Payload.RequestedScope,
GrantedAudience: res.Payload.RequestedAudience,
}
res, resp, err := cli.AcceptConsentRequest(challenge, req)
if err != nil {
return nil, err
params := &admin.AcceptConsentRequestParams{
Context: ctx,
ConsentChallenge: challenge,
Body: body,
}
if err := hydraError(resp); err != nil {
res, err := cli.Admin.AcceptConsentRequest(params)
if err != nil {
return nil, err
}

return &api_pb.StartOAuthConsentResponse{
Skip: true,
RedirectUrl: res.RedirectTo,
RedirectUrl: res.Payload.RedirectTo,
}, nil
}

return &api_pb.StartOAuthConsentResponse{
Skip: false,
RequestedScopes: res.RequestedScope,
Client: clientToResponse(res.Client),
RequestedScopes: res.Payload.RequestedScope,
Client: clientToResponse(res.Payload.Client),
}, nil
}

func (s *oAuthServiceServerImpl) OAuthConsent(ctx context.Context, req *api_pb.OAuthConsentRequest) (*api_pb.OAuthConsentResponse, error) {
challenge := req.GetConsentChallenge()
cli := s.HydraClient(ctx)
if req.GetAccept() {
cons, resp, err := cli.GetConsentRequest(challenge)
if err != nil {
return nil, err
params := &admin.GetConsentRequestParams{
Context: ctx,
ConsentChallenge: challenge,
}
if err := hydraError(resp); err != nil {
cons, err := cli.Admin.GetConsentRequest(params)
if err != nil {
return nil, err
}

acReq := swagger.AcceptConsentRequest{
GrantScope: req.GetGrantScopes(),
GrantAccessTokenAudience: cons.RequestedAccessTokenAudience,
Remember: req.GetRemember(),
RememberFor: int64(time.Hour.Seconds()),
body := &models.HandledConsentRequest{
GrantedScope: req.GetGrantScopes(),
GrantedAudience: cons.Payload.RequestedAudience,
Remember: req.GetRemember(),
RememberFor: int64(time.Hour.Seconds()),
}
res, resp, err := cli.AcceptConsentRequest(challenge, acReq)
if err != nil {
return nil, err
acParams := &admin.AcceptConsentRequestParams{
Context: ctx,
ConsentChallenge: challenge,
Body: body,
}
if err := hydraError(resp); err != nil {
res, err := cli.Admin.AcceptConsentRequest(acParams)
if err != nil {
return nil, err
}

return &api_pb.OAuthConsentResponse{
RedirectUrl: res.RedirectTo,
RedirectUrl: res.Payload.RedirectTo,
}, nil
}

rej := swagger.RejectRequest{
Error_: "access_denied",
ErrorDescription: "The resource owner denied the request",
body := &models.RequestDeniedError{
Name: "access_denied",
Description: "The resource owner denied the request",
}
res, resp, err := cli.RejectConsentRequest(challenge, rej)
if err != nil {
return nil, err
params := &admin.RejectConsentRequestParams{
Context: ctx,
Body: body,
ConsentChallenge: challenge,
}
if err := hydraError(resp); err != nil {
res, err := cli.Admin.RejectConsentRequest(params)
if err != nil {
return nil, err
}

return &api_pb.OAuthConsentResponse{
RedirectUrl: res.RedirectTo,
RedirectUrl: res.Payload.RedirectTo,
}, nil
}

func clientToResponse(cli swagger.OAuth2Client) *type_pb.Client {
func clientToResponse(cli *models.Client) *type_pb.Client {
return &type_pb.Client{
Id: cli.ClientId,
Name: cli.ClientName,
Uri: cli.ClientUri,
Id: cli.ClientID,
Name: cli.Name,
Uri: cli.ClientURI,
Contacts: cli.Contacts,
LogoUri: cli.LogoUri,
LogoUri: cli.LogoURI,
Owner: cli.Owner,
}
}

func hydraError(resp *swagger.APIResponse) error {
defer resp.Body.Close()
if resp.StatusCode == http.StatusOK {
return nil
}

generic := &swagger.GenericError{}
err := json.Unmarshal(resp.Payload, generic)
if err != nil {
return errors.WithStack(err)
}
return status.Error(util.CodeFromHTTPStatus(resp.StatusCode), generic.Error_)
}
20 changes: 10 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ go 1.12

require (
github.com/PuerkitoBio/goquery v1.5.0 // indirect
github.com/go-openapi/analysis v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/loads v0.19.4 // indirect
github.com/go-openapi/runtime v0.19.7 // indirect
github.com/go-openapi/spec v0.19.4 // indirect
github.com/go-openapi/validate v0.19.4 // indirect
github.com/go-redis/redis v6.14.1+incompatible
github.com/gobuffalo/envy v1.7.0 // indirect
github.com/gobuffalo/packr/v2 v2.1.0
github.com/gobwas/glob v0.2.3
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/gogo/protobuf v1.2.1
github.com/golang/mock v1.3.1 // indirect
github.com/golang/protobuf v1.3.2
github.com/google/wire v0.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.6
Expand All @@ -20,35 +24,31 @@ require (
github.com/jordan-wright/email v0.0.0-20180115032944-94ae17dedda2
github.com/kat-co/vala v0.0.0-20140812221447-bfe9b50e828a
github.com/kelseyhightower/envconfig v1.3.0
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/lib/pq v1.2.0
github.com/magiconair/properties v1.8.1 // indirect
github.com/mailru/easyjson v0.7.0 // indirect
github.com/minio/minio-go v0.0.0-20190207005939-34f2b94c43ca
github.com/mmcdole/gofeed v1.0.0-beta2
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
github.com/mwitkow/go-proto-validators v0.0.0-20190212092829-1f388280e944
github.com/onsi/ginkgo v1.7.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/ory/hydra v1.0.8
github.com/ory/hydra-legacy-sdk v0.0.0-20190409103449-1f564942be76
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/pkg/errors v0.8.1
github.com/rs/cors v1.6.0
github.com/shurcooL/githubv4 v0.0.0-20190119021625-d9689b595017
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0
github.com/srvc/appctx v0.1.0
github.com/volatiletech/inflect v0.0.0-20170731032912-e7201282ae8d // indirect
github.com/volatiletech/null v8.0.0+incompatible
github.com/volatiletech/sqlboiler v3.2.0+incompatible
go.mongodb.org/mongo-driver v1.1.2 // indirect
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab // indirect
google.golang.org/appengine v1.6.1 // indirect
google.golang.org/genproto v0.0.0-20190817000702-55e96fffbd48
google.golang.org/grpc v1.23.0
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
Expand Down
Loading