- adding the middleware metrics as optional

- fixed up the server test code

config.go

@@ -190,9 +190,6 @@ func readOptions(cx *cli.Context, config *Config) (err error) {
 	if cx.IsSet("skip-upstream-tls-verify") {
 		config.SkipUpstreamTLSVerify = cx.Bool("skip-upstream-tls-verify")
 	}
-	if cx.IsSet("enable-refresh-tokens") {
-		config.EnableRefreshTokens = cx.Bool("enable-refresh-tokens")
-	}
 	if cx.IsSet("encryption-key") {
 		config.EncryptionKey = cx.String("encryption-key")
 	}
@@ -226,12 +223,18 @@ func readOptions(cx *cli.Context, config *Config) (err error) {
 	if cx.IsSet("tls-ca-certificate") {
 		config.TLSCaCertificate = cx.String("tls-ca-certificate")
 	}
+	if cx.IsSet("enable-metrics") {
+		config.EnableMetrics = cx.Bool("enable-metrics")
+	}
 	if cx.IsSet("enable-proxy-protocol") {
 		config.EnableProxyProtocol = cx.Bool("enable-proxy-protocol")
 	}
 	if cx.IsSet("enable-forwarding") {
 		config.EnableForwarding = cx.Bool("enable-forwarding")
 	}
+	if cx.IsSet("enable-refresh-tokens") {
+		config.EnableRefreshTokens = cx.Bool("enable-refresh-tokens")
+	}
 	if cx.IsSet("forwarding-username") {
 		config.ForwardingUsername = cx.String("forwarding-username")
 	}
@@ -389,10 +392,6 @@ func getOptions() []cli.Flag {
 			Value:  "/oauth2/revoke",
 			EnvVar: "PROXY_REVOCATION_URL",
 		},
-		cli.BoolFlag{
-			Name:  "enable-metrics",
-			Usage: "enable the prometheus metrics collector",
-		},
 		cli.StringFlag{
 			Name:   "store-url",
 			Usage:  "url for the storage subsystem, e.g redis://127.0.0.1:6379, file:///etc/tokens.file",
@@ -448,6 +447,10 @@ func getOptions() []cli.Flag {
 			Name:  "hostname",
 			Usage: "a list of hostnames the service will respond to, defaults to all",
 		},
+		cli.BoolFlag{
+			Name:  "enable-metrics",
+			Usage: "enable the prometheus metrics collector on /oauth/metrics",
+		},
 		cli.BoolFlag{
 			Name:  "enable-proxy-protocol",
 			Usage: "whether to enable proxy protocol",

middleware.go

@@ -68,16 +68,10 @@ func (r *oauthProxy) metricsHandler() gin.HandlerFunc {
 		[]string{"code", "method"},
 	)
 
-	fmt.Println("ENBAKED")
-
 	// step: register the metric with prometheus
 	prometheus.MustRegisterOrGet(httpMetrics)
 
 	return func(cx *gin.Context) {
-
-		fmt.Println("ENBAKED")
-
-
 		// step: permit to next stage
 		cx.Next()
 		// step: update the metrics

proxy.go

@@ -21,7 +21,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 func newOauthProxyApp() *cli.App {
@@ -87,7 +87,7 @@ func newOauthProxyApp() *cli.App {
 	return app
 }
 
-// printUsage display the command line usage and error
+// printError display the command line usage and error
 func printError(message string, args ...interface{}) *cli.ExitError {
 	return cli.NewExitError(fmt.Sprintf("[error] "+message, args...), 1)
 }

server.go

@@ -94,8 +94,7 @@ func newProxy(config *Config) (*oauthProxy, error) {
 	}
 
 	// step: parse the upstream endpoint
-	service.endpoint, err = url.Parse(config.Upstream)
-	if err != nil {
+	if service.endpoint, err = url.Parse(config.Upstream); err != nil {
 		return nil, err
 	}
 
@@ -120,7 +119,7 @@ func newProxy(config *Config) (*oauthProxy, error) {
 		log.Warnf("Note: client credentials are not set, depending on provider (confidential|public) you might be able to auth")
 	}
 
-	// step:
+	// step: are we running in forwarding more?
 	switch config.EnableForwarding {
 	case true:
 		if err := createForwardingProxy(config, service); err != nil {
@@ -154,6 +153,11 @@ func createReverseProxy(config *Config, service *oauthProxy) error {
 		return err
 	}
 
+	// step: create the endpoints
+	if err := service.createEndpoints(); err != nil {
+		return err
+	}
+
 	// step: load the templates
 	if err := service.createTemplates(); err != nil {
 		return err
@@ -344,9 +348,9 @@ func (r *oauthProxy) createEndpoints() error {
 	}
 
 	// step: enabling the metrics?
-	//if r.config.EnableMetrics {
-	//	engine.Use(r.metricsHandler())
-	//}
+	if r.config.EnableMetrics {
+		engine.Use(r.metricsHandler())
+	}
 
 	// step: add the routing
 	oauth := engine.Group(oauthURL).Use(r.crossOriginResourceHandler(r.config.CrossOrigin))
@@ -358,9 +362,9 @@ func (r *oauthProxy) createEndpoints() error {
 		oauth.GET(expiredURL, r.expirationHandler)
 		oauth.GET(logoutURL, r.logoutHandler)
 		oauth.POST(loginURL, r.loginHandler)
-//		if r.config.EnableMetrics {
-//			oauth.GET(metricsURL, r.metricsEndpointHandler)
-//		}
+		if r.config.EnableMetrics {
+			oauth.GET(metricsURL, r.metricsEndpointHandler)
+		}
 	}
 
 	engine.Use(

server_test.go

@@ -129,11 +129,13 @@ func newTestProxyService(t *testing.T, config *Config) (*oauthProxy, *fakeOAuthS
 	if config == nil {
 		config = newFakeKeycloakConfig()
 	}
+
 	// step: set the config
 	config.LogRequests = true
 	config.SkipTokenVerification = false
 	config.DiscoveryURL = auth.getLocation()
 	config.Verbose = false
+
 	// step: create a proxy
 	proxy, err := newProxy(config)
 	if err != nil {