Skip to content

Commit f01a391

Browse files
author
Shlomi Noach
authored
Merge pull request #245 from outbrain/remove-oauth
removed oauth code; not ready yet
2 parents 1765789 + 436e83e commit f01a391

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

go/app/http.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,15 @@ import (
2525
"github.com/martini-contrib/auth"
2626
"github.com/martini-contrib/gzip"
2727
"github.com/martini-contrib/render"
28-
"github.com/martini-contrib/sessions"
2928
"github.com/outbrain/golib/log"
3029
"github.com/outbrain/orchestrator/go/config"
3130
"github.com/outbrain/orchestrator/go/http"
3231
"github.com/outbrain/orchestrator/go/inst"
3332
"github.com/outbrain/orchestrator/go/logic"
3433
"github.com/outbrain/orchestrator/go/process"
3534
"github.com/outbrain/orchestrator/go/ssl"
36-
37-
martinioauth2 "github.com/martini-contrib/oauth2"
38-
golang_oauth2 "golang.org/x/oauth2"
3935
)
4036

41-
var oauthStateString = process.ProcessToken.Hash
4237
var sslPEMPassword []byte
4338
var agentSSLPEMPassword []byte
4439

@@ -97,19 +92,6 @@ func standardHttp(discovery bool) {
9792
return auth.SecureCompare(username, config.Config.HTTPAuthUser) && auth.SecureCompare(password, config.Config.HTTPAuthPassword)
9893
}))
9994
}
100-
case "oauth":
101-
{
102-
oauthConf := &golang_oauth2.Config{
103-
ClientID: config.Config.OAuthClientId,
104-
ClientSecret: config.Config.OAuthClientSecret,
105-
Scopes: config.Config.OAuthScopes,
106-
RedirectURL: "http://localhost:3000/oauth2callback",
107-
}
108-
m.Use(sessions.Sessions("oauth_session", sessions.NewCookieStore([]byte("oauth_secret"))))
109-
m.Use(martinioauth2.Github(oauthConf))
110-
m.Use(martinioauth2.LoginRequired)
111-
m.Map(auth.User(""))
112-
}
11395
default:
11496
{
11597
// We inject a dummy User object because we have function signatures with User argument in api.go

0 commit comments

Comments
 (0)