Skip to content

Commit bca1996

Browse files
vermakhushboovermakhushboo
committed
Merge branch '1.7.x' into feat-extend-function-headers
2 parents c087449 + 8845992 commit bca1996

22 files changed

Lines changed: 320 additions & 120 deletions

‎app/config/avatars/credit-cards.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'mastercard' => ['name' => 'Mastercard', 'path' => __DIR__ . '/credit-cards/mastercard.png'],
1414
'naranja' => ['name' => 'Naranja', 'path' => __DIR__ . '/credit-cards/naranja.png'],
1515
'targeta-shopping' => ['name' => 'Tarjeta Shopping', 'path' => __DIR__ . '/credit-cards/tarjeta-shopping.png'],
16-
'union-china-pay' => ['name' => 'Union China Pay', 'path' => __DIR__ . '/credit-cards/union-china-pay.png'],
16+
'unionpay' => ['name' => 'Union Pay', 'path' => __DIR__ . '/credit-cards/unionpay.png'],
1717
'visa' => ['name' => 'Visa', 'path' => __DIR__ . '/credit-cards/visa.png'],
1818
'mir' => ['name' => 'MIR', 'path' => __DIR__ . '/credit-cards/mir.png'],
1919
'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png'],

app/config/avatars/credit-cards/union-china-pay.png renamed to app/config/avatars/credit-cards/unionpay.png

File renamed without changes.

‎app/config/specs/open-api3-1.7.x-client.json‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2622,7 +2622,7 @@
26222622
"tags": [
26232623
"account"
26242624
],
2625-
"description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not be registered, a new user will be created. Use the returned user ID and secret and submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The secret sent to the user's email is valid for 15 minutes.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).",
2625+
"description": "Sends the user an email with a secret key for creating a session. If the email address has never been used, a **new account is created** using the provided `userId`. Otherwise, if the email address is already attached to an account, the **user ID is ignored**. Then, the user will receive an email with the one-time password. Use the returned user ID and secret and submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The secret sent to the user's email is valid for 15 minutes.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
26262626
"responses": {
26272627
"201": {
26282628
"description": "Token",
@@ -2673,7 +2673,7 @@
26732673
"properties": {
26742674
"userId": {
26752675
"type": "string",
2676-
"description": "User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2676+
"description": "User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the email address has never been used, a new account is created using the provided userId. Otherwise, if the email address is already attached to an account, the user ID is ignored.",
26772677
"x-example": "<USER_ID>"
26782678
},
26792679
"email": {
@@ -2755,7 +2755,7 @@
27552755
"properties": {
27562756
"userId": {
27572757
"type": "string",
2758-
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2758+
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the email address has never been used, a new account is created using the provided userId. Otherwise, if the email address is already attached to an account, the user ID is ignored.",
27592759
"x-example": "<USER_ID>"
27602760
},
27612761
"email": {
@@ -2977,7 +2977,7 @@
29772977
"properties": {
29782978
"userId": {
29792979
"type": "string",
2980-
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2980+
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the phone number has never been used, a new account is created using the provided userId. Otherwise, if the phone number is already attached to an account, the user ID is ignored.",
29812981
"x-example": "<USER_ID>"
29822982
},
29832983
"phone": {
@@ -3440,7 +3440,7 @@
34403440
"parameters": [
34413441
{
34423442
"name": "code",
3443-
"description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
3443+
"description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, unionpay, visa, mir, maestro, rupay.",
34443444
"required": true,
34453445
"schema": {
34463446
"type": "string",
@@ -3458,7 +3458,7 @@
34583458
"mastercard",
34593459
"naranja",
34603460
"targeta-shopping",
3461-
"union-china-pay",
3461+
"unionpay",
34623462
"visa",
34633463
"mir",
34643464
"maestro",
@@ -3478,7 +3478,7 @@
34783478
"Mastercard",
34793479
"Naranja",
34803480
"Tarjeta Shopping",
3481-
"Union China Pay",
3481+
"Union Pay",
34823482
"Visa",
34833483
"MIR",
34843484
"Maestro",
@@ -9847,6 +9847,11 @@
98479847
"description": "Function ID.",
98489848
"x-example": "5e5ea6g16897e"
98499849
},
9850+
"deploymentId": {
9851+
"type": "string",
9852+
"description": "Function's deployment ID used to create the execution.",
9853+
"x-example": "5e5ea5c16897e"
9854+
},
98509855
"trigger": {
98519856
"type": "string",
98529857
"description": "The trigger that caused the function to execute. Possible values can be: `http`, `schedule`, or `event`.",
@@ -9931,6 +9936,7 @@
99319936
"$updatedAt",
99329937
"$permissions",
99339938
"functionId",
9939+
"deploymentId",
99349940
"trigger",
99359941
"status",
99369942
"requestMethod",
@@ -9951,6 +9957,7 @@
99519957
"any"
99529958
],
99539959
"functionId": "5e5ea6g16897e",
9960+
"deploymentId": "5e5ea5c16897e",
99549961
"trigger": "http",
99559962
"status": "processing",
99569963
"requestMethod": "GET",

‎app/config/specs/open-api3-1.7.x-console.json‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,7 +2631,7 @@
26312631
"tags": [
26322632
"account"
26332633
],
2634-
"description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not be registered, a new user will be created. Use the returned user ID and secret and submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The secret sent to the user's email is valid for 15 minutes.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).",
2634+
"description": "Sends the user an email with a secret key for creating a session. If the email address has never been used, a **new account is created** using the provided `userId`. Otherwise, if the email address is already attached to an account, the **user ID is ignored**. Then, the user will receive an email with the one-time password. Use the returned user ID and secret and submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The secret sent to the user's email is valid for 15 minutes.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
26352635
"responses": {
26362636
"201": {
26372637
"description": "Token",
@@ -2682,7 +2682,7 @@
26822682
"properties": {
26832683
"userId": {
26842684
"type": "string",
2685-
"description": "User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2685+
"description": "User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the email address has never been used, a new account is created using the provided userId. Otherwise, if the email address is already attached to an account, the user ID is ignored.",
26862686
"x-example": "<USER_ID>"
26872687
},
26882688
"email": {
@@ -2764,7 +2764,7 @@
27642764
"properties": {
27652765
"userId": {
27662766
"type": "string",
2767-
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2767+
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the email address has never been used, a new account is created using the provided userId. Otherwise, if the email address is already attached to an account, the user ID is ignored.",
27682768
"x-example": "<USER_ID>"
27692769
},
27702770
"email": {
@@ -2986,7 +2986,7 @@
29862986
"properties": {
29872987
"userId": {
29882988
"type": "string",
2989-
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.",
2989+
"description": "Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars. If the phone number has never been used, a new account is created using the provided userId. Otherwise, if the phone number is already attached to an account, the user ID is ignored.",
29902990
"x-example": "<USER_ID>"
29912991
},
29922992
"phone": {
@@ -3445,7 +3445,7 @@
34453445
"parameters": [
34463446
{
34473447
"name": "code",
3448-
"description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
3448+
"description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, unionpay, visa, mir, maestro, rupay.",
34493449
"required": true,
34503450
"schema": {
34513451
"type": "string",
@@ -3463,7 +3463,7 @@
34633463
"mastercard",
34643464
"naranja",
34653465
"targeta-shopping",
3466-
"union-china-pay",
3466+
"unionpay",
34673467
"visa",
34683468
"mir",
34693469
"maestro",
@@ -3483,7 +3483,7 @@
34833483
"Mastercard",
34843484
"Naranja",
34853485
"Tarjeta Shopping",
3486-
"Union China Pay",
3486+
"Union Pay",
34873487
"Visa",
34883488
"MIR",
34893489
"Maestro",
@@ -41133,6 +41133,11 @@
4113341133
"description": "Function ID.",
4113441134
"x-example": "5e5ea6g16897e"
4113541135
},
41136+
"deploymentId": {
41137+
"type": "string",
41138+
"description": "Function's deployment ID used to create the execution.",
41139+
"x-example": "5e5ea5c16897e"
41140+
},
4113641141
"trigger": {
4113741142
"type": "string",
4113841143
"description": "The trigger that caused the function to execute. Possible values can be: `http`, `schedule`, or `event`.",
@@ -41217,6 +41222,7 @@
4121741222
"$updatedAt",
4121841223
"$permissions",
4121941224
"functionId",
41225+
"deploymentId",
4122041226
"trigger",
4122141227
"status",
4122241228
"requestMethod",
@@ -41237,6 +41243,7 @@
4123741243
"any"
4123841244
],
4123941245
"functionId": "5e5ea6g16897e",
41246+
"deploymentId": "5e5ea5c16897e",
4124041247
"trigger": "http",
4124141248
"status": "processing",
4124241249
"requestMethod": "GET",

0 commit comments

Comments
 (0)