Merge pull request #15 from owncloud/update-konnect

Update konnect to IljaN/konnect v0.29.0-alpha2

go.mod

@@ -22,4 +22,4 @@ require (
 	stash.kopano.io/kc/konnect v0.28.0
 )
 
-replace stash.kopano.io/kc/konnect => github.com/IljaN/konnect v0.29.0-alpha
+replace stash.kopano.io/kc/konnect => github.com/IljaN/konnect v0.29.0-alpha2

go.sum

@@ -35,8 +35,8 @@ github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvd
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/IljaN/konnect v0.29.0-alpha h1:KSfpqj81eRAXXIqTVrfmldZB8cepy5sKjpzjfScFTJc=
-github.com/IljaN/konnect v0.29.0-alpha/go.mod h1:DtAxcWYgNwqm8c9p/U8kDSh2WCvLqcl22N2RQaMrqv8=
+github.com/IljaN/konnect v0.29.0-alpha2 h1:1p8+000BVllYPlago1X4gFNWaqQp7iTCM9DA7EoJExk=
+github.com/IljaN/konnect v0.29.0-alpha2/go.mod h1:4Q7yo5HXdvjvAGXz6PGAcEfQ4EuRQrVUuUPbMqy7mw8=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
@@ -176,8 +176,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-ini/ini v1.44.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-ldap/ldap/v3 v3.1.3 h1:RIgdpHXJpsUqUK5WXwKyVsESrGFqo5BRWPk3RR4/ogQ=
-github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8=
+github.com/go-ldap/ldap/v3 v3.1.5 h1:5o1ik2It7MJoXwoS7JXWUebf18L7E1VWBBgYV/iVsN0=
+github.com/go-ldap/ldap/v3 v3.1.5/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
 github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U=
 github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -826,6 +826,8 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.4.0 h1:0kXPskUMGAXXWJlP05ktEMOV0vmzFQUWw6d+aZJQU8A=
 gopkg.in/square/go-jose.v2 v2.4.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/square/go-jose.v2 v2.4.1 h1:H0TmLt7/KmzlrDOpa1F+zr0Tk90PbJYBfsVUmRLrf9Y=
+gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=

pkg/flagset/flagset.go

@@ -162,7 +162,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Usage:       "OIDC issuer URL",
 			EnvVars:     []string{"KONNECTD_ISS"},
 			Value:       "https://127.0.0.1:9130",
-			Destination: &cfg.Konnectd.ISS,
+			Destination: &cfg.Konnectd.Iss,
 		},
 		&cli.StringSliceFlag{
 			Name:    "signing-private-key",
@@ -210,14 +210,14 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Usage:       "Custom redirection URI to sign-in form",
 			EnvVars:     []string{"KONNECTD_SIGN_IN_URI"},
 			Value:       "",
-			Destination: &cfg.Konnectd.SignInUri,
+			Destination: &cfg.Konnectd.SignInURI,
 		},
 		&cli.StringFlag{
 			Name:        "signed-out-uri",
 			Usage:       "Custom redirection URI to signed-out goodbye page",
 			EnvVars:     []string{"KONNECTD_SIGN_OUT_URI"},
 			Value:       "",
-			Destination: &cfg.Konnectd.SignedOutUri,
+			Destination: &cfg.Konnectd.SignedOutURI,
 		},
 		&cli.StringFlag{
 			Name:        "authorization-endpoint-uri",

pkg/service/v0/service.go

@@ -41,8 +41,9 @@ func NewService(opts ...Option) Service {
 		logger.Fatal().Err(err).Msg("Could not bootstrap konnectd")
 	}
 
-	routes := []server.WithRoutes{bs.Managers.Must("identity").(server.WithRoutes)}
-	handlers := bs.Managers.Must("handler").(http.Handler)
+	managers := bs.Managers()
+	routes := []server.WithRoutes{managers.Must("identity").(server.WithRoutes)}
+	handlers := managers.Must("handler").(http.Handler)
 
 	return Konnectd{
 		config: options.Config,