Skip to content

Commit e0872cd

Browse files
authored
Merge branch '0.31' into feat/plugin/experiment
2 parents 132b037 + 8b541d7 commit e0872cd

File tree

2 files changed

+43
-3
lines changed

2 files changed

+43
-3
lines changed

.github/workflows/pipeline-release-tag.yml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ jobs:
250250
- setup
251251
- release
252252

253+
outputs:
254+
isLatest: ${{ steps.merge-check.outputs.isLatest }}
255+
253256
steps:
254257
- uses: actions/checkout@v4
255258
with:
@@ -267,10 +270,13 @@ jobs:
267270
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
268271
269272
- name: Check API and merge to master
273+
id: merge-check
270274
run: |
271275
response=`curl -s -X GET "https://api.supertokens.io/0/driver/latest/check?password=${{ secrets.SUPERTOKENS_API_KEY }}&version=${{ needs.setup.outputs.setupVersion }}&name=python" -H 'api-version: 0'`
272276
isLatest=$(echo $response | jq .isLatest)
273277
278+
echo "isLatest=$isLatest" | tee -a "$GITHUB_OUTPUT" "$GITHUB_ENV"
279+
274280
if [[ $isLatest == "true" ]]
275281
then
276282
git checkout master
@@ -288,17 +294,42 @@ jobs:
288294
needs:
289295
- setup
290296
- release
297+
- merge
291298

292299
steps:
293300
- uses: actions/checkout@v4
294301
with:
295302
ref: ${{ needs.setup.outputs.releaseTag }}
296303
fetch-tags: true
304+
path: supertokens-python
305+
306+
- uses: actions/checkout@v4
307+
with:
308+
repository: supertokens/supertokens-backend-website
309+
token: ${{ secrets.ALL_REPO_PAT }}
310+
path: supertokens-backend-website
311+
312+
- run: |
313+
shopt -s extglob # Enable extended globbing
314+
315+
if [[ "${{ needs.merge.outputs.isLatest }}" == "true" ]]
316+
then
317+
# Delete everything except the version folders
318+
rm -rf supertokens-backend-website/app/docs/sdk/docs/python/!(*.*.X)
319+
# Copy files to the root dir
320+
cp -r supertokens-python/html/supertokens_python/* supertokens-backend-website/app/docs/sdk/docs/python/
321+
fi
322+
323+
# Delete the current version folder if it exists
324+
rm -rf supertokens-backend-website/app/docs/sdk/docs/python/${{ needs.setup.outputs.versionFolder }}
325+
# Copy the current docs
326+
mkdir -p supertokens-backend-website/app/docs/sdk/docs/python/${{ needs.setup.outputs.versionFolder }}
327+
cp -r supertokens-python/html/supertokens_python/* supertokens-backend-website/app/docs/sdk/docs/python/${{ needs.setup.outputs.versionFolder }}
297328
298329
- uses: actions/upload-artifact@v4
299330
with:
300331
name: ${{ needs.setup.outputs.artifactName }}
301-
path: html/supertokens_python
332+
path: supertokens-backend-website/app/docs/sdk/docs/python
302333

303334
- name: Trigger the backend website CI
304335
uses: actions/github-script@v7
@@ -314,7 +345,7 @@ jobs:
314345
inputs: {
315346
"version": `${{ needs.setup.outputs.setupVersion }}`,
316347
"artifact-name": `${{ needs.setup.outputs.artifactName }}`,
317-
"version-folder": `${{ needs.setup.outputs.versionFolder }}`,
348+
"version-folder": `app/docs/sdk/docs/python`,
318349
"run-id": `${{ github.run_id }}`,
319350
"stage": "production",
320351
}

tests/test-server/app.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33
import os
44
import traceback
5-
from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar
5+
from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, TypeVar, Union
66

77
import override_logging
88
from accountlinking import add_accountlinking_routes # pylint: disable=import-error
@@ -55,6 +55,7 @@
5555
from supertokens_python.recipe.session import InputErrorHandlers, SessionContainer
5656
from supertokens_python.recipe.session.framework.flask import verify_session
5757
from supertokens_python.recipe.session.recipe import SessionRecipe
58+
from supertokens_python.recipe.session.utils import TokenTransferMethod
5859
from supertokens_python.recipe.thirdparty.provider import UserFields, UserInfoMap
5960
from supertokens_python.recipe.thirdparty.recipe import ThirdPartyRecipe
6061
from supertokens_python.recipe.totp.recipe import TOTPRecipe
@@ -302,6 +303,13 @@ async def custom_unauthorised_callback(
302303
)
303304
return response
304305

306+
def get_token_transfer_method(
307+
_: BaseRequest,
308+
__: bool,
309+
___: Dict[str, Any],
310+
) -> Union[TokenTransferMethod, Literal["any"]]:
311+
return recipe_config_json.get("getTokenTransferMethod", "any")
312+
305313
recipe_config_json = json.loads(recipe_config.get("config", "{}"))
306314
recipe_list.append(
307315
session.init(
@@ -322,6 +330,7 @@ async def custom_unauthorised_callback(
322330
use_dynamic_access_token_signing_key=recipe_config_json.get(
323331
"useDynamicAccessTokenSigningKey"
324332
),
333+
get_token_transfer_method=get_token_transfer_method,
325334
override=session.SessionOverrideConfig(
326335
apis=override_builder_with_logging(
327336
"Session.override.apis",

0 commit comments

Comments
 (0)