Skip to content

Commit 8c4d9a4

Browse files
authored
Merge pull request #170 from appwrite/feat-disable-jwt
Feat disable jwt in CLI
2 parents 9698aac + ab52b05 commit 8c4d9a4

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

templates/cli/app/services/client.php.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ $cli
6363
6464
6565
{% for header in spec.global.headers %}
66+
{%if header.key != 'JWT' %}
6667
$cli
6768
->task('set{{ header.key }}')
6869
->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', false)
@@ -75,7 +76,7 @@ $cli
7576
Console::success('✅ Preferences saved successfully');
7677
}
7778
});
78-
79+
{% endif %}
7980
{% endfor %}
8081
8182
$cli

templates/cli/app/services/init.php.twig

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const PREFERENCE_ENDPOINT = "endpoint";
2121
$preferences = [
2222
PREFERENCE_ENDPOINT => '',
2323
{% for header in spec.global.headers %}
24-
{% if header.key != 'Mode' %}
24+
{% if header.key != 'Mode' and header.key != 'JWT' %}
2525
'{{header.name}}' => '',
2626
{% endif %}
2727
{% endfor %}
@@ -40,7 +40,7 @@ function loadEnvVariables(): bool
4040
setPreference(PREFERENCE_ENDPOINT, $endpoint);
4141
4242
{% for header in spec.global.headers %}
43-
{% if header.key != 'Mode' %}
43+
{% if header.key != 'Mode' and header.key != 'JWT' %}
4444
${{ header.key | caseCamel }} = getenv('{{ header.name}}') ?: '';
4545
setPreference('{{ header.name }}', ${{ header.key | caseCamel }});
4646
@@ -68,7 +68,7 @@ function loadEnvVariables(): bool
6868
function isPreferenceLoaded() : bool {
6969
if(empty(getPreference(PREFERENCE_ENDPOINT))) return false;
7070
{% for header in spec.global.headers %}
71-
{% if header.key != 'Mode' %}
71+
{% if header.key != 'Mode' and header.key != 'JWT' %}
7272
if(empty(getPreference('{{header.name}}'))) return false;
7373
{% endif %}
7474
{% endfor %}
@@ -167,20 +167,24 @@ $cli->
167167
168168
$cli
169169
->task('init')
170-
->label('description', "The init command is used to initialise your CLI\n")
170+
->label('description', "The init command is used to initialize your CLI\n")
171171
->param('endpoint', '', new Wildcard(), 'Your {{ spec.title | caseUcfirst }} endpoint', true)
172172
{% for header in spec.global.headers %}
173+
{% if header.key != 'JWT' %}
173174
->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', true)
175+
{% endif %}
174176
{% endfor %}
175-
->action(function( $endpoint, {% for header in spec.global.headers %} ${{ header.key | lower }}{% if not loop.last %},{% endif %}{% endfor %} ) {
177+
->action(function( $endpoint,{% for header in spec.global.headers %}{% if header.key != 'JWT' %} ${{ header.key | lower }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %} ) {
176178
/*
177-
* Check if enviroment variables exist
179+
* Check if environment variables exist
178180
* Else prompt the user
179181
*/
180182
181183
putenv("endpoint=$endpoint");
182184
{% for header in spec.global.headers %}
185+
{% if header.key != 'JWT' %}
183186
putenv("{{ header.name }}=${{ header.key | lower }}");
187+
{% endif %}
184188
{% endfor %}
185189
186190
if (!loadEnvVariables()) {

templates/cli/install.sh.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ install() {
116116
fi
117117
printSuccess
118118

119-
echo '
120-
#!/bin/bash
119+
echo '#!/bin/bash
121120
122121
allowList=(version help init client{% for service in spec.services %} {{ service.name }}{% endfor %})
123122

templates/cli/src/Client.php.twig

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Client
4444
self::PREFERENCE_ENDPOINT => '',
4545
self::PREFERENCE_SELF_SIGNED => '',
4646
{% for header in spec.global.headers %}
47-
{% if header.key != 'Mode' %}
47+
{% if header.key != 'Mode' and header.key != 'JWT' %}
4848
'{{header.name}}' => '',
4949
{% endif %}
5050
{% endfor %}
@@ -61,7 +61,7 @@ class Client
6161
}
6262
$this
6363
{% for header in spec.global.headers %}
64-
{% if header.key != 'Mode' %}
64+
{% if header.key != 'Mode' and header.key != 'JWT' %}
6565
->set{{header.key | caseUcfirst}}($this->preferences['{{header.name}}'])
6666
{% endif %}
6767
{% endfor %}
@@ -140,15 +140,15 @@ class Client
140140
private function isPreferenceLoaded() : bool {
141141
if(empty($this->getPreference(self::PREFERENCE_ENDPOINT))) return false;
142142
{% for header in spec.global.headers %}
143-
{% if header.key != 'Mode' %}
143+
{% if header.key != 'Mode' and header.key != 'JWT' %}
144144
if(empty($this->getPreference('{{header.name}}'))) return false;
145145
{% endif %}
146146
{% endfor %}
147147
return true;
148148
}
149149
150-
151150
{% for header in spec.global.headers %}
151+
{% if header.key != 'JWT' %}
152152
/**
153153
* Set {{header.key | caseUcfirst}}
154154
*
@@ -163,13 +163,11 @@ class Client
163163
public function set{{header.key | caseUcfirst}}($value)
164164
{
165165
$this->addHeader('{{header.name}}', $value);
166-
167166
return $this;
168167
}
169168
169+
{% endif %}
170170
{% endfor %}
171-
172-
173171
/**
174172
* @param $key
175173
* @param $value

0 commit comments

Comments
 (0)