Merge pull request appwrite#615 from appwrite/fix-oauth

Author: lohanidamodar

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -62,13 +62,15 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
             "{{ parameter.name }}" to {{ parameter.name | caseCamel }},
         {%~ 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 %}
             "{{ header | caseLower }}" to client.config["{{ header | caseLower }}"],
         {%~ endfor %}
         {%~ endfor %}
         {%~ endif %}
+        {%~ endif %}
         )
         {%~ if method.type == 'webAuth' %}
         val query = mutableListOf<String>()

templates/swift/base/params.twig

@@ -10,9 +10,10 @@
         {%- else -%} let
         {%- endif %} params: [String: Any?] = [
         {%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
-            "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or method.auth | length > 0 %},{% endif %}
+            "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or (method.type == '___location' or method.type == 'webAuth' and method.auth | length > 0) %},{% endif %}
 
         {%~ 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 %}
@@ -21,5 +22,6 @@
         {%~ endfor %}
         {%~ endfor %}
         {%~ endif %}
+        {%~ endif %}
         ]
         {%~ endif %}