Merge pull request #957 from appwrite/fix-web-redirect

fix(web): reverting to previous webauth redirect logic
appwrite · Aug 26, 2024 · 0cc8391 · 0cc8391
2 parents 8835175 + 94788f1
commit 0cc8391
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
diff --git a/templates/web/src/client.ts.twig b/templates/web/src/client.ts.twig
@@ -497,10 +497,10 @@ class Client {
 
     /**
      * Subscribes to {{spec.title | caseUcfirst}} events and passes you the payload in realtime.
-     * 
-     * @param {string|string[]} channels 
+     *
+     * @param {string|string[]} channels
      * Channel to subscribe - pass a single channel as a string or multiple with an array of strings.
-     * 
+     *
      * Possible channels are:
      * - account
      * - collections
@@ -633,21 +633,6 @@ class Client {
         return response;
     }
 
-    async redirect(method: string, url: URL, headers: Headers = {}, params: Payload = {}): Promise<string> {
-        const { uri, options } = this.prepareRequest(method, url, headers, params);
-
-        const response = await fetch(uri, {
-            ...options,
-            redirect: 'manual'
-        });
-
-        if (response.status !== 301 && response.status !== 302) {
-            throw new {{spec.title | caseUcfirst}}Exception('Invalid redirect', response.status);
-        }
-
-        return response.headers.get('location') || '';
-    }
-
     async call(method: string, url: URL, headers: Headers = {}, params: Payload = {}, responseType = 'json'): Promise<any> {
         const { uri, options } = this.prepareRequest(method, url, headers, params);
 

diff --git a/templates/web/src/services/template.ts.twig b/templates/web/src/services/template.ts.twig
@@ -1,3 +1,4 @@
+import { Service } from '../service';
 import { {{ spec.title | caseUcfirst}}Exception, Client, type Payload, UploadProgress } from '../client';
 import type { Models } from '../models';
 {% set added = [] %}
@@ -69,17 +70,26 @@ export class {{ service.name | caseUcfirst }} {
             {%~ endfor %}
         }
 
+        {%~ if method.type == 'location' or method.type == 'webAuth' %}
+        {%~ if method.auth|length > 0 %}
+        {%~ for node in method.auth %}
+        {%~ for key,header in node|keys %}
+        payload['{{header|caseLower}}'] = this.client.config.{{header|caseLower}};
+        {%~ endfor %}
+        {%~ endfor %}
+        {%~ endif %}
+        for (const [key, value] of Object.entries(Service.flatten(payload))) {
+            uri.searchParams.append(key, value);
+        }
+        {%~ endif %}
+
         {%~ if method.type == 'webAuth' %}
-        const location = await this.client.redirect(
-            '{{ method.method | caseLower }}',
-            uri,
-            apiHeaders,
-            payload
-        );
-        if (typeof window !== 'undefined') {
-            window.location.href = location;
+        if (typeof window !== 'undefined' && window?.location) {
+            window.location.href = uri.toString();
+            return;
+        } else {
+            return uri.toString();
         }
-        return location.toString();
         {%~ elseif method.type == 'location' %}
         {%~ for node in method.auth %}
         {%~ for key, header in node|keys %}