Skip to content

Feat node cli #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 24, 2022
Merged

Feat node cli #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af5f788
feat: set new upstream branch for starters
christyjacob4 Feb 24, 2022
48ab68b
feat: tweak client command
christyjacob4 Feb 24, 2022
d8addd8
feat: fix CLI tests
christyjacob4 Feb 24, 2022
6c490f8
Merge branch 'feat-preps-for-0.13' of github.com:appwrite/sdk-generat…
christyjacob4 Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions templates/cli/lib/commands/generic.js.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const client = new Command("client")
parse(config)
}

if (endpoint) {
if (endpoint !== undefined) {
try {
let url = new URL(endpoint);
if (url.protocol === "http:" || url.protocol === "https:") {
Expand All @@ -77,19 +77,19 @@ const client = new Command("client")
}
}

if (key) {
if (key !== undefined) {
globalConfig.setKey(key)
}

if (projectId) {
if (projectId !== undefined) {
localConfig.setProject(projectId, '');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the second parameter used for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

setProject(projectId, projectName)
Its the project name

}

if (selfSigned == true || selfSigned == false) {
globalConfig.setSelfSigned(selfSigned);
}

if (reset) {
if (reset !== undefined) {
globalConfig.setEndpoint("");
globalConfig.setKey("");
globalConfig.setCookie("");
Expand Down
3 changes: 1 addition & 2 deletions templates/cli/lib/commands/init.js.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ const initFunction = async () => {
git remote add -f origin https://github.com/{{ sdk.gitUserName }}/functions-starter && \
git config core.sparseCheckout true && \
echo '${answers.runtime.id}' >> .git/info/sparse-checkout && \
git pull origin dev && \
git checkout dev && \
git pull origin main && \
rm -rf .git && \
mv ${answers.runtime.id}/* . && \
rm -rf ${answers.runtime.id}`;
Expand Down
12 changes: 6 additions & 6 deletions templates/cli/lib/sdks.js.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ const sdkForProject = async () => {
.setSelfSigned(selfSigned)
.setLocale("en-US");

if (key) {
if (cookie) {
return client
{% if sdk.test != "true" %}
.setKey(key)
.setMode("default");
.setCookie(cookie)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a new setting?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No i just changed the order, to give higher preference to cookies that an API key

.setMode("admin");
{% endif %}
}

if (cookie) {
if (key) {
return client
{% if sdk.test != "true" %}
.setCookie(cookie)
.setMode("admin");
.setKey(key)
.setMode("default");
{% endif %}
}

Expand Down