supertokens
diff --git a/‎.circleci/config.yml‎
Lines changed: 102 additions & 1 deletion b/‎.circleci/config.yml‎
Lines changed: 102 additions & 1 deletion
diff --git a/‎.circleci/doOneMillionUsersTests.sh‎
Lines changed: 135 additions & 0 deletions b/‎.circleci/doOneMillionUsersTests.sh‎
Lines changed: 135 additions & 0 deletions
diff --git a/‎.circleci/doTests.sh‎
Lines changed: 2 additions & 17 deletions b/‎.circleci/doTests.sh‎
Lines changed: 2 additions & 17 deletions
diff --git a/‎.circleci/markPassed.sh‎
Lines changed: 29 additions & 0 deletions b/‎.circleci/markPassed.sh‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 1 deletion b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 8 additions & 1 deletion b/‎CHANGELOG.md‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎jar/postgresql-plugin-7.0.0.jar‎
213 KB b/‎jar/postgresql-plugin-7.0.0.jar‎
213 KB
diff --git a/‎pluginInterfaceSupported.json‎
Lines changed: 1 addition & 1 deletion b/‎pluginInterfaceSupported.json‎
Lines changed: 1 addition & 1 deletion
@@ -77,6 +77,88 @@ jobs:
           name: running tests
           command: (cd .circleci/ && ./doTests.sh)
       - slack/status
+  test-onemillionusers:
+    docker:
+      - image: rishabhpoddar/supertokens_postgresql_plugin_test
+    resource_class: large
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "14:68:18:82:73:00:e4:fc:9e:f3:6f:ce:1d:5c:6d:c4"
+      - checkout
+      - run:
+          name: update postgresql max_connections
+          command: |
+            sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/9.5/main/postgresql.conf
+      - run:
+          name: starting postgresql
+          command: |
+            (cd / && ./runPostgreSQL.sh)
+      - run:
+          name: create databases
+          command: |
+            psql -c "create database st0;"
+            psql -c "create database st1;"
+            psql -c "create database st2;"
+            psql -c "create database st3;"
+            psql -c "create database st4;"
+            psql -c "create database st5;"
+            psql -c "create database st6;"
+            psql -c "create database st7;"
+            psql -c "create database st8;"
+            psql -c "create database st9;"
+            psql -c "create database st10;"
+            psql -c "create database st11;"
+            psql -c "create database st12;"
+            psql -c "create database st13;"
+            psql -c "create database st14;"
+            psql -c "create database st15;"
+            psql -c "create database st16;"
+            psql -c "create database st17;"
+            psql -c "create database st18;"
+            psql -c "create database st19;"
+            psql -c "create database st20;"
+            psql -c "create database st21;"
+            psql -c "create database st22;"
+            psql -c "create database st23;"
+            psql -c "create database st24;"
+            psql -c "create database st25;"
+            psql -c "create database st26;"
+            psql -c "create database st27;"
+            psql -c "create database st28;"
+            psql -c "create database st29;"
+            psql -c "create database st30;"
+            psql -c "create database st31;"
+            psql -c "create database st32;"
+            psql -c "create database st33;"
+            psql -c "create database st34;"
+            psql -c "create database st35;"
+            psql -c "create database st36;"
+            psql -c "create database st37;"
+            psql -c "create database st38;"
+            psql -c "create database st39;"
+            psql -c "create database st40;"
+            psql -c "create database st41;"
+            psql -c "create database st42;"
+            psql -c "create database st43;"
+            psql -c "create database st44;"
+            psql -c "create database st45;"
+            psql -c "create database st46;"
+            psql -c "create database st47;"
+            psql -c "create database st48;"
+            psql -c "create database st49;"
+            psql -c "create database st50;"
+      - run:
+          name: running tests
+          command: (cd .circleci/ && ./doOneMillionUsersTests.sh)
+      - slack/status
+  mark-passed:
+    docker:
+      - image: rishabhpoddar/supertokens_postgresql_plugin_test
+    steps:
+      - checkout
+      - run: (cd .circleci && ./markPassed.sh)
+      - slack/status
 
 workflows:
   version: 2
@@ -89,4 +171,23 @@ workflows:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              ignore: /.*/
+      - test-onemillionusers:
+          context:
+            - slack-notification
+          filters:
+            tags:
+              only: /dev-v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
+      - mark-passed:
+          context:
+            - slack-notification
+          filters:
+            tags:
+              only: /dev-v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
+          requires:
+            - test
+            - test-onemillionusers
@@ -0,0 +1,135 @@
+function cleanup {
+    if test -f "pluginInterfaceExactVersionsOutput"; then
+        rm pluginInterfaceExactVersionsOutput 
+    fi
+}
+
+trap cleanup EXIT
+cleanup
+
+pluginInterfaceJson=`cat ../pluginInterfaceSupported.json`
+pluginInterfaceLength=`echo $pluginInterfaceJson | jq ".versions | length"`
+pluginInterfaceArray=`echo $pluginInterfaceJson | jq ".versions"`
+echo "got plugin interface relations"
+
+./getPluginInterfaceExactVersions.sh $pluginInterfaceLength "$pluginInterfaceArray"
+
+if [[ $? -ne 0 ]]
+then
+    echo "all plugin interfaces found... failed. exiting!"
+	exit 1
+else
+    echo "all plugin interfaces found..."
+fi
+
+# get plugin version
+pluginVersion=`cat ../build.gradle | grep -e "version =" -e "version="`
+while IFS='"' read -ra ADDR; do
+    counter=0
+    for i in "${ADDR[@]}"; do
+        if [ $counter == 1 ]
+        then
+            pluginVersion=$i
+        fi
+        counter=$(($counter+1))
+    done
+done <<< "$pluginVersion"
+
+responseStatus=`curl -s -o /dev/null -w "%{http_code}" -X PUT \
+  https://api.supertokens.io/0/plugin \
+  -H 'Content-Type: application/json' \
+  -H 'api-version: 0' \
+  -d "{
+	\"password\": \"$SUPERTOKENS_API_KEY\",
+	\"planType\":\"FREE\",
+	\"version\":\"$pluginVersion\",
+	\"pluginInterfaces\": $pluginInterfaceArray,
+	\"name\": \"postgresql\"
+}"`
+if [ $responseStatus -ne "200" ]
+then
+    echo "failed plugin PUT API status code: $responseStatus. Exiting!"
+	exit 1
+fi
+
+someTestsRan=false
+while read -u 10 line
+do
+    if [[ $line = "" ]]; then
+        continue
+    fi
+    i=0
+    currTag=`echo $line | jq .tag`
+    currTag=`echo $currTag | tr -d '"'`
+
+    currVersion=`echo $line | jq .version`
+    currVersion=`echo $currVersion | tr -d '"'`
+    piX=$(cut -d'.' -f1 <<<"$currVersion")
+    piY=$(cut -d'.' -f2 <<<"$currVersion")
+    piVersion="$piX.$piY"
+    
+    someTestsRan=true
+    
+    response=`curl -s -X GET \
+    "https://api.supertokens.io/0/plugin-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$piVersion" \
+    -H 'api-version: 0'`
+    if [[ `echo $response | jq .core` == "null" ]]
+    then
+        echo "fetching latest X.Y version for core given plugin-interface X.Y version: $piVersion gave response: $response"
+        exit 1
+    fi
+    coreVersionX2=$(echo $response | jq .core | tr -d '"')
+    
+    response=`curl -s -X GET \
+    "https://api.supertokens.io/0/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreVersionX2" \
+    -H 'api-version: 0'`
+    if [[ `echo $response | jq .tag` == "null" ]]
+    then
+        echo "fetching latest X.Y.Z version for core X.Y version: $coreVersionX2 gave response: $response"
+        exit 1
+    fi
+    coreVersionTag=$(echo $response | jq .tag | tr -d '"')
+
+    cd ../../
+    git clone [email protected]:supertokens/supertokens-root.git
+    cd supertokens-root
+
+    update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
+    update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
+
+    pluginX=$(cut -d'.' -f1 <<<"$pluginVersion")
+    pluginY=$(cut -d'.' -f2 <<<"$pluginVersion")
+    echo -e "core,$coreVersionX2\nplugin-interface,$piVersion\npostgresql-plugin,$pluginX.$pluginY" > modules.txt
+    ./loadModules
+    cd supertokens-core
+    git checkout $coreVersionTag
+    cd ../supertokens-plugin-interface
+    git checkout $currTag
+    cd ../supertokens-postgresql-plugin
+    git checkout dev-v$pluginVersion
+    cd ../
+    echo $SUPERTOKENS_API_KEY > apiPassword
+    export ONE_MILLION_USERS_TEST=1
+    ./utils/setupTestEnv --cicd
+    ./gradlew :supertokens-postgresql-plugin:test --tests io.supertokens.storage.postgresql.test.OneMillionUsersTest
+
+    if [[ $? -ne 0 ]]
+    then
+        cat logs/*
+        cd ../project/
+        echo "test failed... exiting!"
+        exit 1
+    fi
+    cd ../
+    rm -rf supertokens-root
+    cd project/.circleci
+done 10<pluginInterfaceExactVersionsOutput
+
+if [[ $someTestsRan = "true" ]]
+then
+    echo "all tests ran"
+    exit 0
+else
+    echo "no test ran"
+    exit 1
+fi
@@ -125,23 +125,8 @@ done 10<pluginInterfaceExactVersionsOutput
 
 if [[ $someTestsRan = "true" ]]
 then
-    echo "calling /core PATCH to make testing passed"
-    responseStatus=`curl -s -o /dev/null -w "%{http_code}" -X PATCH \
-        https://api.supertokens.io/0/plugin \
-        -H 'Content-Type: application/json' \
-        -H 'api-version: 0' \
-        -d "{
-            \"password\": \"$SUPERTOKENS_API_KEY\",
-            \"planType\":\"FREE\",
-            \"name\":\"postgresql\",
-            \"version\":\"$pluginVersion\",
-            \"testPassed\": true
-        }"`
-    if [ $responseStatus -ne "200" ]
-    then
-        echo "patch api failed"
-        exit 1
-    fi
+    echo "all tests ran"
+    exit 0
 else
     echo "no test ran"
     exit 1
 
@@ -0,0 +1,29 @@
+pluginVersion=`cat ../build.gradle | grep -e "version =" -e "version="`
+while IFS='"' read -ra ADDR; do
+    counter=0
+    for i in "${ADDR[@]}"; do
+        if [ $counter == 1 ]
+        then
+            pluginVersion=$i
+        fi
+        counter=$(($counter+1))
+    done
+done <<< "$pluginVersion"
+
+echo "calling /core PATCH to make testing passed"
+responseStatus=`curl -s -o /dev/null -w "%{http_code}" -X PATCH \
+    https://api.supertokens.io/0/plugin \
+    -H 'Content-Type: application/json' \
+    -H 'api-version: 0' \
+    -d "{
+        \"password\": \"$SUPERTOKENS_API_KEY\",
+        \"planType\":\"FREE\",
+        \"name\":\"postgresql\",
+        \"version\":\"$pluginVersion\",
+        \"testPassed\": true
+    }"`
+if [ $responseStatus -ne "200" ]
+then
+    echo "patch api failed"
+    exit 1
+fi
@@ -21,7 +21,7 @@
 - [ ] Issue this PR against the latest non released version branch.
    - To know which one it is, run find the latest released tag (`git tag`) in the format `vX.Y.Z`, and then find the latest branch (`git branch --all`) whose `X.Y` is greater than the latest released tag.
    - If no such branch exists, then create one from the latest released branch.
-
+- [ ] When adding new recipes, ensure that its performance is being measured in the `OneMillionUsersTest`
 ## Remaining TODOs for this PR
 - [ ] Item1
 - [ ] Item2
@@ -7,6 +7,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [7.0.0] - 2024-03-13
+
+- Replace `TotpNotEnabledError` with `UnknownUserIdTotpError`.
+- Support for MFA recipe
+- Adds a new `useStaticKey` param to `updateSessionInfo_Transaction`
+  - This enables smooth switching between `useDynamicAccessTokenSigningKey` settings by allowing refresh calls to
+    change the signing key type of a session
+
 ## [6.0.0] - 2024-03-05
 
 - Implements `deleteAllUserRoleAssociationsForRole`
@@ -151,7 +159,6 @@ CREATE INDEX IF NOT EXISTS app_id_to_user_id_primary_user_id_index ON app_id_to_
    ```
 4. Run the new instance(s) of the core (version 7.0.0)
 
-
 ## [4.0.2]
 
 - Fixes null pointer issue when user belongs to no tenant.
 
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "6.0.0"
+version = "7.0.0"
 
 repositories {
     mavenCentral()
 
@@ -1,6 +1,6 @@
 {
   "_comment": "contains a list of plugin interfaces branch names that this core supports",
   "versions": [
-    "5.0"
+    "6.0"
   ]
 }
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id 'java-library'`
`3`	`3`	`}`
`4`	`4`
`5`		`-version = "6.0.0"`
	`5`	`+version = "7.0.0"`
`6`	`6`
`7`	`7`	`repositories {`
`8`	`8`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"_comment": "contains a list of plugin interfaces branch names that this core supports",`
`3`	`3`	`"versions": [`
`4`		`- "5.0"`
	`4`	`+ "6.0"`
`5`	`5`	`]`
`6`	`6`	`}`