feat!: Add OAuth2 recipe and introduce shouldTryLinkingWithSessionUser

.circleci/authReact.sh

@@ -23,59 +23,94 @@ done <<< "$version"
 
 coreDriverVersion=`echo $coreDriverArray | jq ". | last"`
 coreDriverVersion=`echo $coreDriverVersion | tr -d '"'`
-coreFree=`curl -s -X GET \
-"https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
--H 'api-version: 1'`
-if [[ `echo $coreFree | jq .core` == "null" ]]
+coreFree="null"
+
+if [ -f cdi-core-map.json ]
 then
-    echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
-    exit 1
+    cat cdi-core-map.json
+    echo "coreDriverVersion: $coreDriverVersion"
+
+    coreBranchName=`cat cdi-core-map.json | jq -r '.["'$coreDriverVersion'"]'`
+    if [ "$coreBranchName" != "null" ]
+    then
+        coreFree=$coreDriverVersion
+    fi
+fi
+
+if [ "$coreFree" == "null" ]
+then
+    coreFree=`curl -s -X GET \
+    "https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
+    -H 'api-version: 1'`
+    if [[ `echo $coreFree | jq .core` == "null" ]]
+    then
+        echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
+        exit 1
+    fi
+    coreFree=$(echo $coreFree | jq .core | tr -d '"')
 fi
-coreFree=$(echo $coreFree | jq .core | tr -d '"')
 
 frontendDriverVersion=$1
 frontendDriverVersion=`echo $frontendDriverVersion | tr -d '"'`
 
-nodeVersionXY=`curl -s -X GET \
-"https://api.supertokens.io/0/frontend-driver-interface/dependency/driver/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$frontendDriverVersion&driverName=node&frontendName=auth-react" \
--H 'api-version: 1'`
-if [[ `echo $nodeVersionXY | jq .driver` == "null" ]]
+nodeTag="null"
+if [ -f fdi-node-map.json ]
 then
-    echo "fetching latest X.Y version for driver given frontend-driver-interface X.Y version: $frontendDriverVersion gave response: $nodeVersionXY. Please make sure all relevant drivers have been pushed."
-    exit 1
+    nodeTag=`cat fdi-node-map.json | jq '.["'$frontendDriverVersion'"]' | tr -d '"'`
 fi
-nodeVersionXY=$(echo $nodeVersionXY | jq .driver | tr -d '"')
 
-nodeInfo=`curl -s -X GET \
-"https://api.supertokens.io/0/driver/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$nodeVersionXY&name=node" \
--H 'api-version: 0'`
-if [[ `echo $nodeInfo | jq .tag` == "null" ]]
+if [ "$nodeTag" == "null" ]
 then
-    echo "fetching latest X.Y.Z version for driver, X.Y version: $nodeVersionXY gave response: $nodeInfo"
-    exit 1
+    nodeVersionXY=`curl -s -X GET \
+    "https://api.supertokens.io/0/frontend-driver-interface/dependency/driver/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$frontendDriverVersion&driverName=node&frontendName=auth-react" \
+    -H 'api-version: 1'`
+    if [[ `echo $nodeVersionXY | jq .driver` == "null" ]]
+    then
+        echo "fetching latest X.Y version for driver given frontend-driver-interface X.Y version: $frontendDriverVersion gave response: $nodeVersionXY. Please make sure all relevant drivers have been pushed."
+        exit 1
+    fi
+    nodeVersionXY=$(echo $nodeVersionXY | jq .driver | tr -d '"')
+
+    nodeInfo=`curl -s -X GET \
+    "https://api.supertokens.io/0/driver/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$nodeVersionXY&name=node" \
+    -H 'api-version: 0'`
+    if [[ `echo $nodeInfo | jq .tag` == "null" ]]
+    then
+        echo "fetching latest X.Y.Z version for driver, X.Y version: $nodeVersionXY gave response: $nodeInfo"
+        exit 1
+    fi
+    nodeTag=$(echo $nodeInfo | jq .tag | tr -d '"')
 fi
-nodeTag=$(echo $nodeInfo | jq .tag | tr -d '"')
 
-frontendAuthReactVersionXY=`curl -s -X GET \
-"https://api.supertokens.io/0/frontend-driver-interface/dependency/frontend/latest?password=$SUPERTOKENS_API_KEY&frontendName=auth-react&mode=DEV&version=$frontendDriverVersion&driverName=node" \
--H 'api-version: 1'`
-if [[ `echo $frontendAuthReactVersionXY | jq .frontend` == "null" ]]
+frontendAuthReactTag="null"
+if [ -f fdi-auth-react-map.json ]
 then
-    echo "fetching latest X.Y version for frontend given frontend-driver-interface X.Y version: $frontendDriverVersion, name: auth-react gave response: $frontend. Please make sure all relevant frontend libs have been pushed."
-    exit 1
+    frontendAuthReactTag=`cat fdi-auth-react-map.json | jq '.["'$frontendDriverVersion'"]' | tr -d '"'`
 fi
-frontendAuthReactVersionXY=$(echo $frontendAuthReactVersionXY | jq .frontend | tr -d '"')
 
-frontendAuthReactInfo=`curl -s -X GET \
-"https://api.supertokens.io/0/frontend/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$frontendAuthReactVersionXY&name=auth-react" \
--H 'api-version: 0'`
-if [[ `echo $frontendAuthReactInfo | jq .tag` == "null" ]]
+if [ "$frontendAuthReactTag" == "null" ]
 then
-    echo "fetching latest X.Y.Z version for frontend, X.Y version: $frontendAuthReactVersionXY gave response: $frontendAuthReactInfo"
-    exit 1
+    frontendAuthReactVersionXY=`curl -s -X GET \
+    "https://api.supertokens.io/0/frontend-driver-interface/dependency/frontend/latest?password=$SUPERTOKENS_API_KEY&frontendName=auth-react&mode=DEV&version=$frontendDriverVersion&driverName=node" \
+    -H 'api-version: 1'`
+    if [[ `echo $frontendAuthReactVersionXY | jq .frontend` == "null" ]]
+    then
+        echo "fetching latest X.Y version for frontend given frontend-driver-interface X.Y version: $frontendDriverVersion, name: auth-react gave response: $frontend. Please make sure all relevant frontend libs have been pushed."
+        exit 1
+    fi
+    frontendAuthReactVersionXY=$(echo $frontendAuthReactVersionXY | jq .frontend | tr -d '"')
+
+    frontendAuthReactInfo=`curl -s -X GET \
+    "https://api.supertokens.io/0/frontend/latest?password=$SUPERTOKENS_API_KEY&mode=DEV&version=$frontendAuthReactVersionXY&name=auth-react" \
+    -H 'api-version: 0'`
+    if [[ `echo $frontendAuthReactInfo | jq .tag` == "null" ]]
+    then
+        echo "fetching latest X.Y.Z version for frontend, X.Y version: $frontendAuthReactVersionXY gave response: $frontendAuthReactInfo"
+        exit 1
+    fi
+    frontendAuthReactTag=$(echo $frontendAuthReactInfo | jq .tag | tr -d '"')
+    frontendAuthReactVersion=$(echo $frontendAuthReactInfo | jq .version | tr -d '"')
 fi
-frontendAuthReactTag=$(echo $frontendAuthReactInfo | jq .tag | tr -d '"')
-frontendAuthReactVersion=$(echo $frontendAuthReactInfo | jq .version | tr -d '"')
 
 if [[ $frontendDriverVersion == '1.3' || $frontendDriverVersion == '1.8' ]]; then
     # we skip this since the tests for auth-react here are not reliable due to race conditions...

.circleci/config.yml

@@ -7,6 +7,27 @@ orbs:
     continuation: circleci/[email protected]
     slack: circleci/[email protected]
     jq: circleci/[email protected]
+
+parameters:
+    force:
+        type: boolean
+        default: false
+    cdi-core-map:
+        type: string
+        default: "{}"
+    cdi-plugin-interface-map:
+        type: string
+        default: "{}"
+    fdi-node-map:
+        type: string
+        default: "{}"
+    fdi-auth-react-map:
+        type: string
+        default: "{}"
+    fdi-website-map:
+        type: string
+        default: "{}"
+
 jobs:
     publish:
         docker:
@@ -36,7 +57,7 @@ jobs:
             - run:
                   name: Generate config
                   command: |
-                      cd .circleci && ./generateConfig.sh
+                      cd .circleci && ./generateConfig.sh << pipeline.parameters.force >> '<< pipeline.parameters.cdi-core-map >>' '<< pipeline.parameters.cdi-plugin-interface-map >>' '<< pipeline.parameters.fdi-node-map >>' '<< pipeline.parameters.fdi-auth-react-map >>' '<< pipeline.parameters.fdi-website-map >>'
             - continuation/continue:
                   configuration_path: .circleci/config_continue.yml # use newly generated config to continue
 
@@ -52,12 +73,7 @@ workflows:
                           only: /v[0-9]+(\.[0-9]+)*/
                       branches:
                           ignore: /.*/
-            - setup:
-                  filters:
-                      tags:
-                          only: /dev-v[0-9]+(\.[0-9]+)*/
-                      branches:
-                          only: /test-cicd\/.*/
+            - setup
             - update-docs:
                   context:
                       - slack-notification

.circleci/config_continue.yml

@@ -4,6 +4,27 @@ orbs:
     continuation: circleci/[email protected]
     slack: circleci/[email protected]
     jq: circleci/[email protected]
+
+parameters:
+    force:
+        type: boolean
+        default: false
+    cdi-core-map:
+        type: string
+        default: "{}"
+    cdi-plugin-interface-map:
+        type: string
+        default: "{}"
+    fdi-node-map:
+        type: string
+        default: "{}"
+    fdi-auth-react-map:
+        type: string
+        default: "{}"
+    fdi-website-map:
+        type: string
+        default: "{}"
+
 jobs:
     test-dev-tag-as-not-passed:
         docker:
@@ -12,16 +33,16 @@ jobs:
             - run: echo "Testing branch << pipeline.git.branch >>"
             - when:
                   condition:
-                      not:
-                          matches:
-                              pattern: "^test-cicd/.*$"
-                              value: << pipeline.git.branch >>
+                      matches:
+                          pattern: "^[0-9]+\\.[0-9]+$" # X.Y branches
+                          value: << pipeline.git.branch >>
                   steps:
                       - checkout
                       - run: (cd .circleci/ && ./markDevTagAsTestNotPassed.sh)
     test-unit:
         docker:
             - image: rishabhpoddar/supertokens_node_driver_testing_node_20
+            - image: rishabhpoddar/oauth-server-cicd
         resource_class: large
         parameters:
             cdi-version:
@@ -39,6 +60,7 @@ jobs:
     test-backend-sdk-testing:
         docker:
             - image: rishabhpoddar/supertokens_node_driver_testing_node_20
+            - image: rishabhpoddar/oauth-server-cicd
         resource_class: large
         parameters:
             cdi-version:
@@ -57,6 +79,7 @@ jobs:
     test-website:
         docker:
             - image: rishabhpoddar/supertokens_website_sdk_testing
+            - image: rishabhpoddar/oauth-server-cicd
         resource_class: large
         parameters:
             fdi-version:
@@ -75,6 +98,7 @@ jobs:
     test-authreact:
         docker:
             - image: rishabhpoddar/supertokens_website_sdk_testing_node_16
+            - image: rishabhpoddar/oauth-server-cicd
         resource_class: large
         parameters:
             fdi-version:
@@ -92,6 +116,12 @@ jobs:
             - store_artifacts:
                   path: test_report/backend.log
                   destination: logs
+            - store_artifacts:
+                  path: test_report/screenshots
+                  destination: screenshots
+            - store_artifacts:
+                  path: test_report/react-logs
+                  destination: react-logs
             - slack/status
     test-success:
         docker:
@@ -100,10 +130,9 @@ jobs:
             - run: echo "Testing passed for branch << pipeline.git.branch >>"
             - when:
                   condition:
-                      not:
-                          matches:
-                              pattern: "^test-cicd/.*$"
-                              value: << pipeline.git.branch >>
+                      matches:
+                          pattern: "^[0-9]+\\.[0-9]+$" # X.Y branches
+                          value: << pipeline.git.branch >>
                   steps:
                       - checkout
                       - run: (cd .circleci/ && ./markAsSuccess.sh)

.circleci/configs/hydra.yml

@@ -0,0 +1,22 @@
+serve:
+    cookies:
+        same_site_mode: Lax
+
+urls:
+    self:
+        issuer: http://localhost:4444
+    consent: http://localhost:3001/auth/oauth/consent
+    login: http://localhost:3001/auth/oauth/login
+    logout: http://localhost:3001/auth/oauth/logout
+
+secrets:
+    system:
+        - youReallyNeedToChangeThis
+
+oidc:
+    subject_identifiers:
+        supported_types:
+            - pairwise
+            - public
+        pairwise:
+            salt: youReallyNeedToChangeThis

.circleci/doBackendSDKTests.sh

@@ -8,17 +8,33 @@ fi
 coreDriverVersion=$1
 coreDriverVersion=`echo $coreDriverVersion | tr -d '"'`
 
-frontendDriverVersion=$2
+frontendDriverVersion=`echo $2 | tr -d '"'`
 
-coreFree=`curl -s -X GET \
-"https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
--H 'api-version: 1'`
-if [[ `echo $coreFree | jq .core` == "null" ]]
+coreFree="null"
+if [ -f cdi-core-map.json ]
 then
-    echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
-    exit 1
+    cat cdi-core-map.json
+    echo "coreDriverVersion: $coreDriverVersion"
+
+    coreBranchName=`cat cdi-core-map.json | jq -r '.["'$coreDriverVersion'"]'`
+    if [ "$coreBranchName" != "null" ]
+    then
+        coreFree=$coreDriverVersion
+    fi
+fi
+
+if [ "$coreFree" == "null" ]
+then
+    coreFree=`curl -s -X GET \
+    "https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
+    -H 'api-version: 1'`
+    if [[ `echo $coreFree | jq .core` == "null" ]]
+    then
+        echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
+        exit 1
+    fi
+    coreFree=$(echo $coreFree | jq .core | tr -d '"')
 fi
-coreFree=$(echo $coreFree | jq .core | tr -d '"')
 
 cd ..
 ./test/testExports.sh

.circleci/doUnitTests.sh

@@ -8,15 +8,31 @@ fi
 coreDriverVersion=$1
 coreDriverVersion=`echo $coreDriverVersion | tr -d '"'`
 
-coreFree=`curl -s -X GET \
-"https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
--H 'api-version: 1'`
-if [[ `echo $coreFree | jq .core` == "null" ]]
+coreFree="null"
+if [ -f cdi-core-map.json ]
 then
-    echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
-    exit 1
+    cat cdi-core-map.json
+    echo "coreDriverVersion: $coreDriverVersion"
+
+    coreBranchName=`cat cdi-core-map.json | jq -r '.["'$coreDriverVersion'"]'`
+    if [ "$coreBranchName" != "null" ]
+    then
+        coreFree=$coreDriverVersion
+    fi
+fi
+
+if [ "$coreFree" == "null" ]
+then
+    coreFree=`curl -s -X GET \
+    "https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion&driverName=node" \
+    -H 'api-version: 1'`
+    if [[ `echo $coreFree | jq .core` == "null" ]]
+    then
+        echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
+        exit 1
+    fi
+    coreFree=$(echo $coreFree | jq .core | tr -d '"')
 fi
-coreFree=$(echo $coreFree | jq .core | tr -d '"')
 
 cd ..
 ./test/testExports.sh