Enable session middleware by default (fixes U&P provider authentication)

.github/actions/run-e2e-tests/script.sh

@@ -3,6 +3,11 @@ if [[ -z "$RUN_EE" ]]; then
   export STRAPI_DISABLE_EE=true
 fi
 
+export ENV_PATH="$(pwd)/testApp/.env"
+
+echo "env path :"
+echo $ENV_PATH
+
 opts=($DB_OPTIONS)
 
 yarn run -s test:generate-app "${opts[@]}" $@

examples/getstarted/config/middlewares.js

@@ -10,6 +10,7 @@ module.exports = [
   'strapi::logger',
   'strapi::query',
   'strapi::body',
+  'strapi::session',
   // 'strapi::compression',
   // 'strapi::ip',
   {

examples/getstarted/config/server.js

@@ -5,8 +5,12 @@ const cronTasks = require('./src/cron-tasks');
 module.exports = ({ env }) => ({
   host: env('HOST', '0.0.0.0'),
   port: env.int('PORT', 1337),
+  url: 'http://localhost:1337',
   cron: {
     enabled: true,
     tasks: cronTasks,
   },
+  app: {
+    keys: env.array('APP_SECRETS', ['toBeModified1', 'toBeModified2']),
+  },
 });

packages/core/admin/server/strategies/api-token.js

@@ -16,9 +16,6 @@ const extractToken = ctx => {
 
     return parts[1];
   }
-  if (ctx.query.access_token) {
-    return ctx.query.access_token;
-  }
 
   return null;
 };

packages/core/strapi/lib/Strapi.js

@@ -189,15 +189,13 @@ class Strapi {
   }
 
   sendStartupTelemetry() {
-    // Get database clients
-    const databaseClients = _.map(this.config.get('connections'), _.property('settings.client'));
-
     // Emit started event.
     // do not await to avoid slower startup
     this.telemetry.send('didStartServer', {
-      database: databaseClients,
-      plugins: this.config.installedPlugins,
-      providers: this.config.installedProviders,
+      database: strapi.config.get('database.connection.client'),
+      plugins: Object.keys(strapi.plugins),
+      // TODO: to add back
+      // providers: this.config.installedProviders,
     });
   }
 

packages/core/strapi/lib/middlewares/index.js

@@ -12,8 +12,7 @@ const query = require('./query');
 const responseTime = require('./response-time');
 const responses = require('./responses');
 const security = require('./security');
-// TODO: add back ?
-// session: require('./session'),
+const session = require('./session');
 const publicStatic = require('./public');
 
 module.exports = {
@@ -23,6 +22,7 @@ module.exports = {
   cors,
   responseTime,
   poweredBy,
+  session,
   logger,
   compression,
   responses,

packages/core/strapi/lib/middlewares/session.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const { defaultsDeep, isEmpty, isArray } = require('lodash/fp');
+const session = require('koa-session');
+
+const defaultConfig = {
+  key: 'koa.sess',
+  maxAge: 86400000,
+  autoCommit: true,
+  overwrite: true,
+  httpOnly: true,
+  signed: true,
+  rolling: false,
+  renew: false,
+  secure: process.env.NODE_ENV === 'production' ? true : false,
+  sameSite: null,
+};
+
+module.exports = (userConfig, { strapi }) => {
+  const keys = strapi.server.app.keys;
+  if (!isArray(keys) || isEmpty(keys) || keys.some(isEmpty)) {
+    throw new Error(`App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`);
+  }
+
+  const config = defaultsDeep(defaultConfig, userConfig);
+
+  strapi.server.use(session(config, strapi.server.app));
+};

packages/core/strapi/lib/services/fs.js

@@ -12,7 +12,7 @@ module.exports = strapi => {
 
     const normalizedPath = path.normalize(filePath).replace(/^\/?(\.\/|\.\.\/)+/, '');
 
-    return path.join(strapi.dirs.root, normalizedPath);
+    return path.resolve(strapi.dirs.root, normalizedPath);
   }
 
   const strapiFS = {

packages/core/strapi/lib/services/server/index.js

@@ -28,7 +28,10 @@ const healthCheck = async ctx => {
  * @returns {Server}
  */
 const createServer = strapi => {
-  const app = createKoaApp({ proxy: strapi.config.get('server.proxy') });
+  const app = createKoaApp({
+    proxy: strapi.config.get('server.proxy'),
+    keys:  strapi.config.get('server.app.keys'),
+  });
 
   const router = new Router();
 

packages/core/strapi/lib/services/server/koa.js

@@ -53,8 +53,9 @@ const addCustomMethods = app => {
   return app;
 };
 
-const createKoaApp = ({ proxy }) => {
+const createKoaApp = ({ proxy, keys }) => {
   const app = new Koa({ proxy });
+  app.keys = keys;
 
   addCustomMethods(app);