test: ci/cd fixing (#77)

* ci: test fixing

* ci: test fixing

* ci: test fixing

.circleci/config.yml

@@ -42,7 +42,7 @@ workflows:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              only: /test-cicd\/.*/
       - update-docs:
           context:
               - slack-notification

.circleci/config_continue.yml

@@ -8,9 +8,17 @@ jobs:
     docker:
       - image: rishabhpoddar/supertokens_website_sdk_testing_node_16
     steps:
-      - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/ # This makes npm use http instead of ssh (required for node 16)
-      - checkout
-      - run: (cd .circleci/ && ./markDevTagAsTestNotPassed.sh)
+      - run: echo "Testing branch << pipeline.git.branch >>"
+      - when:
+          condition:
+            not:
+              matches:
+                pattern: "^test-cicd/.*$"
+                value: << pipeline.git.branch >>
+          steps:
+            - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/ # This makes npm use http instead of ssh (required for node 16)
+            - checkout
+            - run: (cd .circleci/ && ./markDevTagAsTestNotPassed.sh)
   test-unit:
     docker: 
       - image: rishabhpoddar/supertokens_android_sdk_testing
@@ -51,6 +59,9 @@ jobs:
             echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
       - run: (cd .circleci/ && ./doTests.sh  << parameters.fdi-version >>)
+      - store_artifacts:
+          path: ../supertokens-root/logs
+          destination: logfiles
   test-success:
     docker:
       - image: rishabhpoddar/supertokens_website_sdk_testing_node_16
@@ -69,7 +80,7 @@ workflows:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              only: /test-cicd\/.*/
       - test-unit:
           requires:
             - test-dev-tag-as-not-passed
@@ -79,7 +90,7 @@ workflows:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              only: /test-cicd\/.*/
           matrix:
             parameters:
               fdi-version: placeholder

testHelpers/server/index.js

@@ -25,6 +25,7 @@ let { startST, stopST, killAllST, setupST, cleanST, setKeyValueInConfig, maxVers
 let { middleware, errorHandler } = require("supertokens-node/framework/express");
 let { verifySession } = require("supertokens-node/recipe/session/framework/express");
 const { spawnSync } = require("child_process");
+const morgan = require("morgan");
 let noOfTimesRefreshCalledDuringTest = 0;
 let noOfTimesGetSessionCalledDuringTest = 0;
 let noOfTimesRefreshAttemptedDuringTest = 0;
@@ -35,9 +36,10 @@ let NormalisedURLPath = require("supertokens-node/lib/build/normalisedURLPath").
 let Multitenancy, MultitenancyRaw, multitenancySupported;
 try {
     MultitenancyRaw = require("supertokens-node/lib/build/recipe/multitenancy/recipe").default;
-    Multitenancy = require("supertokens-node/lib/build/recipe/multitenancy");
+    Multitenancy = require("supertokens-node/lib/build/recipe/multitenancy/index");
     multitenancySupported = true;
-} catch {
+} catch (ex) {
+    console.log({ex});
     multitenancySupported = false;
 }
 
@@ -55,6 +57,8 @@ let app = express();
 app.use(urlencodedParser);
 app.use(jsonParser);
 app.use(cookieParser());
+app.use(morgan(`:date[iso] - :method :url`, { immediate: true }));
+app.use(morgan(`:date[iso] - :method :url :status :response-time ms - :res[content-length]`));
 
 let lastSetEnableAntiCSRF = false;
 let lastSetEnableJWT = false;
@@ -151,10 +155,10 @@ function getConfig(enableAntiCsrf, enableJWT, jwtPropertyName) {
                                 refreshPOST: undefined
                             };
                         },
-                        functions: function(oI) {
+                        functions: function (oI) {
                             return {
                                 ...oI,
-                                createNewSession: async function({ res, userId, accessTokenPayload, sessionData }) {
+                                createNewSession: async function ({ res, userId, accessTokenPayload, sessionData }) {
                                     accessTokenPayload = {
                                         ...accessTokenPayload,
                                         customClaim: "customValue"
@@ -211,6 +215,7 @@ app.use(
         credentials: true
     })
 );
+app.disable('etag');
 
 app.use(middleware());
 
@@ -255,8 +260,8 @@ app.post("/startst", async (req, res) => {
 
         SuperTokens.init(getConfig(enableAntiCsrf, enableJWT));
     }
-    let pid = await startST();
-    res.send(pid + "");
+    await startST();
+    res.send("");
 });
 
 app.get("/featureFlags", async (req, res) => {
@@ -509,7 +514,7 @@ app.get("/testError", (req, res) => {
 
 app.get("/throw-401", (req, res) => {
     res.status(401).send("Unauthorised");
-})
+});
 
 app.get("/stop", async (req, res) => {
     process.exit();
@@ -570,9 +575,9 @@ app.post("/logout-alt", async (req, res) => {
 app.get("/base-custom-auth", async (req, res) => {
     let header = req.headers["authorization"];
     if (header === "Bearer myOwnHeHe") {
-        return res.status(200).json({message: "OK"});
+        return res.status(200).json({ message: "OK" });
     } else {
-        return res.status(500).json({message: "Bad auth header"});
+        return res.status(500).json({ message: "Bad auth header" });
     }
 })
 
@@ -583,7 +588,8 @@ app.use("*", async (req, res, next) => {
 app.use(errorHandler());
 
 app.use(async (err, req, res, next) => {
-    res.send(500).send(err);
+    console.log({err, stack: new Error().stack });
+    res.status(500).send(err);
 });
 
 let server = http.createServer(app);