buerokratt · 1AhmedYasser · Feb 16, 2025 · Feb 19, 2025
diff --git a/DSL/DMapper/hbs/array-to-object.handlebars → .../analytics/hbs/array-to-object.handlebars b/DSL/DMapper/hbs/array-to-object.handlebars → .../analytics/hbs/array-to-object.handlebars
diff --git a/DSL/DMapper/hbs/get-csv.handlebars → DSL/DMapper/analytics/hbs/get-csv.handlebars b/DSL/DMapper/hbs/get-csv.handlebars → DSL/DMapper/analytics/hbs/get-csv.handlebars
diff --git a/DSL/DMapper/hbs/get-metric-rows.handlebars → .../analytics/hbs/get-metric-rows.handlebars b/DSL/DMapper/hbs/get-metric-rows.handlebars → .../analytics/hbs/get-metric-rows.handlebars
diff --git a/DSL/DMapper/hbs/merge-arrays.handlebars → ...per/analytics/hbs/merge-arrays.handlebars b/DSL/DMapper/hbs/merge-arrays.handlebars → ...per/analytics/hbs/merge-arrays.handlebars
diff --git a/DSL/DMapper/js/get-csv.js → DSL/DMapper/analytics/js/get-csv.js b/DSL/DMapper/js/get-csv.js → DSL/DMapper/analytics/js/get-csv.js
diff --git a/DSL/Resql/analytics/GET/readme.md b/DSL/Resql/analytics/GET/readme.md
diff --git a/DSL/Resql/add-scheduled-report.sql → ...l/analytics/POST/add-scheduled-report.sql b/DSL/Resql/add-scheduled-report.sql → ...l/analytics/POST/add-scheduled-report.sql
diff --git a/DSL/Resql/byk-avg-intents.sql → DSL/Resql/analytics/POST/byk-avg-intents.sql b/DSL/Resql/byk-avg-intents.sql → DSL/Resql/analytics/POST/byk-avg-intents.sql
diff --git a/DSL/Resql/byk-avg-response-speed.sql → ...analytics/POST/byk-avg-response-speed.sql b/DSL/Resql/byk-avg-response-speed.sql → ...analytics/POST/byk-avg-response-speed.sql
diff --git a/DSL/Resql/byk-avg-sessions-time-chatbot.sql → ...cs/POST/byk-avg-sessions-time-chatbot.sql b/DSL/Resql/byk-avg-sessions-time-chatbot.sql → ...cs/POST/byk-avg-sessions-time-chatbot.sql
diff --git a/DSL/Resql/byk-avg-sessions-time-csa.sql → ...lytics/POST/byk-avg-sessions-time-csa.sql b/DSL/Resql/byk-avg-sessions-time-csa.sql → ...lytics/POST/byk-avg-sessions-time-csa.sql
diff --git a/DSL/Resql/byk-avg-sessions-time-customer.sql → ...s/POST/byk-avg-sessions-time-customer.sql b/DSL/Resql/byk-avg-sessions-time-customer.sql → ...s/POST/byk-avg-sessions-time-customer.sql
diff --git a/DSL/Resql/byk-intents-count.sql → ...esql/analytics/POST/byk-intents-count.sql b/DSL/Resql/byk-intents-count.sql → ...esql/analytics/POST/byk-intents-count.sql
diff --git a/DSL/Resql/byk-modified-intents.sql → ...l/analytics/POST/byk-modified-intents.sql b/DSL/Resql/byk-modified-intents.sql → ...l/analytics/POST/byk-modified-intents.sql
diff --git a/DSL/Resql/byk-new-intents.sql → DSL/Resql/analytics/POST/byk-new-intents.sql b/DSL/Resql/byk-new-intents.sql → DSL/Resql/analytics/POST/byk-new-intents.sql
diff --git a/DSL/Resql/byk-pct-correctly-understood.sql → ...ics/POST/byk-pct-correctly-understood.sql b/DSL/Resql/byk-pct-correctly-understood.sql → ...ics/POST/byk-pct-correctly-understood.sql
diff --git a/DSL/Resql/chat-avg-duration.sql → ...esql/analytics/POST/chat-avg-duration.sql b/DSL/Resql/chat-avg-duration.sql → ...esql/analytics/POST/chat-avg-duration.sql
diff --git a/DSL/Resql/chat-avg-num-of-messages.sql → ...alytics/POST/chat-avg-num-of-messages.sql b/DSL/Resql/chat-avg-num-of-messages.sql → ...alytics/POST/chat-avg-num-of-messages.sql
diff --git a/DSL/Resql/chat-avg-waiting-time.sql → .../analytics/POST/chat-avg-waiting-time.sql b/DSL/Resql/chat-avg-waiting-time.sql → .../analytics/POST/chat-avg-waiting-time.sql
diff --git a/DSL/Resql/chat-cif-all-csas-away.sql → ...analytics/POST/chat-cif-all-csas-away.sql b/DSL/Resql/chat-cif-all-csas-away.sql → ...analytics/POST/chat-cif-all-csas-away.sql
diff --git a/DSL/Resql/chat-cif-long-waiting-time.sql → ...ytics/POST/chat-cif-long-waiting-time.sql b/DSL/Resql/chat-cif-long-waiting-time.sql → ...ytics/POST/chat-cif-long-waiting-time.sql
diff --git a/DSL/Resql/chat-cif-outside-working-hours.sql → ...s/POST/chat-cif-outside-working-hours.sql b/DSL/Resql/chat-cif-outside-working-hours.sql → ...s/POST/chat-cif-outside-working-hours.sql
diff --git a/DSL/Resql/chat-count-only-chatbot.sql → ...nalytics/POST/chat-count-only-chatbot.sql b/DSL/Resql/chat-count-only-chatbot.sql → ...nalytics/POST/chat-count-only-chatbot.sql
diff --git a/...Resql/chat-count-with-csa-and-chatbot.sql → .../POST/chat-count-with-csa-and-chatbot.sql b/...Resql/chat-count-with-csa-and-chatbot.sql → .../POST/chat-count-with-csa-and-chatbot.sql
diff --git a/DSL/Resql/chat-count-with-csa.sql → ...ql/analytics/POST/chat-count-with-csa.sql b/DSL/Resql/chat-count-with-csa.sql → ...ql/analytics/POST/chat-count-with-csa.sql
diff --git a/DSL/Resql/chat-idle-count.sql → DSL/Resql/analytics/POST/chat-idle-count.sql b/DSL/Resql/chat-idle-count.sql → DSL/Resql/analytics/POST/chat-idle-count.sql
diff --git a/DSL/Resql/chat-median-waiting-time.sql → ...alytics/POST/chat-median-waiting-time.sql b/DSL/Resql/chat-median-waiting-time.sql → ...alytics/POST/chat-median-waiting-time.sql
diff --git a/DSL/Resql/csa-avg-chat-time.sql → ...esql/analytics/POST/csa-avg-chat-time.sql b/DSL/Resql/csa-avg-chat-time.sql → ...esql/analytics/POST/csa-avg-chat-time.sql
diff --git a/DSL/Resql/csa-avg-present-number.sql → ...analytics/POST/csa-avg-present-number.sql b/DSL/Resql/csa-avg-present-number.sql → ...analytics/POST/csa-avg-present-number.sql
diff --git a/DSL/Resql/csa-avg-time-picking-up-chats.sql → ...cs/POST/csa-avg-time-picking-up-chats.sql b/DSL/Resql/csa-avg-time-picking-up-chats.sql → ...cs/POST/csa-avg-time-picking-up-chats.sql
diff --git a/DSL/Resql/csa-chat-forwards.sql → ...esql/analytics/POST/csa-chat-forwards.sql b/DSL/Resql/csa-chat-forwards.sql → ...esql/analytics/POST/csa-chat-forwards.sql
diff --git a/DSL/Resql/csa-chats-count.sql → DSL/Resql/analytics/POST/csa-chats-count.sql b/DSL/Resql/csa-chats-count.sql → DSL/Resql/analytics/POST/csa-chats-count.sql
diff --git a/DSL/Resql/delete-odp-settings.sql → ...ql/analytics/POST/delete-odp-settings.sql b/DSL/Resql/delete-odp-settings.sql → ...ql/analytics/POST/delete-odp-settings.sql
diff --git a/DSL/Resql/delete-scheduled-report.sql → ...nalytics/POST/delete-scheduled-report.sql b/DSL/Resql/delete-scheduled-report.sql → ...nalytics/POST/delete-scheduled-report.sql
diff --git a/...back-avg-feedback-to-buerokratt-chats.sql → ...back-avg-feedback-to-buerokratt-chats.sql b/...back-avg-feedback-to-buerokratt-chats.sql → ...back-avg-feedback-to-buerokratt-chats.sql
diff --git a/...feedback-chats-with-negative-feedback.sql → ...feedback-chats-with-negative-feedback.sql b/...feedback-chats-with-negative-feedback.sql → ...feedback-chats-with-negative-feedback.sql
diff --git a/...Resql/feedback-csa-chats-feedback-nps.sql → .../POST/feedback-csa-chats-feedback-nps.sql b/...Resql/feedback-csa-chats-feedback-nps.sql → .../POST/feedback-csa-chats-feedback-nps.sql
diff --git a/...ql/feedback-selected-csa-feedback-nps.sql → ...ST/feedback-selected-csa-feedback-nps.sql b/...ql/feedback-selected-csa-feedback-nps.sql → ...ST/feedback-selected-csa-feedback-nps.sql
diff --git a/DSL/Resql/get-avg-messages.sql → ...Resql/analytics/POST/get-avg-messages.sql b/DSL/Resql/get-avg-messages.sql → ...Resql/analytics/POST/get-avg-messages.sql
diff --git a/DSL/Resql/get-avg-response-time.sql → .../analytics/POST/get-avg-response-time.sql b/DSL/Resql/get-avg-response-time.sql → .../analytics/POST/get-avg-response-time.sql
diff --git a/...ql/get-avg-session-length-client-left.sql → ...ST/get-avg-session-length-client-left.sql b/...ql/get-avg-session-length-client-left.sql → ...ST/get-avg-session-length-client-left.sql
diff --git a/DSL/Resql/get-avg-session-length-csa.sql → ...ytics/POST/get-avg-session-length-csa.sql b/DSL/Resql/get-avg-session-length-csa.sql → ...ytics/POST/get-avg-session-length-csa.sql
diff --git a/DSL/Resql/get-avg-session-length-no-csa.sql → ...cs/POST/get-avg-session-length-no-csa.sql b/DSL/Resql/get-avg-session-length-no-csa.sql → ...cs/POST/get-avg-session-length-no-csa.sql
diff --git a/DSL/Resql/get-avg-time-csa.sql → ...Resql/analytics/POST/get-avg-time-csa.sql b/DSL/Resql/get-avg-time-csa.sql → ...Resql/analytics/POST/get-avg-time-csa.sql
diff --git a/DSL/Resql/get-avg-time-no-csa.sql → ...ql/analytics/POST/get-avg-time-no-csa.sql b/DSL/Resql/get-avg-time-no-csa.sql → ...ql/analytics/POST/get-avg-time-no-csa.sql
diff --git a/DSL/Resql/get-avg-time.sql → DSL/Resql/analytics/POST/get-avg-time.sql b/DSL/Resql/get-avg-time.sql → DSL/Resql/analytics/POST/get-avg-time.sql
diff --git a/DSL/Resql/get-avg-waiting-time.sql → ...l/analytics/POST/get-avg-waiting-time.sql b/DSL/Resql/get-avg-waiting-time.sql → ...l/analytics/POST/get-avg-waiting-time.sql
diff --git a/DSL/Resql/get-chat-by-id.sql → DSL/Resql/analytics/POST/get-chat-by-id.sql b/DSL/Resql/get-chat-by-id.sql → DSL/Resql/analytics/POST/get-chat-by-id.sql
diff --git a/DSL/Resql/get-chat-count-csa.sql → ...sql/analytics/POST/get-chat-count-csa.sql b/DSL/Resql/get-chat-count-csa.sql → ...sql/analytics/POST/get-chat-count-csa.sql
diff --git a/DSL/Resql/get-chat-count-no-csa.sql → .../analytics/POST/get-chat-count-no-csa.sql b/DSL/Resql/get-chat-count-no-csa.sql → .../analytics/POST/get-chat-count-no-csa.sql
diff --git a/DSL/Resql/get-chat-count-total.sql → ...l/analytics/POST/get-chat-count-total.sql b/DSL/Resql/get-chat-count-total.sql → ...l/analytics/POST/get-chat-count-total.sql
diff --git a/DSL/Resql/get-chat-messages.sql → ...esql/analytics/POST/get-chat-messages.sql b/DSL/Resql/get-chat-messages.sql → ...esql/analytics/POST/get-chat-messages.sql
diff --git a/DSL/Resql/get-configuration.sql → ...esql/analytics/POST/get-configuration.sql b/DSL/Resql/get-configuration.sql → ...esql/analytics/POST/get-configuration.sql
diff --git a/DSL/Resql/get-intent.sql → DSL/Resql/analytics/POST/get-intent.sql b/DSL/Resql/get-intent.sql → DSL/Resql/analytics/POST/get-intent.sql
diff --git a/DSL/Resql/get-intents.sql → DSL/Resql/analytics/POST/get-intents.sql b/DSL/Resql/get-intents.sql → DSL/Resql/analytics/POST/get-intents.sql
diff --git a/DSL/Resql/analytics/POST/get-new-nonce.sql b/DSL/Resql/analytics/POST/get-new-nonce.sql
@@ -0,0 +1 @@
+INSERT INTO request_nonces (valid_until) VALUES ( now() + interval '1 day') RETURNING nonce;
diff --git a/DSL/Resql/get-odp-settings.sql → ...Resql/analytics/POST/get-odp-settings.sql b/DSL/Resql/get-odp-settings.sql → ...Resql/analytics/POST/get-odp-settings.sql
diff --git a/DSL/Resql/get-pct-correctly-understood.sql → ...ics/POST/get-pct-correctly-understood.sql b/DSL/Resql/get-pct-correctly-understood.sql → ...ics/POST/get-pct-correctly-understood.sql
diff --git a/DSL/Resql/get-period-times.sql → ...Resql/analytics/POST/get-period-times.sql b/DSL/Resql/get-period-times.sql → ...Resql/analytics/POST/get-period-times.sql
diff --git a/DSL/Resql/get-scheduled-report.sql → ...l/analytics/POST/get-scheduled-report.sql b/DSL/Resql/get-scheduled-report.sql → ...l/analytics/POST/get-scheduled-report.sql
diff --git a/DSL/Resql/get-scheduled-reports.sql → .../analytics/POST/get-scheduled-reports.sql b/DSL/Resql/get-scheduled-reports.sql → .../analytics/POST/get-scheduled-reports.sql
diff --git a/DSL/Resql/get-user-by-login.sql → ...esql/analytics/POST/get-user-by-login.sql b/DSL/Resql/get-user-by-login.sql → ...esql/analytics/POST/get-user-by-login.sql
diff --git a/DSL/Resql/get-user-page-preferences.sql → ...lytics/POST/get-user-page-preferences.sql b/DSL/Resql/get-user-page-preferences.sql → ...lytics/POST/get-user-page-preferences.sql
diff --git a/DSL/Resql/overview-avg-chats-no-csa.sql → ...lytics/POST/overview-avg-chats-no-csa.sql b/DSL/Resql/overview-avg-chats-no-csa.sql → ...lytics/POST/overview-avg-chats-no-csa.sql
diff --git a/DSL/Resql/overview-avg-chats.sql → ...sql/analytics/POST/overview-avg-chats.sql b/DSL/Resql/overview-avg-chats.sql → ...sql/analytics/POST/overview-avg-chats.sql
diff --git a/DSL/Resql/overview-avg-waiting-time.sql → ...lytics/POST/overview-avg-waiting-time.sql b/DSL/Resql/overview-avg-waiting-time.sql → ...lytics/POST/overview-avg-waiting-time.sql
diff --git a/DSL/Resql/overview-chat-activity-chart.sql → ...ics/POST/overview-chat-activity-chart.sql b/DSL/Resql/overview-chat-activity-chart.sql → ...ics/POST/overview-chat-activity-chart.sql
diff --git a/DSL/Resql/overview-metric-preferences.sql → ...tics/POST/overview-metric-preferences.sql b/DSL/Resql/overview-metric-preferences.sql → ...tics/POST/overview-metric-preferences.sql
diff --git a/DSL/Resql/overview-total-chats-no-csa.sql → ...tics/POST/overview-total-chats-no-csa.sql b/DSL/Resql/overview-total-chats-no-csa.sql → ...tics/POST/overview-total-chats-no-csa.sql
diff --git a/DSL/Resql/overview-total-chats.sql → ...l/analytics/POST/overview-total-chats.sql b/DSL/Resql/overview-total-chats.sql → ...l/analytics/POST/overview-total-chats.sql
diff --git a/DSL/Resql/overview-total-forwarded-chats.sql → ...s/POST/overview-total-forwarded-chats.sql b/DSL/Resql/overview-total-forwarded-chats.sql → ...s/POST/overview-total-forwarded-chats.sql
diff --git a/DSL/Resql/set-odp-settings.sql → ...Resql/analytics/POST/set-odp-settings.sql b/DSL/Resql/set-odp-settings.sql → ...Resql/analytics/POST/set-odp-settings.sql
diff --git a/DSL/Resql/status-all-chats.sql → ...Resql/analytics/POST/status-all-chats.sql b/DSL/Resql/status-all-chats.sql → ...Resql/analytics/POST/status-all-chats.sql
diff --git a/DSL/Resql/status-csa-chats.sql → ...Resql/analytics/POST/status-csa-chats.sql b/DSL/Resql/status-csa-chats.sql → ...Resql/analytics/POST/status-csa-chats.sql
diff --git a/DSL/Resql/testing.sql → DSL/Resql/analytics/POST/testing.sql b/DSL/Resql/testing.sql → DSL/Resql/analytics/POST/testing.sql
diff --git a/...ql/update-overview-metric-preferences.sql → ...ST/update-overview-metric-preferences.sql b/...ql/update-overview-metric-preferences.sql → ...ST/update-overview-metric-preferences.sql
diff --git a/DSL/Resql/update-user-page-preferences.sql → ...ics/POST/update-user-page-preferences.sql b/DSL/Resql/update-user-page-preferences.sql → ...ics/POST/update-user-page-preferences.sql
@@ -1,2 +1,2 @@
 INSERT INTO user_page_preferences (user_id, page_name, page_results,created)
-VALUES (:user_id, :page_name, :page_results,:created::timestamp with time zone);
+VALUES (:user_id, :page_name, :page_results,:created::timestamp with time zone);
diff --git a/DSL/Resql/analytics/POST/use-nonce.sql b/DSL/Resql/analytics/POST/use-nonce.sql
@@ -0,0 +1 @@
+update request_nonces set used_at = now() where nonce = :updated_nonce and used_at is null returning nonce;
diff --git a/DSL/Ruuter/GET/.guard b/DSL/Ruuter/GET/.guard
diff --git a/DSL/Ruuter/POST/.guard b/DSL/Ruuter/POST/.guard
diff --git a/DSL/Ruuter/analytics/GET/.guard b/DSL/Ruuter/analytics/GET/.guard
@@ -0,0 +1,61 @@
+process_request:
+  switch:
+    - condition: ${ incoming.headers['x-ruuter-nonce'] != null }
+      next: verify_header_nonce
+    - condition: ${ incoming.params['ruuter-nonce'] != null }
+      next: verify_param_nonce
+    - condition: ${incoming.headers == null || incoming.headers.cookie == null}
+      next: guard_fail
+  next: authenticate
+
+verify_header_nonce:
+  call: http.post
+  args:
+    url: "[#ANALYTICS_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.headers['x-ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+verify_param_nonce:
+  call: http.post
+  args:
+    url: "[#ANALYTICS_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.params['ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+check_inline:
+  inline: extAuth
+  result: extauth
+
+check_nonce:
+  switch:
+    - condition: ${ !extauth || (nonce_response.response.body[0] == null) }
+      next: guard_fail
+  next: guard_success
+
+authenticate:
+  template: "[#ANALYTICS_PROJECT_LAYER]/check-user-authority"
+  requestType: templates
+  headers:
+    cookie: ${incoming.headers.cookie}
+  result: authority_result
+  next: check_authority_result
+
+check_authority_result:
+  switch:
+    - condition: ${authority_result !== "false"}
+      next: guard_success
+  next: guard_fail
+
+guard_success:
+  return: "success"
+  status: 200
+  next: end
+
+guard_fail:
+  return: "unauthorized"
+  status: 403
+  next: end
diff --git a/...uter/GET/accounts/get-page-preference.yml → ...tics/GET/accounts/get-page-preference.yml b/...uter/GET/accounts/get-page-preference.yml → ...tics/GET/accounts/get-page-preference.yml
diff --git a/...ic/accounts/customer-support-activity.yml → ...ic/accounts/customer-support-activity.yml b/...ic/accounts/customer-support-activity.yml → ...ic/accounts/customer-support-activity.yml
diff --git a/...eneric/accounts/user-profile-settings.yml → ...eneric/accounts/user-profile-settings.yml b/...eneric/accounts/user-profile-settings.yml → ...eneric/accounts/user-profile-settings.yml
diff --git a/...Ruuter/GET/generic/accounts/user-role.yml → ...lytics/GET/generic/accounts/user-role.yml b/...Ruuter/GET/generic/accounts/user-role.yml → ...lytics/GET/generic/accounts/user-role.yml
diff --git a/DSL/Ruuter/GET/generic/csa/active-chats.yml → ...nalytics/GET/generic/csa/active-chats.yml b/DSL/Ruuter/GET/generic/csa/active-chats.yml → ...nalytics/GET/generic/csa/active-chats.yml
diff --git a/DSL/Ruuter/GET/generic/userinfo.yml → ...Ruuter/analytics/GET/generic/userinfo.yml b/DSL/Ruuter/GET/generic/userinfo.yml → ...Ruuter/analytics/GET/generic/userinfo.yml
diff --git a/DSL/Ruuter/GET/metrics/intents.yml → DSL/Ruuter/analytics/GET/metrics/intents.yml b/DSL/Ruuter/GET/metrics/intents.yml → DSL/Ruuter/analytics/GET/metrics/intents.yml
diff --git a/DSL/Ruuter/GET/negative-feedback.yml → ...uuter/analytics/GET/negative-feedback.yml b/DSL/Ruuter/GET/negative-feedback.yml → ...uuter/analytics/GET/negative-feedback.yml
diff --git a/DSL/Ruuter/GET/odp/dataset.yml → DSL/Ruuter/analytics/GET/odp/dataset.yml b/DSL/Ruuter/GET/odp/dataset.yml → DSL/Ruuter/analytics/GET/odp/dataset.yml
diff --git a/DSL/Ruuter/GET/odp/scheduled-reports.yml → ...r/analytics/GET/odp/scheduled-reports.yml b/DSL/Ruuter/GET/odp/scheduled-reports.yml → ...r/analytics/GET/odp/scheduled-reports.yml
diff --git a/DSL/Ruuter/GET/odp/settings.yml → DSL/Ruuter/analytics/GET/odp/settings.yml b/DSL/Ruuter/GET/odp/settings.yml → DSL/Ruuter/analytics/GET/odp/settings.yml
diff --git a/DSL/Ruuter/GET/odp/values.yml → DSL/Ruuter/analytics/GET/odp/values.yml b/DSL/Ruuter/GET/odp/values.yml → DSL/Ruuter/analytics/GET/odp/values.yml
diff --git a/DSL/Ruuter/GET/overview/metrics.yml → ...Ruuter/analytics/GET/overview/metrics.yml b/DSL/Ruuter/GET/overview/metrics.yml → ...Ruuter/analytics/GET/overview/metrics.yml
diff --git a/DSL/Ruuter/GET/overview/preferences.yml → ...er/analytics/GET/overview/preferences.yml b/DSL/Ruuter/GET/overview/preferences.yml → ...er/analytics/GET/overview/preferences.yml
diff --git a/DSL/Ruuter/GET/testing.yml → DSL/Ruuter/analytics/GET/testing.yml b/DSL/Ruuter/GET/testing.yml → DSL/Ruuter/analytics/GET/testing.yml
diff --git a/DSL/Ruuter/analytics/POST/.guard b/DSL/Ruuter/analytics/POST/.guard
@@ -0,0 +1,61 @@
+process_request:
+  switch:
+    - condition: ${ incoming.headers['x-ruuter-nonce'] != null }
+      next: verify_header_nonce
+    - condition: ${ incoming.params['ruuter-nonce'] != null }
+      next: verify_param_nonce
+    - condition: ${incoming.headers == null || incoming.headers.cookie == null}
+      next: guard_fail
+  next: authenticate
+
+verify_header_nonce:
+  call: http.post
+  args:
+    url: "[#ANALYTICS_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.headers['x-ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+verify_param_nonce:
+  call: http.post
+  args:
+    url: "[#ANALYTICS_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.params['ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+check_inline:
+  inline: extAuth
+  result: extauth
+
+check_nonce:
+  switch:
+    - condition: ${ !extauth || (nonce_response.response.body[0] == null) }
+      next: guard_fail
+  next: guard_success
+
+authenticate:
+  template: "[#ANALYTICS_PROJECT_LAYER]/check-user-authority"
+  requestType: templates
+  headers:
+    cookie: ${incoming.headers.cookie}
+  result: authority_result
+  next: check_authority_result
+
+check_authority_result:
+  switch:
+    - condition: ${authority_result !== "false"}
+      next: guard_success
+  next: guard_fail
+
+guard_success:
+  return: "success"
+  status: 200
+  next: end
+
+guard_fail:
+  return: "unauthorized"
+  status: 403
+  next: end
diff --git a/.../POST/accounts/update-page-preference.yml → .../POST/accounts/update-page-preference.yml b/.../POST/accounts/update-page-preference.yml → .../POST/accounts/update-page-preference.yml
diff --git a/DSL/Ruuter/POST/agents/avg-active.yml → ...uter/analytics/POST/agents/avg-active.yml b/DSL/Ruuter/POST/agents/avg-active.yml → ...uter/analytics/POST/agents/avg-active.yml
diff --git a/...POST/agents/chats/avg-time-picking-up.yml → ...POST/agents/chats/avg-time-picking-up.yml b/...POST/agents/chats/avg-time-picking-up.yml → ...POST/agents/chats/avg-time-picking-up.yml
diff --git a/DSL/Ruuter/POST/agents/chats/avg-time.yml → .../analytics/POST/agents/chats/avg-time.yml b/DSL/Ruuter/POST/agents/chats/avg-time.yml → .../analytics/POST/agents/chats/avg-time.yml
diff --git a/DSL/Ruuter/POST/agents/chats/forwards.yml → .../analytics/POST/agents/chats/forwards.yml b/DSL/Ruuter/POST/agents/chats/forwards.yml → .../analytics/POST/agents/chats/forwards.yml
diff --git a/...Ruuter/POST/agents/chats/messages/all.yml → ...lytics/POST/agents/chats/messages/all.yml b/...Ruuter/POST/agents/chats/messages/all.yml → ...lytics/POST/agents/chats/messages/all.yml
diff --git a/DSL/Ruuter/POST/agents/chats/total.yml → ...ter/analytics/POST/agents/chats/total.yml b/DSL/Ruuter/POST/agents/chats/total.yml → ...ter/analytics/POST/agents/chats/total.yml
diff --git a/DSL/Ruuter/POST/auth/.guard → DSL/Ruuter/analytics/POST/auth/.guard b/DSL/Ruuter/POST/auth/.guard → DSL/Ruuter/analytics/POST/auth/.guard
diff --git a/DSL/Ruuter/POST/auth/login.yml → DSL/Ruuter/analytics/POST/auth/login.yml b/DSL/Ruuter/POST/auth/login.yml → DSL/Ruuter/analytics/POST/auth/login.yml
diff --git a/DSL/Ruuter/POST/bots/avg-response-speed.yml → ...nalytics/POST/bots/avg-response-speed.yml b/DSL/Ruuter/POST/bots/avg-response-speed.yml → ...nalytics/POST/bots/avg-response-speed.yml
diff --git a/DSL/Ruuter/POST/bots/avg-sessions-time.yml → ...analytics/POST/bots/avg-sessions-time.yml b/DSL/Ruuter/POST/bots/avg-sessions-time.yml → ...analytics/POST/bots/avg-sessions-time.yml
diff --git a/DSL/Ruuter/POST/bots/intents.yml → DSL/Ruuter/analytics/POST/bots/intents.yml b/DSL/Ruuter/POST/bots/intents.yml → DSL/Ruuter/analytics/POST/bots/intents.yml
diff --git a/...er/POST/bots/pct-correctly-understood.yml → ...cs/POST/bots/pct-correctly-understood.yml b/...er/POST/bots/pct-correctly-understood.yml → ...cs/POST/bots/pct-correctly-understood.yml
diff --git a/DSL/Ruuter/POST/chats/avg-duration.yml → ...ter/analytics/POST/chats/avg-duration.yml b/DSL/Ruuter/POST/chats/avg-duration.yml → ...ter/analytics/POST/chats/avg-duration.yml
diff --git a/...er/POST/chats/avg-median-waiting-time.yml → ...cs/POST/chats/avg-median-waiting-time.yml b/...er/POST/chats/avg-median-waiting-time.yml → ...cs/POST/chats/avg-median-waiting-time.yml
diff --git a/...Ruuter/POST/chats/avg-num-of-messages.yml → ...lytics/POST/chats/avg-num-of-messages.yml b/...Ruuter/POST/chats/avg-num-of-messages.yml → ...lytics/POST/chats/avg-num-of-messages.yml
diff --git a/...T/chats/contact-information-fulfilled.yml → ...T/chats/contact-information-fulfilled.yml b/...T/chats/contact-information-fulfilled.yml → ...T/chats/contact-information-fulfilled.yml
@@ -161,7 +161,7 @@ all_csas_away_for_total:
 get_total:
   call: http.post
   args:
-    url: "[#ANALYTICS_DMAPPER]/hbs/analytics/merge-arrays"
+    url: "[#ANALYTICS_DMAPPER_HBS]/merge-arrays"
     headers:
       type: 'json'
     body:

diff --git a/DSL/Ruuter/POST/chats/get.yml → DSL/Ruuter/analytics/POST/chats/get.yml b/DSL/Ruuter/POST/chats/get.yml → DSL/Ruuter/analytics/POST/chats/get.yml
diff --git a/DSL/Ruuter/POST/chats/idle-count.yml → ...uuter/analytics/POST/chats/idle-count.yml b/DSL/Ruuter/POST/chats/idle-count.yml → ...uuter/analytics/POST/chats/idle-count.yml
diff --git a/DSL/Ruuter/POST/chats/status.yml → DSL/Ruuter/analytics/POST/chats/status.yml b/DSL/Ruuter/POST/chats/status.yml → DSL/Ruuter/analytics/POST/chats/status.yml
diff --git a/DSL/Ruuter/POST/chats/total-count.yml → ...uter/analytics/POST/chats/total-count.yml b/DSL/Ruuter/POST/chats/total-count.yml → ...uter/analytics/POST/chats/total-count.yml
diff --git a/DSL/Ruuter/POST/csv.yml → DSL/Ruuter/analytics/POST/csv.yml b/DSL/Ruuter/POST/csv.yml → DSL/Ruuter/analytics/POST/csv.yml
@@ -27,7 +27,7 @@ check_for_required_parameters:
 get_csv:
   call: http.post
   args:
-    url: "[#ANALYTICS_DMAPPER]/hbs/analytics/get-csv"
+    url: "[#ANALYTICS_DMAPPER_HBS]/get-csv"
     headers:
       type: 'csv'
     body:

diff --git a/DSL/Ruuter/POST/feedbacks/agents/nps.yml → ...r/analytics/POST/feedbacks/agents/nps.yml b/DSL/Ruuter/POST/feedbacks/agents/nps.yml → ...r/analytics/POST/feedbacks/agents/nps.yml
diff --git a/DSL/Ruuter/POST/feedbacks/avg.yml → DSL/Ruuter/analytics/POST/feedbacks/avg.yml b/DSL/Ruuter/POST/feedbacks/avg.yml → DSL/Ruuter/analytics/POST/feedbacks/avg.yml
diff --git a/DSL/Ruuter/POST/feedbacks/negative.yml → ...ter/analytics/POST/feedbacks/negative.yml b/DSL/Ruuter/POST/feedbacks/negative.yml → ...ter/analytics/POST/feedbacks/negative.yml
diff --git a/DSL/Ruuter/POST/feedbacks/nps.yml → DSL/Ruuter/analytics/POST/feedbacks/nps.yml b/DSL/Ruuter/POST/feedbacks/nps.yml → DSL/Ruuter/analytics/POST/feedbacks/nps.yml
diff --git a/DSL/Ruuter/POST/generic/login-user.yml → ...ter/analytics/POST/generic/login-user.yml b/DSL/Ruuter/POST/generic/login-user.yml → ...ter/analytics/POST/generic/login-user.yml
diff --git a/DSL/Ruuter/POST/odp/dataset.yml → DSL/Ruuter/analytics/POST/odp/dataset.yml b/DSL/Ruuter/POST/odp/dataset.yml → DSL/Ruuter/analytics/POST/odp/dataset.yml
diff --git a/DSL/Ruuter/POST/odp/delete-cron-job-task.yml → ...alytics/POST/odp/delete-cron-job-task.yml b/DSL/Ruuter/POST/odp/delete-cron-job-task.yml → ...alytics/POST/odp/delete-cron-job-task.yml
diff --git a/...uter/POST/odp/delete-scheduled-report.yml → ...tics/POST/odp/delete-scheduled-report.yml b/...uter/POST/odp/delete-scheduled-report.yml → ...tics/POST/odp/delete-scheduled-report.yml
diff --git a/DSL/Ruuter/POST/odp/delete-settings.yml → ...er/analytics/POST/odp/delete-settings.yml b/DSL/Ruuter/POST/odp/delete-settings.yml → ...er/analytics/POST/odp/delete-settings.yml
diff --git a/DSL/Ruuter/POST/odp/download.yml → DSL/Ruuter/analytics/POST/odp/download.yml b/DSL/Ruuter/POST/odp/download.yml → DSL/Ruuter/analytics/POST/odp/download.yml
@@ -37,7 +37,7 @@ get_metrics:
 convert_data:
   call: http.post
   args:
-    url: "[#ANALYTICS_DMAPPER]/hbs/analytics/get-metric-rows"
+    url: "[#ANALYTICS_DMAPPER_HBS]/get-metric-rows"
     headers:
       type: "json"
     body:

diff --git a/DSL/Ruuter/POST/odp/metrics.yml → DSL/Ruuter/analytics/POST/odp/metrics.yml b/DSL/Ruuter/POST/odp/metrics.yml → DSL/Ruuter/analytics/POST/odp/metrics.yml
diff --git a/DSL/Ruuter/POST/odp/settings.yml → DSL/Ruuter/analytics/POST/odp/settings.yml b/DSL/Ruuter/POST/odp/settings.yml → DSL/Ruuter/analytics/POST/odp/settings.yml
diff --git a/...uter/POST/odp/update-scheduled-report.yml → ...tics/POST/odp/update-scheduled-report.yml b/...uter/POST/odp/update-scheduled-report.yml → ...tics/POST/odp/update-scheduled-report.yml
diff --git a/...uter/POST/odp/upload-scheduled-report.yml → ...tics/POST/odp/upload-scheduled-report.yml b/...uter/POST/odp/upload-scheduled-report.yml → ...tics/POST/odp/upload-scheduled-report.yml
diff --git a/DSL/Ruuter/POST/odp/upload.yml → DSL/Ruuter/analytics/POST/odp/upload.yml b/DSL/Ruuter/POST/odp/upload.yml → DSL/Ruuter/analytics/POST/odp/upload.yml
@@ -57,7 +57,7 @@ get_metrics:
 convert_data:
   call: http.post
   args:
-    url: "[#ANALYTICS_DMAPPER]/hbs/analytics/array-to-object"
+    url: "[#ANALYTICS_DMAPPER_HBS]/array-to-object"
     headers:
       type: "json"
     body:

diff --git a/DSL/Ruuter/POST/overview/preferences.yml → ...r/analytics/POST/overview/preferences.yml b/DSL/Ruuter/POST/overview/preferences.yml → ...r/analytics/POST/overview/preferences.yml
diff --git a/DSL/Ruuter/POST/reload.yml → DSL/Ruuter/analytics/POST/reload.yml b/DSL/Ruuter/POST/reload.yml → DSL/Ruuter/analytics/POST/reload.yml
diff --git a/DSL/Ruuter/POST/saveJsonToYml.yml → DSL/Ruuter/analytics/POST/saveJsonToYml.yml b/DSL/Ruuter/POST/saveJsonToYml.yml → DSL/Ruuter/analytics/POST/saveJsonToYml.yml
diff --git a/DSL/Ruuter/POST/xlsx.yml → DSL/Ruuter/analytics/POST/xlsx.yml b/DSL/Ruuter/POST/xlsx.yml → DSL/Ruuter/analytics/POST/xlsx.yml
diff --git a/...Ruuter/TEMPLATES/check-user-authority.yml → ...lytics/TEMPLATES/check-user-authority.yml b/...Ruuter/TEMPLATES/check-user-authority.yml → ...lytics/TEMPLATES/check-user-authority.yml
diff --git a/GUI/.env.development b/GUI/.env.development
@@ -1,6 +1,6 @@
-REACT_APP_API_URL=http://localhost:8080
-REACT_APP_RUUTER_API_URL=http://localhost:8080
-REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:8080
+REACT_APP_API_URL=http://localhost:8080/analytics
+REACT_APP_RUUTER_API_URL=http://localhost:8080/analytics
+REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:8080/analytics
 REACT_APP_OPENSEARCH_DASHBOARD_URL=https://opensearch.org/
 REACT_APP_OPENDATAPORT_URL=https://avaandmed.eesti.ee
 REACT_APP_MENU_URL=https://admin.dev.buerokratt.ee
@@ -9,8 +9,8 @@ REACT_APP_APP_PORT=3001
 REACT_APP_NOTIFICATION_NODE_URL=http://localhost:4040
 REACT_APP_LOCAL=true
 REACT_APP_BASE_API_PATH=/al
-REACT_APP_AUTH_BASE_URL=http://localhost:8080
-REACT_APP_DOCKER_RUUTER=http://ruuter:8080
+REACT_APP_AUTH_BASE_URL=http://localhost:8080/analytics
+REACT_APP_DOCKER_RUUTER=http://ruuter:8080/analytics
 REACT_APP_CUSTOMER_SERVICE_LOGIN=http://localhost:3004/et/dev-auth
 REACT_APP_CONVERSATIONS_BASE_URL=http://localhost:8080/chat
 REACT_APP_TRAINING_BASE_URL=http://localhost:8080/training
@@ -19,7 +19,7 @@ REACT_APP_SERVICES_BASE_URL=http://localhost:8080/services
 REACT_APP_SETTINGS_BASE_URL=http://localhost:8080/settings
 REACT_APP_MONITORING_BASE_URL=http://localhost:8080/monitoring
 REACT_APP_SERVICE_ID=analytics
-REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080
+REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080/analytics
 REACT_APP_CSP="upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8080 http://localhost:8085 https://admin.dev.buerokratt.ee/chat/menu.json;"
 REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE
 REACT_APP_MENU_JSON=[{"id":"conversations","label":{"et":"Vestlused","en":"Conversations"},"path":"/chat","children":[{"label":{"et":"Vastamata","en":"Unanswered"},"path":"/unanswered"},{"label":{"et":"Aktiivsed","en":"Active"},"path":"/active"},{"label":{"et":"Ootel","en":"Pending"},"path":"/pending"},{"label":{"et":"Ajalugu","en":"History"},"path":"/history"}]},{"id":"training","label":{"et":"Treening","en":"Training"},"path":"/training","children":[{"label":{"et":"Treening","en":"Training"},"path":"/training","children":[{"label":{"et":"Teemad","en":"Themes"},"path":"/training/intents"},{"label":{"et":"Avalikud teemad","en":"Public themes"},"path":"/training/common-intents"},{"label":{"et":"Teemade järeltreenimine","en":"Post training themes"},"path":"/training/intents-followup-training"},{"label":{"et":"Vastused","en":"Answers"},"path":"/training/responses"},{"label":{"et":"Reeglid","en":"Rules"},"path":"/training/rules"},{"label":{"et":"Konfiguratsioon","en":"Configuration"},"path":"/training/configuration"},{"label":{"et":"Vormid","en":"Forms"},"path":"/training/forms"},{"label":{"et":"Mälukohad","en":"Slots"},"path":"/training/slots"},{"label":{"et":"Automatic Teenused","en":"Automatic Services"},"path":"/auto-services"}]},{"label":{"et":"Ajaloolised vestlused","en":"Historical conversations"},"path":"/history","children":[{"label":{"et":"Ajalugu","en":"History"},"path":"/history/history"},{"label":{"et":"Pöördumised","en":"Appeals"},"path":"/history/appeal"}]},{"label":{"et":"Mudelipank ja analüütika","en":"Modelbank and analytics"},"path":"/analytics","children":[{"label":{"et":"Teemade ülevaade","en":"Overview of topics"},"path":"/analytics/overview"},{"label":{"et":"Mudelite võrdlus","en":"Comparison of models"},"path":"/analytics/models"},{"label":{"et":"Testlood","en":"testTracks"},"path":"/analytics/testcases"}]},{"label":{"et":"Treeni uus mudel","en":"Train new model"},"path":"/train-new-model"}]},{"id":"analytics","label":{"et":"Analüütika","en":"Analytics"},"path":"/analytics","children":[{"label":{"et":"Ülevaade","en":"Overview"},"path":"/overview"},{"label":{"et":"Vestlused","en":"Chats"},"path":"/chats"},{"label":{"et":"Tagasiside","en":"Feedback"},"path":"/feedback"},{"label":{"et":"Nõustajad","en":"Advisors"},"path":"/advisors"},{"label":{"et":"Avaandmed","en":"Reports"},"path":"/reports"}]},{"id":"services","label":{"et":"Teenused","en":"Services"},"path":"/services","children":[{"label":{"et":"Ülevaade","en":"Overview"},"path":"/overview"},{"label":{"et":"Uus teenus","en":"New Service"},"path":"/newService"},{"label":{"et":"Automatic Teenused","en":"Automatic Services"},"path":"/auto-services"},{"label":{"et":"Probleemsed teenused","en":"Faulty Services"},"path":"/faultyServices"}]},{"id":"settings","label":{"et":"Haldus","en":"Administration"},"path":"/settings","children":[{"label":{"et":"Kasutajad","en":"Users"},"path":"/users"},{"label":{"et":"Vestlusbot","en":"Chatbot"},"path":"/chatbot","children":[{"label":{"et":"Seaded","en":"Settings"},"path":"/chatbot/settings"},{"label":{"et":"Tervitussõnum","en":"Welcome message"},"path":"/chatbot/welcome-message"},{"label":{"et":"Välimus ja käitumine","en":"Appearance and behavior"},"path":"/chatbot/appearance"},{"label":{"et":"Erakorralised teated","en":"Emergency notices"},"path":"/chatbot/emergency-notices"}]},{"label":{"et":"Asutuse tööaeg","en":"Office opening hours"},"path":"/working-time"},{"label":{"et":"Sessiooni pikkus","en":"Session length"},"path":"/session-length"}]},{"id":"monitoring","label":{"et":"Seire","en":"Monitoring"},"path":"/monitoring","children":[{"label":{"et":"Aktiivaeg","en":"Working hours"},"path":"/uptime"}]}]
diff --git a/constants.ini b/constants.ini
@@ -1,11 +1,15 @@
 [DSL]
 
-ANALYTICS_RESQL=http://resql:8082
+ANALYTICS_RESQL=http://resql:8082/analytics
 
-ANALYTICS_RUUTER=http://ruuter:8080
+ANALYTICS_RUUTER=http://ruuter:8080/analytics
 
 ANALYTICS_DMAPPER=http://dmapper:3000
 
+ANALYTICS_DMAPPER_HBS=http://dmapper:3000/hbs/analytics
+
+ANALYTICS_PROJECT_LAYER=analytics
+
 ANALYTICS_OPEN_DATA_SERVICE=https://avaandmed.eesti.ee
 
 ANALYTICS_TIM=http://tim:8085

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - application.logging.displayRequestContent=true
       - application.logging.displayResponseContent=true
       - application.logging.printStackTrace=true
+      - application.internalRequests.disabled=true
     volumes:
       - ./DSL/Ruuter:/DSL
       - ./constants.ini:/app/constants.ini
@@ -34,7 +35,7 @@ services:
     ports:
       - 8082:8082
     volumes:
-      - ./DSL/Resql:/workspace/app/templates/byk
+      - ./DSL/Resql:/DSL
     networks:
       - bykstack
 
@@ -57,20 +58,20 @@ services:
     environment:
       - NODE_ENV=development
       - CHOKIDAR_USEPOLLING=true
-      - REACT_APP_API_URL=http://localhost:8080
+      - REACT_APP_API_URL=http://localhost:8080/analytics
       - REACT_APP_OPENSEARCH_DASHBOARD_URL=https://opensearch.org/
       - REACT_APP_OPENDATAPORT_URL=https://avaandmed.eesti.ee
-      - REACT_APP_RUUTER_API_URL=http://localhost:8080
-      - REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:8080
+      - REACT_APP_RUUTER_API_URL=http://localhost:8080/analytics
+      - REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:8080/analytics
       - REACT_APP_MENU_URL=https://admin.dev.buerokratt.ee
       - REACT_APP_MENU_PATH=/chat/menu.json
-      - REACT_APP_AUTH_BASE_URL=http://localhost:8080
+      - REACT_APP_AUTH_BASE_URL=http://localhost:8080/analytics
       - REACT_APP_APP_PORT=3001
       - REACT_APP_LOCAL=true
       - REACT_APP_BASE_API_PATH=/
       - PORT=3001
-      - REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080
-      - REACT_APP_DOCKER_RUUTER=http://ruuter:8080
+      - REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080/analytics
+      - REACT_APP_DOCKER_RUUTER=http://ruuter:8080/analytics
       - REACT_APP_CUSTOMER_SERVICE_LOGIN=http://localhost:3004/et/dev-auth
       - REACT_APP_CONVERSATIONS_BASE_URL=http://localhost:8080/chat
       - REACT_APP_TRAINING_BASE_URL=http://localhost:8080/training
@@ -102,8 +103,8 @@ services:
     image: data-mapper
     volumes:
       - ./DSL:/data
-      - ./DSL/DMapper/hbs:/workspace/app/views/analytics
-      - ./DSL/DMapper/js:/workspace/app/js/analytics
+      - ./DSL/DMapper/analytics/hbs:/workspace/app/views/analytics
+      - ./DSL/DMapper/analytics/js:/workspace/app/js/analytics
     environment:
       - PORT=3000
       - CONTENT_FOLDER=/data
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		INSERT INTO request_nonces (valid_until) VALUES ( now() + interval '1 day') RETURNING nonce;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		update request_nonces set used_at = now() where nonce = :updated_nonce and used_at is null returning nonce;