Merge branch 'main' into patch-1

backend/config/webhook_config.go

@@ -1,9 +1,11 @@
 package config
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/teamhanko/hanko/backend/webhooks/events"
 	"net/url"
+	"strings"
 )
 
 type WebhookSettings struct {
@@ -27,6 +29,25 @@ func (ws *WebhookSettings) Validate() error {
 
 type Webhooks []Webhook
 
+// Decode is an implementation of the envconfig.Decoder interface.
+// Assumes that environment variables (for the WEBHOOKS_HOOKS key) have the following format:
+// {"callback":"http://app.com/usercb","events":["user"]};{"callback":"http://app.com/emailcb","events":["email.send"]}
+func (wd *Webhooks) Decode(value string) error {
+	webhooks := Webhooks{}
+	hooks := strings.Split(value, ";")
+	for _, hook := range hooks {
+		webhook := Webhook{}
+		err := json.Unmarshal([]byte(hook), &webhook)
+		if err != nil {
+			return fmt.Errorf("invalid map json: %w", err)
+		}
+		webhooks = append(webhooks, webhook)
+
+	}
+	*wd = webhooks
+	return nil
+}
+
 type Webhook struct {
 	Callback string        `yaml:"callback" json:"callback,omitempty" koanf:"callback"`
 	Events   events.Events `yaml:"events" json:"events,omitempty" koanf:"events"`

backend/config/webhook_config_test.go

@@ -0,0 +1,18 @@
+package config
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestWebhooks_Decode(t *testing.T) {
+	webhooks := Webhooks{}
+	value := "{\"callback\":\"http://app.com/usercb\",\"events\":[\"user\"]};{\"callback\":\"http://app.com/callback\",\"events\":[\"email.send\"]}"
+	err := webhooks.Decode(value)
+
+	assert.NoError(t, err)
+	assert.Len(t, webhooks, 2, "has 2 elements")
+	for _, webhook := range webhooks {
+		assert.IsType(t, Webhook{}, webhook)
+	}
+}

backend/docs/Config.md

@@ -1016,6 +1016,10 @@ webhooks:
     #
     # Callback - Endpoint URL to which the change data will be sent
     #
+    # NOTE: When using environment variables hooks must be defined as in the following example:
+    #
+    # WEBHOOKS_HOOKS={"callback":"http://app.com/usercb","events":["user"]};{"callback":"http://app.com/emailcb","events":["email.send"]}
+    #
     - callback: "<YOUR WEBHOOK ENDPOINT URL>"
       ##
       #

docs/static/spec/admin.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.0
 info:
-  version: "0.11.0"
+  version: "0.12.0"
   title: "Hanko Admin API"
   description: |
     ## Introduction

docs/static/spec/public.yaml

@@ -1,7 +1,7 @@
 
 openapi: 3.0.0
 info:
-  version: '0.11.0'
+  version: '0.12.0'
   title: 'Hanko Public API'
   description: |
     ## Introduction

frontend/elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamhanko/hanko-elements",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "private": false,
   "publishConfig": {
@@ -132,7 +132,7 @@
   },
   "dependencies": {
     "@denysvuika/preact-translate": "^0.5.0",
-    "@teamhanko/hanko-frontend-sdk": "^0.11.0",
+    "@teamhanko/hanko-frontend-sdk": "^0.12.0",
     "@teamhanko/preact-custom-element": "^4.2.2",
     "classnames": "^2.3.2",
     "preact": "^10.13.1"

frontend/examples/angular/package.json

@@ -19,7 +19,7 @@
     "rxjs": "~7.8.0",
     "tslib": "^2.6.2",
     "zone.js": "~0.13.0",
-    "@teamhanko/hanko-elements": "^0.11.0"
+    "@teamhanko/hanko-elements": "^0.12.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^15.2.4",

frontend/examples/fresh/islands/Login.tsx

@@ -1,7 +1,7 @@
 import { HANKO_API_URL } from "../config.ts";
 
 const code = `
-  import { register } from 'https://esm.sh/@teamhanko/hanko-elements@0.11.0';
+  import { register } from 'https://esm.sh/@teamhanko/hanko-elements@0.12.0';
 
   register('${HANKO_API_URL}', { shadow: true });
   document.addEventListener('hankoAuthSuccess', (event) => {

frontend/examples/fresh/islands/LogoutButton.tsx

@@ -1,7 +1,7 @@
 import { HANKO_API_URL } from "../config.ts";
 
 const code = `
-  import { register, Hanko } from 'https://esm.sh/@teamhanko/hanko-elements@0.11.0';
+  import { register, Hanko } from 'https://esm.sh/@teamhanko/hanko-elements@0.12.0';
 
   register('${HANKO_API_URL}', { shadow: true });
   window.addEventListener('logout', () => {

frontend/examples/fresh/islands/Profile.tsx

@@ -1,7 +1,7 @@
 import { HANKO_API_URL } from "../config.ts";
 
 const code = `
-  import { register } from 'https://esm.sh/@teamhanko/hanko-elements@0.11.0';
+  import { register } from 'https://esm.sh/@teamhanko/hanko-elements@0.12.0';
   register('${HANKO_API_URL}', { shadow: true });
 `;
 

frontend/examples/nextjs/package.json

@@ -6,7 +6,7 @@
     "build": "next build"
   },
   "dependencies": {
-    "@teamhanko/hanko-elements": "^0.11.0",
+    "@teamhanko/hanko-elements": "^0.12.0",
     "next": "^14.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

frontend/examples/react/package.json

@@ -2,7 +2,7 @@
   "name": "example-react",
   "private": true,
   "dependencies": {
-    "@teamhanko/hanko-elements": "^0.11.0",
+    "@teamhanko/hanko-elements": "^0.12.0",
     "@types/react": "^18.2.32",
     "@types/react-dom": "^18.2.7",
     "react": "^18.2.0",

frontend/examples/svelte/package.json

@@ -17,7 +17,7 @@
     "vite": "^4.4.12"
   },
   "dependencies": {
-    "@teamhanko/hanko-elements": "^0.11.0",
+    "@teamhanko/hanko-elements": "^0.12.0",
     "svelte-navigator": "^3.2.2"
   }
 }

frontend/examples/vue/package.json

@@ -5,7 +5,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@teamhanko/hanko-elements": "^0.11.0",
+    "@teamhanko/hanko-elements": "^0.12.0",
     "vue": "^3.3.8",
     "vue-router": "^4.1.6"
   },

frontend/frontend-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamhanko/hanko-frontend-sdk",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "private": false,
   "publishConfig": {
     "access": "public"