include client id in openid config for frontend

... if OIDC is enabled.
weaviate · Jul 12, 2019 · 294abcc · 294abcc
1 parent 12cbb90
commit 294abcc
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/adapters/handlers/rest/doc.go b/adapters/handlers/rest/doc.go
@@ -19,7 +19,7 @@ Decentralised Knowledge Graph
       https
     Host: localhost
     BasePath: /weaviate/v1
-    Version: 0.16.1
+    Version: 0.16.2
     Contact: Weaviate<hello@semi.technology> https://github.com/semi-technologies
 
     Consumes:

diff --git a/adapters/handlers/rest/embedded_spec.go b/adapters/handlers/rest/embedded_spec.go
@@ -47,7 +47,7 @@ func init() {
       "url": "https://github.com/semi-technologies",
       "email": "hello@semi.technology"
     },
-    "version": "0.16.1"
+    "version": "0.16.2"
   },
   "basePath": "/weaviate/v1",
   "paths": {
@@ -66,6 +66,10 @@ func init() {
             "schema": {
               "type": "object",
               "properties": {
+                "clientId": {
+                  "description": "OAuth Client ID",
+                  "type": "string"
+                },
                 "href": {
                   "description": "The Location to redirect to",
                   "type": "string"
@@ -3157,7 +3161,7 @@ func init() {
       "url": "https://github.com/semi-technologies",
       "email": "hello@semi.technology"
     },
-    "version": "0.16.1"
+    "version": "0.16.2"
   },
   "basePath": "/weaviate/v1",
   "paths": {
@@ -3176,6 +3180,10 @@ func init() {
             "schema": {
               "type": "object",
               "properties": {
+                "clientId": {
+                  "description": "OAuth Client ID",
+                  "type": "string"
+                },
                 "href": {
                   "description": "The Location to redirect to",
                   "type": "string"

diff --git a/adapters/handlers/rest/handlers_misc.go b/adapters/handlers/rest/handlers_misc.go
@@ -95,6 +95,12 @@ func setupMiscHandlers(api *operations.WeaviateAPI, requestsLog *telemetry.Reque
 			}
 
 			target := fmt.Sprintf("%s/.well-known/openid-configuration", serverConfig.Config.Authentication.OIDC.Issuer)
-			return operations.NewGetWellKnownOpenidConfigurationOK().WithPayload(&operations.GetWellKnownOpenidConfigurationOKBody{Href: target})
+			clientID := serverConfig.Config.Authentication.OIDC.ClientID
+			body := &operations.GetWellKnownOpenidConfigurationOKBody{
+				Href:     target,
+				ClientID: clientID,
+			}
+
+			return operations.NewGetWellKnownOpenidConfigurationOK().WithPayload(body)
 		})
 }
diff --git a/adapters/handlers/rest/operations/get_well_known_openid_configuration.go b/adapters/handlers/rest/operations/get_well_known_openid_configuration.go
@@ -90,6 +90,9 @@ func (o *GetWellKnownOpenidConfiguration) ServeHTTP(rw http.ResponseWriter, r *h
 // swagger:model GetWellKnownOpenidConfigurationOKBody
 type GetWellKnownOpenidConfigurationOKBody struct {
 
+	// OAuth Client ID
+	ClientID string `json:"clientId,omitempty"`
+
 	// The Location to redirect to
 	Href string `json:"href,omitempty"`
 }

diff --git a/client/operations/get_well_known_openid_configuration_responses.go b/client/operations/get_well_known_openid_configuration_responses.go
@@ -108,6 +108,9 @@ swagger:model GetWellKnownOpenidConfigurationOKBody
 */
 type GetWellKnownOpenidConfigurationOKBody struct {
 
+	// OAuth Client ID
+	ClientID string `json:"clientId,omitempty"`
+
 	// The Location to redirect to
 	Href string `json:"href,omitempty"`
 }

diff --git a/openapi-specs/schema.json b/openapi-specs/schema.json
@@ -638,7 +638,7 @@
     },
     "description": "Decentralised Knowledge Graph",
     "title": "Weaviate - Decentralised Knowledge Graph",
-    "version": "0.16.1"
+    "version": "0.16.2"
   },
   "parameters": {
     "CommonLimitParameterQuery": {
@@ -2826,6 +2826,10 @@
                 "href": {
                   "description": "The Location to redirect to",
                   "type": "string"
+                },
+                "clientId": {
+                  "description": "OAuth Client ID",
+                  "type": "string"
                 }
               }
             }