remove default theme files

Dockerfile

@@ -44,6 +44,11 @@ ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp
 # Copy modules into simplesamlphp
 COPY modules/ $SSP_PATH/modules
 
+# Copy material theme templates to other modules, just in case the "default" theme is selected
+COPY modules/material/themes/material/expirychecker/* $SSP_PATH/modules/expirychecker/templates/
+COPY modules/material/themes/material/mfa/* $SSP_PATH/modules/mfa/templates/
+COPY modules/material/themes/material/profilereview/* $SSP_PATH/modules/profilereview/templates/
+
 # Copy in SSP override files
 RUN mv $SSP_PATH/www/index.php $SSP_PATH/www/ssp-index.php
 COPY dockerbuild/ssp-overrides/index.php $SSP_PATH/www/index.php

README.md

@@ -192,7 +192,7 @@ Update `/simplesamlphp/config/config.php`:
 'theme.use' => 'material:material'
 ```
 
-This project provides a convenience by loading this config with whatever is in the environment variable `THEME_USE`._
+This project sets this as the default value in the provided config file.
 
 ##### Google reCAPTCHA
 

actions-services.yml

@@ -70,7 +70,6 @@ services:
       SECURE_COOKIE: "false"
       ADMIN_PROTECT_INDEX_PAGE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
       THEME_COLOR_SCHEME: "orange-light_blue"
       HUB_MODE: "true"
 
@@ -117,7 +116,6 @@ services:
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
       MYSQL_HOST: "db"
       MYSQL_DATABASE: "silauth"
       MYSQL_USER: "silauth"
@@ -148,7 +146,6 @@ services:
       IDP_NAME: "IDP 2"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
 
   ssp-idp3.local:
     build: .
@@ -261,7 +258,6 @@ services:
       SHOW_SAML_ERRORS: "true"
       SAML20_IDP_ENABLE: "false"
       ADMIN_PROTECT_INDEX_PAGE: "false"
-      THEME_USE: "material:material"
 
   # the broker and brokerDb containers are used by the silauth module
   broker:

development/idp-local/config/config.php

@@ -51,7 +51,6 @@
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
 $LOGGING_LEVEL = Env::get('LOGGING_LEVEL', 'NOTICE');
 $LOGGING_HANDLER = Env::get('LOGGING_HANDLER', 'stderr');
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 
 // Options: https://github.com/silinternational/simplesamlphp-module-material/blob/develop/README.md#branding
 $THEME_COLOR_SCHEME = Env::get('THEME_COLOR_SCHEME', null);
@@ -964,7 +963,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
     /*
      * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

development/idp2-local/config/config.php

@@ -51,7 +51,6 @@
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
 $LOGGING_LEVEL = Env::get('LOGGING_LEVEL', 'NOTICE');
 $LOGGING_HANDLER = Env::get('LOGGING_HANDLER', 'stderr');
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 
 // Options: https://github.com/silinternational/simplesamlphp-module-material/blob/develop/README.md#branding
 $THEME_COLOR_SCHEME = Env::get('THEME_COLOR_SCHEME', null);
@@ -964,7 +963,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
     /*
      * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

development/idp3-local/config/config.php

@@ -27,7 +27,6 @@
 $SESSION_COOKIE_LIFETIME = (int)(Env::get('SESSION_COOKIE_LIFETIME', 0));
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 $MEMCACHE_STORE_EXPIRES = (int)(Env::get('MEMCACHE_STORE_EXPIRES', (36 * 60 * 60))); // 36 hours.
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
 $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
@@ -445,7 +444,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
 
     /*

development/sp-local/config/config.php

@@ -37,7 +37,6 @@
 $SESSION_COOKIE_LIFETIME = (int)(Env::get('SESSION_COOKIE_LIFETIME', 0));
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
 $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
@@ -486,7 +485,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
 
     /*

development/sp2-local/config/config.php

@@ -37,7 +37,6 @@
 $SESSION_COOKIE_LIFETIME = (int)(Env::get('SESSION_COOKIE_LIFETIME', 0));
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
 $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
@@ -486,7 +485,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
 
     /*

development/sp3-local/config/config.php

@@ -37,7 +37,6 @@
 $SESSION_COOKIE_LIFETIME = (int)(Env::get('SESSION_COOKIE_LIFETIME', 0));
 $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days
 $SECURE_COOKIE = Env::get('SECURE_COOKIE', true);
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true);
 $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false);
 
@@ -486,7 +485,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
 
     /*

docker-compose.yml

@@ -127,7 +127,6 @@ services:
       SECURE_COOKIE: "false"
       ADMIN_PROTECT_INDEX_PAGE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
       THEME_COLOR_SCHEME: "orange-light_blue"
       HUB_MODE: "true"
 
@@ -184,7 +183,6 @@ services:
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
       SESSION_STORE_TYPE: "sql"
       MYSQL_HOST: "db"
       MYSQL_DATABASE: "silauth"
@@ -225,7 +223,6 @@ services:
       IDP_NAME: "IDP 2"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
-      THEME_USE: "material:material"
 
   ssp-idp3.local:
     build: .
@@ -372,7 +369,6 @@ services:
       SHOW_SAML_ERRORS: "true"
       SAML20_IDP_ENABLE: "false"
       ADMIN_PROTECT_INDEX_PAGE: "false"
-      THEME_USE: "material:material"
 
   # the broker and brokerDb containers are used by the silauth module
   broker:

dockerbuild/config/config.php

@@ -51,7 +51,6 @@
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
 $LOGGING_LEVEL = Env::get('LOGGING_LEVEL', 'NOTICE');
 $LOGGING_HANDLER = Env::get('LOGGING_HANDLER', 'stderr');
-$THEME_USE = Env::get('THEME_USE', 'material:material');
 
 // Options: https://github.com/silinternational/simplesamlphp-module-material/blob/develop/README.md#branding
 $THEME_COLOR_SCHEME = Env::get('THEME_COLOR_SCHEME', null);
@@ -963,7 +962,7 @@
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => $THEME_USE,
+    'theme.use' => 'material:material',
 
     /*
      * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

local.env.dist

@@ -56,7 +56,6 @@ HELP_CENTER_URL=
 SAML20_IDP_ENABLE=
 SECURE_COOKIE=
 SHOW_SAML_ERRORS=
-THEME_USE=
 TIMEZONE=
 XDEBUG_REMOTE_HOST=