mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-23 13:30:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Integrate ocis-graph-explorer with ocis-konnect

Browse Source
This commit is contained in:
Thomas Müller
2020-01-27 16:12:16 +01:00
parent a1fd96f11d
commit 950fb7e8b2
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -178,4 +178,4 @@ watch:
# protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json
assets:
mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.1/release.tar.gz | tar xvzf - -C assets/
mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.2/release.tar.gz | tar xvzf - -C assets/

10
pkg/assets/embed.go
View File

File diff suppressed because one or more lines are too long

9
pkg/command/server.go
View File

@@ -152,7 +152,14 @@ func Server(cfg *config.Config) cli.Command {
}
gr.Add(func() error {
return server.Run()
err := server.Run()
if err != nil {
logger.Error().
Err(err).
Str("transport", "http").
Msg("Failed to start server")
}
return err
}, func(_ error) {
logger.Info().
Str("transport", "http").

8
pkg/flagset/flagset.go
View File

@@ -35,7 +35,7 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag {
return []cli.Flag{
&cli.StringFlag{
Name: "debug-addr",
Value: "0.0.0.0:9134",
Value: "0.0.0.0:9136",
Usage: "Address to debug endpoint",
EnvVar: "GRAPH_EXPLORER_DEBUG_ADDR",
Destination: &cfg.Debug.Addr,
@@ -82,7 +82,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "debug-addr",
Value: "0.0.0.0:9134",
Value: "0.0.0.0:9136",
Usage: "Address to bind debug server",
EnvVar: "GRAPH_EXPLORER_DEBUG_ADDR",
Destination: &cfg.Debug.Addr,
@@ -129,14 +129,14 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "issuer",
Value: "http://localhost:9130",
Value: "https://localhost:9130",
Usage: "Set the OpenID Connect Provider",
EnvVar: "GRAPH_EXPLORER_ISSUER",
Destination: &cfg.GraphExplorer.Issuer,
},
&cli.StringFlag{
Name: "client-id",
Value: "graph_explorer",
Value: "ocis-explorer.js",
Usage: "Set the OpenID Client ID to send to the issuer",
EnvVar: "GRAPH_EXPLORER_CLIENT_ID",
Destination: &cfg.GraphExplorer.ClientID,

5
pkg/service/v0/service.go
View File

@@ -12,11 +12,6 @@ import (
"github.com/owncloud/ocis-pkg/log"
)
var (
// ErrConfigInvalid is returned when the config parse is invalid.
ErrConfigInvalid = `Invalid or missing config`
)
// Service defines the extension handlers.
type Service interface {
ServeHTTP(http.ResponseWriter, *http.Request)