Merge general chore branch to main

fix(tenants): JWKS URL configurable Fix(dashboard): Pipeline editing workers Fix(dashboard): editing pipelines Fix tests refactor: tenants ui use services directly Fix use token subsequent requests Add /dev to local oathkeeper Update OAS Go lib Message: Feat: Make generate Oathkeeper rules Message: fix: JWKS URL Configurable Message: Add JWKS auth en forwarding to dashboard Message: Add logout button to settings Message: Remove User requirement in Protect chore(tenants): remove sql debuglizer fix(tenants): IsMember faulty check fix(tenants): handle kratos request failure fix(core): pipeline detail page incorrect key fix(auth): kratos env url Squashed commit of the following: commit b925f5a Merge: a37a2cc 61d4fb9 Author: Tim van Osch <[email protected]> Date: Mon May 13 17:20:28 2024 +0200 Merge branch 'main' into chore-authz-prep commit a37a2cc Author: Tim van Osch <[email protected]> Date: Mon May 13 17:10:33 2024 +0200 Fix(dashboard): Pipeline editing workers commit 226fa2d Author: Tim van Osch <[email protected]> Date: Mon May 13 16:50:20 2024 +0200 Fix(dashboard): editing pipelines commit 8bd13d2 Author: Tim van Osch <[email protected]> Date: Mon May 13 16:41:11 2024 +0200 Fix tests commit da9c187 Author: Tim van Osch <[email protected]> Date: Mon May 13 16:09:38 2024 +0200 refactor: tenants ui use services directly commit f5880f8 Author: Tim van Osch <[email protected]> Date: Mon May 13 15:42:42 2024 +0200 Fix use token subsequent requests commit da28226 Author: Tim van Osch <[email protected]> Date: Mon May 13 15:42:31 2024 +0200 Add /dev to local oathkeeper commit ae30b9c Author: Tim van Osch <[email protected]> Date: Mon May 13 15:42:16 2024 +0200 Update OAS Go lib commit ef7ced9 Author: Tim van Osch <[email protected]> Date: Mon May 6 16:45:54 2024 +0200 Feat: Make generate Oathkeeper rules commit ec408ac Author: Tim van Osch <[email protected]> Date: Mon May 6 14:25:49 2024 +0200 fix: JWKS URL Configurable commit 73e6c74 Author: Tim van Osch <[email protected]> Date: Mon Apr 29 13:00:51 2024 +0200 Add JWKS auth en forwarding to dashboard commit a177bf4 Author: Tim van Osch <[email protected]> Date: Mon Apr 29 10:57:57 2024 +0200 Add logout button to settings commit 3fd40e2 Author: Tim van Osch <[email protected]> Date: Mon Apr 29 10:57:05 2024 +0200 Remove User requirement in Protect
sensorbucket · May 13, 2024 · 9f834e8 · 9f834e8
1 parent 61d4fb9
commit 9f834e8
Show file tree

Hide file tree

Showing 125 changed files with 3,350 additions and 687 deletions.
diff --git a/Makefile b/Makefile
@@ -77,3 +77,8 @@ golib: golib-clean
 admin: 
 	echo '{"schema_id":"default", "traits": {"email":"[email protected]"}}' | http post 127.0.0.1:4434/admin/identities | jq .id | \
 	 xargs -I uid echo '{"identity_id":"uid"}' | http post 127.0.0.1:4434/admin/recovery/code
+
+oathkeeper:
+	-@mkdir -p $(CURDIR)/tools/oathkeeper
+	@docker run --rm --init -v $(CURDIR):/project redocly/cli bundle /project/tools/openapi/api.yaml > $(CURDIR)/tools/oathkeeper/bundled_openapi.yaml
+	@openkeeper generate --config $(CURDIR)/tools/oathkeeper/openkeeper.toml > $(CURDIR)/tools/oathkeeper/generated_rules.json
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -19,7 +19,10 @@ services:
     environment:
     - STATIC_PATH=services/dashboard/static
     - HTTP_BASE=/dashboard
-    - SB_API=http://caddy
+    - EP_CORE=http://caddy
+    - EP_TRACING=http://caddy
+    - EP_WORKERS=http://caddy
+    - EP_MEASUREMENTS=http://caddy
 
   core:
     build:

diff --git a/pkg/api/README.md b/pkg/api/README.md
@@ -8,7 +8,7 @@ that receives data from an AMQP source, process said data and output in the expe
 
 Find out more at: https://developer.sensorbucket.nl/
 
-Developed and designed by Provincie Zeeland and Pollex
+Developed and designed by Provincie Zeeland and Pollex'
 
 
 ## Overview
@@ -213,21 +213,27 @@ Class | Method | HTTP request | Description
 
 
 
-### basicAuth
+### APIKey
 
-- **Type**: HTTP basic authentication
+- **Type**: HTTP Bearer token authentication
 
 Example
 
 ```golang
-auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-    UserName: "username",
-    Password: "password",
-})
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARER_TOKEN_STRING")
 r, err := client.Service.Operation(auth, args)
 ```
 
 
+### CookieSession
+
+- **Type**: API key
+- **API key parameter name**: SID
+- **Location**: 
+
+Note, each API key must be added to a map of `map[string]APIKey` where the key is: SID and passed in as the auth context for each request.
+
+
 ## Documentation for Utility Methods
 
 Due to the fact that model structure members are all pointers, this package contains

diff --git a/pkg/api/api_api_keys.go b/pkg/api/api_api_keys.go
diff --git a/pkg/api/api_devices.go b/pkg/api/api_devices.go
diff --git a/pkg/api/api_measurements.go b/pkg/api/api_measurements.go
diff --git a/pkg/api/api_pipelines.go b/pkg/api/api_pipelines.go
diff --git a/pkg/api/api_tenants.go b/pkg/api/api_tenants.go
diff --git a/pkg/api/api_tracing.go b/pkg/api/api_tracing.go
diff --git a/pkg/api/api_uplink.go b/pkg/api/api_uplink.go
diff --git a/pkg/api/api_workers.go b/pkg/api/api_workers.go
diff --git a/pkg/api/client.go b/pkg/api/client.go
diff --git a/pkg/api/configuration.go b/pkg/api/configuration.go
diff --git a/pkg/api/model_add_sensor_to_sensor_group_201_response.go b/pkg/api/model_add_sensor_to_sensor_group_201_response.go
diff --git a/pkg/api/model_add_sensor_to_sensor_group_request.go b/pkg/api/model_add_sensor_to_sensor_group_request.go
diff --git a/pkg/api/model_add_tenant_member_201_response.go b/pkg/api/model_add_tenant_member_201_response.go
diff --git a/pkg/api/model_add_tenant_member_request.go b/pkg/api/model_add_tenant_member_request.go
diff --git a/pkg/api/model_api_error.go b/pkg/api/model_api_error.go
diff --git a/pkg/api/model_api_key.go b/pkg/api/model_api_key.go