Browse Source

More inlining

pull/20/head
Kegan Dougal 8 years ago
parent
commit
52f3fc853d
  1. 7
      src/github.com/matrix-org/go-neb/realms/jira/jira.go

7
src/github.com/matrix-org/go-neb/realms/jira/jira.go

@ -238,15 +238,13 @@ func (r *JIRARealm) ProjectKeyExists(userID, projectKey string) (bool, error) {
// JIRAClient returns an authenticated jira.Client for the given userID. Returns an unauthenticated // JIRAClient returns an authenticated jira.Client for the given userID. Returns an unauthenticated
// client if allowUnauth is true and no authenticated session is found, else returns an error. // client if allowUnauth is true and no authenticated session is found, else returns an error.
func (r *JIRARealm) JIRAClient(userID string, allowUnauth bool) (*jira.Client, error) { func (r *JIRARealm) JIRAClient(userID string, allowUnauth bool) (*jira.Client, error) {
var cli *jira.Client
// Check if user has an auth session. // Check if user has an auth session.
session, err := database.GetServiceDB().LoadAuthSessionByUser(r.id, userID) session, err := database.GetServiceDB().LoadAuthSessionByUser(r.id, userID)
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
if allowUnauth { if allowUnauth {
// make an unauthenticated client // make an unauthenticated client
cli, err = jira.NewClient(nil, r.JIRAEndpoint)
return cli, err
return jira.NewClient(nil, r.JIRAEndpoint)
} }
return nil, errors.New("No authenticated session found for " + userID) return nil, errors.New("No authenticated session found for " + userID)
} }
@ -273,8 +271,7 @@ func (r *JIRARealm) JIRAClient(userID string, allowUnauth bool) (*jira.Client, e
context.TODO(), context.TODO(),
oauth1.NewToken(jsession.AccessToken, jsession.AccessSecret), oauth1.NewToken(jsession.AccessToken, jsession.AccessSecret),
) )
cli, err = jira.NewClient(httpClient, r.JIRAEndpoint)
return cli, err
return jira.NewClient(httpClient, r.JIRAEndpoint)
} }
func (r *JIRARealm) ensureInited() error { func (r *JIRARealm) ensureInited() error {

Loading…
Cancel
Save