WPB-14307 Fix nginx configs (#4434)

wireapp · Jan 30, 2025 · c3645a0 · c3645a0
1 parent 5483a77
commit c3645a0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/changelog.d/1-api-changes/WPB-14307 b/changelog.d/1-api-changes/WPB-14307
@@ -1,4 +1,4 @@
-New endpoints for domain registration and verification (#4389, #4422)
+New endpoints for domain registration and verification (#4389, #4422, #4434)
   - POST /domain-verification/:domain/team
   - POST /domain-verification/:domain/backend
   - POST /domain-verification/:domain/challenges

diff --git a/charts/nginz/values.yaml b/charts/nginz/values.yaml
@@ -471,16 +471,27 @@ nginx_conf:
     - path: /upgrade-personal-to-team$
       envs:
       - all
-    - path: /domain-verification/([^/]*)/team(-token)?$
+    - path: /domain-verification/([^/]*)/challenges$
       envs:
-      - all
-    - path: /domain-verification/
+        - all
+      disable_zauth: true
+    - path: /domain-verification/([^/]*)/challenges/([^/]*)
       envs:
-      - all
+        - all
+      disable_zauth: true
+    - path: /domain-verification/([^/]*)/authorize-team$
+      envs:
+        - all
+    - path: /domain-verification/([^/]*)/team$
+      envs:
+        - all
+    - path: /domain-verification/([^/]*)/backend$
+      envs:
+        - all
       disable_zauth: true
     - path: /get-domain-registration$
       envs:
-      - all
+        - all
       disable_zauth: true
     - path: /bot/conversations/(.+)
       envs:

diff --git a/services/nginz/integration-test/conf/nginz/nginx.conf b/services/nginz/integration-test/conf/nginz/nginx.conf
@@ -349,12 +349,27 @@ http {
       proxy_pass http://brig;
     }
 
-    location ~* ^(/v[0-9]+)?/domain-verification/(.*)/team(-token)?$ {
+    location ~* ^(/v[0-9]+)?/domain-verification/([^/]*)/challenges$ {
+      include common_response_no_zauth.conf;
+      proxy_pass http://brig;
+    }
+
+    location ~* ^(/v[0-9]+)?/domain-verification/([^/]*)/challenges/([^/]*) {
+      include common_response_no_zauth.conf;
+      proxy_pass http://brig;
+    }
+
+    location ~* ^(/v[0-9]+)?/domain-verification/([^/]*)/authorize-team$ {
+      include common_response_with_zauth.conf;
+      proxy_pass http://brig;
+    }
+
+    location ~* ^(/v[0-9]+)?/domain-verification/([^/]*)/team$ {
       include common_response_with_zauth.conf;
       proxy_pass http://brig;
     }
 
-    location ~* ^(/v[0-9]+)?/domain-verification/ {
+    location ~* ^(/v[0-9]+)?/domain-verification/([^/]*)/backend$ {
       include common_response_no_zauth.conf;
       proxy_pass http://brig;
     }