Merge pull request #218 from silinternational/feature/remove-google

remove GOOGLE_ENABLE
silinternational · Jun 14, 2024 · 657fee2 · 657fee2
2 parents a94f8ba + 2860f3c
commit 657fee2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 56 deletions.
diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php
@@ -62,7 +62,6 @@
 $MYSQL_PASSWORD = Env::get('MYSQL_PASSWORD', '');
 
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 $HUB_MODE = Env::get('HUB_MODE', false);
 $ANALYTICS_ID = Env::get('ANALYTICS_ID', null);
 $PASSWORD_CHANGE_URL = Env::get('PASSWORD_CHANGE_URL');
@@ -584,8 +583,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
         'expirychecker' => true,
         'material' => true,
         'mfa' => true,

diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php
@@ -62,7 +62,6 @@
 $MYSQL_PASSWORD = Env::get('MYSQL_PASSWORD', '');
 
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 $HUB_MODE = Env::get('HUB_MODE', false);
 $ANALYTICS_ID = Env::get('ANALYTICS_ID', null);
 $PASSWORD_CHANGE_URL = Env::get('PASSWORD_CHANGE_URL');
@@ -584,8 +583,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
         'expirychecker' => true,
         'material' => true,
         'mfa' => true,

diff --git a/development/idp3-local/config/config.php b/development/idp3-local/config/config.php
@@ -27,7 +27,6 @@
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 $FORCE_DISCOVERY = Env::get('FORCE_DISCOVERY', false);
 
 $config = [
@@ -256,8 +255,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
     ],
 
     /*

diff --git a/development/sp-local/config/config.php b/development/sp-local/config/config.php
@@ -37,7 +37,6 @@
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
 $config = [
 
@@ -292,14 +291,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
-        'expirychecker' => true,
-        'material' => true,
-        'mfa' => true,
-        'profilereview' => true,
-        'silauth' => true,
-        'sildisco' => true,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
     ],
 
     /*

diff --git a/development/sp2-local/config/config.php b/development/sp2-local/config/config.php
@@ -37,7 +37,6 @@
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
 $config = [
 
@@ -292,14 +291,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
-        'expirychecker' => true,
-        'material' => true,
-        'mfa' => true,
-        'profilereview' => true,
-        'silauth' => true,
-        'sildisco' => true,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
     ],
 
     /*

diff --git a/development/sp3-local/config/config.php b/development/sp3-local/config/config.php
@@ -37,7 +37,6 @@
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
 $config = [
 
@@ -292,14 +291,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
-        'expirychecker' => true,
-        'material' => true,
-        'mfa' => true,
-        'profilereview' => true,
-        'silauth' => true,
-        'sildisco' => true,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
     ],
 
     /*

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -268,14 +268,6 @@ services:
 
       # Enable checking our test metadata
       - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
-
-      # Local modules
-      - ./modules/mfa:/data/vendor/simplesamlphp/simplesamlphp/modules/mfa
-      - ./modules/expirychecker:/data/vendor/simplesamlphp/simplesamlphp/modules/expirychecker
-      - ./modules/profilereview:/data/vendor/simplesamlphp/simplesamlphp/modules/profilereview
-      - ./modules/silauth:/data/vendor/simplesamlphp/simplesamlphp/modules/silauth
-      - ./modules/sildisco:/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco
-      - ./modules/material:/data/vendor/simplesamlphp/simplesamlphp/modules/material
     ports:
       - "8081:80"
     environment:
@@ -298,14 +290,6 @@ services:
 
       # Utilize custom metadata
       - ./development/sp2-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
-
-      # Local modules
-      - ./modules/mfa:/data/vendor/simplesamlphp/simplesamlphp/modules/mfa
-      - ./modules/expirychecker:/data/vendor/simplesamlphp/simplesamlphp/modules/expirychecker
-      - ./modules/profilereview:/data/vendor/simplesamlphp/simplesamlphp/modules/profilereview
-      - ./modules/silauth:/data/vendor/simplesamlphp/simplesamlphp/modules/silauth
-      - ./modules/sildisco:/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco
-      - ./modules/material:/data/vendor/simplesamlphp/simplesamlphp/modules/material
     ports:
       - "8082:80"
     environment:

diff --git a/dockerbuild/config/config.php b/dockerbuild/config/config.php
@@ -62,7 +62,6 @@
 $MYSQL_PASSWORD = Env::get('MYSQL_PASSWORD', '');
 
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
-$GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 $HUB_MODE = Env::get('HUB_MODE', false);
 $ANALYTICS_ID = Env::get('ANALYTICS_ID', null);
 $PASSWORD_CHANGE_URL = Env::get('PASSWORD_CHANGE_URL');
@@ -585,8 +584,9 @@
      */
 
     'module.enable' => [
-        // Setting to TRUE enables.
-        'authgoogle' => $GOOGLE_ENABLE,
+        'saml' => true,
+        'core' => true,
+        'admin' => true,
         'expirychecker' => true,
         'material' => true,
         'mfa' => true,

diff --git a/local.env.dist b/local.env.dist
@@ -12,7 +12,6 @@ BASE_URL_PATH=
 COMPOSER_ALLOW_SUPERUSER=1
 COMPOSER_AUTH={"github-oauth":{"github.com":"token-here"}}
 COMPOSER_CACHE_DIR=/composer
-GOOGLE_ENABLE=
 HUB_MODE=false
 ENABLE_DEBUG=