Merge remote-tracking branch 'upstream/release-2.6.0' into release-2.6.0

ansible/api-manager.yml

 ---
 - name: Kong API
   become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
   hosts: "{{groups['swarm-manager-1'][0]}}"
   roles:
     - {role: kong-api, tags: ['kong-api']}

ansible/artifacts/sunbird/login/resources/js/login.js

@@ -397,7 +397,11 @@ var handleGoogleAuthEvent = () => {
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
 			if (client_id === 'android') {
-				const googleRedirectUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + googleAuthUrl;
+				let host = sessionUrlObj.host;
+				if (host.indexOf("merge.") !== -1) {
+					host = host.slice(host.indexOf("merge.") + 6, host.length);
+				}
+				const googleRedirectUrl = sessionUrlObj.protocol + '//' + host + googleAuthUrl;
 				window.location.href = redirect_uri + '?googleRedirectUrl=' + googleRedirectUrl + updatedQuery;
 			} else {
 				window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host + googleAuthUrl + updatedQuery;

ansible/roles/kong-api/defaults/main.yml

@@ -4702,4 +4702,22 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
-
+  - name: freshDesk
+    uris: "/tickets/v1/create"
+    upstream_url: "{{ freshDesk_url }}/api/v2/tickets"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - name: request-transformer
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist: publicUser
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
+    - name: request-transformer
+      config.replace.headers: "Authorization: Basic {{ freshDesk_token }}"

ansible/roles/stack-proxy/templates/proxy-default.conf

@@ -96,7 +96,7 @@ server {
     if ($request_method = OPTIONS ) {
             add_header Access-Control-Allow-Origin "*" ;
             add_header Access-Control-Allow-Methods "GET, OPTIONS, PATCH, POST";
-            add_header Access-Control-Allow-Headers "Access-Control-Allow-Origin, Authorization, Content-Type, user-id";
+            add_header Access-Control-Allow-Headers "Access-Control-Allow-Origin, Authorization, Content-Type, user-id, Content-Encoding";
             add_header Content-Length 0;
             add_header Content-Type text/plain;
             return 200;

ansible/roles/stack-proxy/templates/stack-proxy.yml

@@ -7,11 +7,11 @@ services:
     ports:
       - mode: host
         target: 80
-        published: 80
+        published: 31380
         protocol: TCP
       - mode: host
         target: 443
-        published: 443
+        published: 31390
         protocol: TCP
     deploy:
       mode: global