fix: update cicd

Author: sattvikc

.circleci/authReactDrf.sh

@@ -66,6 +66,32 @@ jobs:
       - run: make with-django
       - run: (cd .circleci/ && ./websiteDjango.sh)
       - slack/status
+  test-website-drf-async:
+    docker:
+      - image: rishabhpoddar/supertokens_python_driver_testing
+    resource_class: large
+    steps:
+      - checkout
+      - run: update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
+      - run: update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
+      - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+      - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
+      - run: make with-django
+      - run: (cd .circleci/ && ./websiteDrfAsync.sh)
+      - slack/status
+  test-website-drf-sync:
+    docker:
+      - image: rishabhpoddar/supertokens_python_driver_testing
+    resource_class: large
+    steps:
+      - checkout
+      - run: update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
+      - run: update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
+      - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+      - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
+      - run: make with-django
+      - run: (cd .circleci/ && ./websiteDrfSync.sh)
+      - slack/status
   test-website-django2x:
     docker:
       - image: rishabhpoddar/supertokens_python_driver_testing
@@ -187,37 +213,6 @@ jobs:
       - store_artifacts:
           path: ../supertokens-auth-react/test_report/logs
           destination: logfiles
-  test-authreact-drf:
-    docker:
-      - image: rishabhpoddar/supertokens_python_driver_testing
-    resource_class: large
-    environment:
-      MOCHA_FILE: ../supertokens-auth-react/test_report/report_node-<< parameters.fdi-version >>.xml
-    parameters:
-      fdi-version:
-        type: string
-    parallelism: 4
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /
-      - run: update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
-      - run: update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
-      - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
-      - run: n 16
-      - run: node --version
-      - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
-      - run: make with-drf
-      - run: (cd .circleci && ./authReactDrf.sh << parameters.fdi-version >>)
-      - run: ls -la ../supertokens-auth-react/test_report || true
-      - store_test_results:
-          path: ../supertokens-auth-react/test_report/report_node-<< parameters.fdi-version >>.xml
-      - store_artifacts:
-          path: ../supertokens-auth-react/test_report/screenshots
-          destination: failed-test-screenshots
-      - store_artifacts:
-          path: ../supertokens-auth-react/test_report/logs
-          destination: logfiles
   test-success:
     docker:
       - image: rishabhpoddar/supertokens_python_driver_testing
@@ -279,7 +274,17 @@ workflows:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
               only: /test-cicd\/.*/
-      - test-website-drf:
+      - test-website-drf-async:
+          requires:
+            - test-dev-tag-as-not-passed
+          context:
+            - slack-notification
+          filters:
+            tags:
+              only: /dev-v[0-9]+(\.[0-9]+)*/
+            branches:
+              only: /test-cicd\/.*/
+      - test-website-drf-sync:
           requires:
             - test-dev-tag-as-not-passed
           context:
@@ -344,11 +349,12 @@ workflows:
             - test-website-fastapi
             - test-website-flask
             - test-website-django
+            - test-website-drf-async
+            - test-website-drf-sync
             - test-website-django2x
             - test-authreact-fastapi
             - test-authreact-flask
             - test-authreact-django
-            - test-authreact-drf
           context:
             - slack-notification
           filters:

.circleci/config_continue.yml

@@ -30,7 +30,7 @@ fi
 pluginInterfaceTag=$(echo $pluginInterfaceInfo | jq .tag | tr -d '"')
 pluginInterfaceVersion=$(echo $pluginInterfaceInfo | jq .version | tr -d '"')
 
-echo "Testing with frontend auth-react: $2, node tag: $3, FREE core: $coreVersion, plugin-interface: $pluginInterfaceVersion"
+echo "Testing with frontend website: $2, FREE core: $coreVersion, plugin-interface: $pluginInterfaceVersion"
 
 cd ../../
 git clone [email protected]:supertokens/supertokens-root.git
@@ -45,34 +45,32 @@ cd ../
 echo $SUPERTOKENS_API_KEY > apiPassword
 ./utils/setupTestEnvLocal
 cd ../
-git clone [email protected]:supertokens/supertokens-auth-react.git
-cd supertokens-auth-react
+git clone [email protected]:supertokens/supertokens-website.git
+cd supertokens-website
 git checkout $2
-npm run init > /dev/null
-(cd ./examples/for-tests && npm run link) # this is there because in linux machine, postinstall in npm doesn't work..
-cd ./test/server/
-npm i git+https://github.com:supertokens/supertokens-node.git#$3  
-npm i
-cd ../../../project/tests/auth-react/drf
+cd ../project/tests/frontendIntegration/drf_async
 export PYTHONPATH="${PYTHONPATH}:/root/project"
-uvicorn mysite.asgi:application --port 8083 &
+uvicorn mysite.asgi:application --port 8080 &
 pid=$!
-cd ../../../../supertokens-auth-react/
-
-# When testing with supertokens-auth-react for version >= 0.18 the SKIP_OAUTH 
-# flag will not be checked because Auth0 is used as a provider so that the Thirdparty tests can run reliably. 
-# In versions lower than 0.18 Github is used as the provider.
-
-SKIP_OAUTH=true npm run test-with-non-node
+uvicorn mysite.asgi:application --port 8082 &
+pid2=$!
+cd ../../../../supertokens-website/test/server
+npm i git+https://github.com:supertokens/supertokens-node.git#$3  
+npm i
+cd ../../
+npm i
+SUPERTOKENS_CORE_TAG=$coreTag NODE_PORT=8081 INSTALL_PATH=../supertokens-root npm test
 if [[ $? -ne 0 ]]
 then
-    echo "test failed... killing $pid and exiting!"
+    echo "test failed... killing $pid, $pid2 and exiting!"
     kill -9 $pid
+    kill -9 $pid2
     rm -rf ./test/server/node_modules/supertokens-node
     git checkout HEAD -- ./test/server/package.json
     exit 1
 fi
-echo "all tests passed, killing processes: $pid"
+echo "all tests passed, killing processes: $pid and $pid2"
 kill -9 $pid
+kill -9 $pid2
 rm -rf ./test/server/node_modules/supertokens-node
 git checkout HEAD -- ./test/server/package.json

.circleci/setupAndTestWithAuthReactWithDrf.sh renamed to .circleci/setupAndTestWithFrontendWithDrfAsync.sh

@@ -0,0 +1,76 @@
+coreInfo=`curl -s -X GET \
+"https://api.supertokens.io/0/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$1" \
+-H 'api-version: 0'`
+if [[ `echo $coreInfo | jq .tag` == "null" ]]
+then
+    echo "fetching latest X.Y.Z version for core, X.Y version: $1, planType: FREE gave response: $coreInfo"
+    exit 1
+fi
+coreTag=$(echo $coreInfo | jq .tag | tr -d '"')
+coreVersion=$(echo $coreInfo | jq .version | tr -d '"')
+
+pluginInterfaceVersionXY=`curl -s -X GET \
+"https://api.supertokens.io/0/core/dependency/plugin-interface/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$1" \
+-H 'api-version: 0'`
+if [[ `echo $pluginInterfaceVersionXY | jq .pluginInterface` == "null" ]]
+then
+    echo "fetching latest X.Y version for plugin-interface, given core X.Y version: $1, planType: FREE gave response: $pluginInterfaceVersionXY"
+    exit 1
+fi
+pluginInterfaceVersionXY=$(echo $pluginInterfaceVersionXY | jq .pluginInterface | tr -d '"')
+
+pluginInterfaceInfo=`curl -s -X GET \
+"https://api.supertokens.io/0/plugin-interface/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$pluginInterfaceVersionXY" \
+-H 'api-version: 0'`
+if [[ `echo $pluginInterfaceInfo | jq .tag` == "null" ]]
+then
+    echo "fetching latest X.Y.Z version for plugin-interface, X.Y version: $pluginInterfaceVersionXY, planType: FREE gave response: $pluginInterfaceInfo"
+    exit 1
+fi
+pluginInterfaceTag=$(echo $pluginInterfaceInfo | jq .tag | tr -d '"')
+pluginInterfaceVersion=$(echo $pluginInterfaceInfo | jq .version | tr -d '"')
+
+echo "Testing with frontend website: $2, FREE core: $coreVersion, plugin-interface: $pluginInterfaceVersion"
+
+cd ../../
+git clone [email protected]:supertokens/supertokens-root.git
+cd supertokens-root
+echo -e "core,$1\nplugin-interface,$pluginInterfaceVersionXY" > modules.txt
+./loadModules --ssh
+cd supertokens-core
+git checkout $coreTag
+cd ../supertokens-plugin-interface
+git checkout $pluginInterfaceTag
+cd ../
+echo $SUPERTOKENS_API_KEY > apiPassword
+./utils/setupTestEnvLocal
+cd ../
+git clone [email protected]:supertokens/supertokens-website.git
+cd supertokens-website
+git checkout $2
+cd ../project/tests/frontendIntegration/drf_sync
+export PYTHONPATH="${PYTHONPATH}:/root/project"
+python manage.py runserver 8080 &
+pid=$!
+python manage.py runserver 8082 &
+pid2=$!
+cd ../../../../supertokens-website/test/server
+npm i git+https://github.com:supertokens/supertokens-node.git#$3  
+npm i
+cd ../../
+npm i
+SUPERTOKENS_CORE_TAG=$coreTag NODE_PORT=8081 INSTALL_PATH=../supertokens-root npm test
+if [[ $? -ne 0 ]]
+then
+    echo "test failed... killing $pid, $pid2 and exiting!"
+    kill -9 $pid
+    kill -9 $pid2
+    rm -rf ./test/server/node_modules/supertokens-node
+    git checkout HEAD -- ./test/server/package.json
+    exit 1
+fi
+echo "all tests passed, killing processes: $pid and $pid2"
+kill -9 $pid
+kill -9 $pid2
+rm -rf ./test/server/node_modules/supertokens-node
+git checkout HEAD -- ./test/server/package.json