Merge pull request #1615 from fudgeu/issue/1607-retire-cookie-class

Fix #1607: Retire cookie class

.env

@@ -103,4 +103,8 @@ LTI_KEY="materia-production-lti-key"
 #GENERATION_API_KEY=
 #GENERATION_API_VERSION=
 #GENERATION_API_MODEL=
-#GENERATION_LOG_STATS=true
+#GENERATION_LOG_STATS=true
+
+# webserver settings =======
+
+#IS_SERVER_HTTPS=true

docker/.env

@@ -44,4 +44,9 @@ GENERATION_API_VERSION=
 # required for openai
 GENERATION_API_MODEL=
  # not required. stat logging is set to debug threshold
-GENERATION_LOG_STATS=true
+GENERATION_LOG_STATS=true
+
+# webserver environment variables
+
+# not required, will default to true if unset. signifies if the webserver is using HTTPS or not
+IS_SERVER_HTTPS=true

fuel/app/bootstrap.php

@@ -16,8 +16,7 @@
 	'Cache'                    => $materia_path.'/fuel/core/cache.php',
 	'Fuel\\Core\\Errorhandler' => $materia_path.'/fuel/core/errorhandler.php',
 	'Log'                      => $materia_path.'/fuel/core/log.php',
-	'TestCase'                 => $materia_path.'/fuel/core/testcase.php',
-	'Cookie'                   => $materia_path.'/fuel/core/cookie.php'
+	'TestCase'                 => $materia_path.'/fuel/core/testcase.php'
 	// TODO: build task that will resolve/populate all the classes in materia here
 ]);
 

fuel/app/config/config.php

@@ -196,18 +196,18 @@
 	/**
 	 * Cookie settings
 	 */
-	// 'cookie' => array(
+	'cookie' => array(
 		// Number of seconds before the cookie expires
 		// 'expiration'  => 0,
 		// Restrict the path that the cookie is available to
 		// 'path'        => '/',
 		// Restrict the domain that the cookie is available to
 		// 'domain'      => null,
 		// Only transmit cookies over secure connections
-		// 'secure'      => false,
+		'secure'      => filter_var($_ENV['IS_SERVER_HTTPS'] ?? true, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? true,
 		// Only transmit cookies over HTTP, disabling Javascript access
 		// 'http_only'   => false,
-	// ),
+	),
 
 	/**
 	 * Validation settings

fuel/app/config/session.php

@@ -13,4 +13,5 @@
 			]
 		],
 		'expiration_time' => $_ENV['SESSION_EXPIRATION'] ?? null,
+		'cookie_same_site' => 'None',
 ];