diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go
index 923951d29..34685ff16 100644
--- a/services/collaboration/pkg/connector/fileconnector_test.go
+++ b/services/collaboration/pkg/connector/fileconnector_test.go
@@ -59,7 +59,7 @@ var _ = Describe("FileConnector", func() {
 
 		gatewaySelector = mocks.NewSelectable[gateway.GatewayAPIClient](GinkgoT())
 		gatewaySelector.On("Next").Return(gatewayClient, nil)
-		fc = connector.NewFileConnector(gatewaySelector, cfg)
+		fc = connector.NewFileConnector(gatewaySelector, cfg, nil)
 
 		wopiCtx = middleware.WopiContext{
 			// a real token is needed for the PutRelativeFileSuggested tests
diff --git a/services/collaboration/pkg/middleware/wopicontext_test.go b/services/collaboration/pkg/middleware/wopicontext_test.go
index af8f6e49a..0a8c1c661 100644
--- a/services/collaboration/pkg/middleware/wopicontext_test.go
+++ b/services/collaboration/pkg/middleware/wopicontext_test.go
@@ -47,7 +47,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 		next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		})
-		mw = middleware.WopiContextAuthMiddleware(cfg, next)
+		mw = middleware.WopiContextAuthMiddleware(cfg, nil, next)
 
 		tknMngr, err = rjwt.New(map[string]interface{}{
 			"secret":  cfg.TokenManager.JWTSecret,
@@ -110,7 +110,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				Path: ".",
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -132,7 +132,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 		// use wrong wopi secret when generating the wopi token
 		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, &config.Config{Wopi: config.Wopi{
 			Secret: "wrongSecret",
-		}})
+		}}, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -155,7 +155,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				Path:       ".",
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -185,7 +185,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				},
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -219,7 +219,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				},
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -250,7 +250,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				Path: ".",
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))
@@ -277,7 +277,7 @@ var _ = Describe("Wopi Context Middleware", func() {
 				Path:       ".",
 			},
 		}
-		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg)
+		wopiToken, ttl, err := middleware.GenerateWopiToken(wopiContext, cfg, nil)
 		q := req.URL.Query()
 		q.Add("access_token", wopiToken)
 		q.Add("access_token_ttl", strconv.FormatInt(ttl, 10))