Merge pull request #227 from silinternational/develop

Release 5.0.0 - Remove SAML login option

Dockerfile

@@ -20,11 +20,8 @@ RUN mkdir -p /data/public/
 # Make sure the Apache config is valid
 RUN ["apache2ctl", "configtest"]
 
-# Copy the SimpleSAMLphp configuration files to a temporary location
-COPY build/ssp-overrides /tmp/ssp-overrides
-
 # Put in place the script to be used by child Docker images to install Composer
-# dependencies and move the SSP overrides into place.
+# dependencies.
 COPY build/install-deps-and-ssp-overrides.sh /tmp
 RUN chmod +x /tmp/install-deps-and-ssp-overrides.sh
 

README.md

@@ -6,28 +6,18 @@ This website is available as a Docker image here:
 <https://hub.docker.com/r/silintl/developer-portal/>
 
 We recommend using that as the `FROM` in your own Dockerfile in your own
-private repo, where you would `COPY` into your own Docker image the files needed
-by SimpleSAMLphp (if using SAML logins), your own
-`/data/public/img/logos/site-logo.png`, etc.
+private repo, where you would `COPY` into your own Docker image any custom files
+you need (e.g. your own `/data/public/img/logos/site-logo.png`, etc.).
 
-Your Dockerfile should (in this order)...
-
-1. Put any custom SAML files into `/tmp/ssp-overrides`.
-2. Run the `/tmp/install-deps-and-ssp-overrides.sh`, since it will move the SAML
-   files into the SimpleSAMLphp folders within the `vendor` folder after
-   installing composer dependencies.
+Your Dockerfile should also run `/tmp/install-deps-and-ssp-overrides.sh`, since
+that is what installs the necessary composer dependencies.
 
 ### Example Dockerfile using this as the FROM ###
 
-    # Change 4.1.6 to the latest tagged version or whichever you want to have
-    FROM silintl/developer-portal:4.1.6
-
-    ENV REFRESHED_AT 2021-04-08
-
-    # Put in place any additional custom SAML files:
-    COPY build/ssp-overrides /tmp/ssp-overrides
+    # Change 5.0.0 to the latest tagged version or whichever you want to have
+    FROM silintl/developer-portal:5.0.0
 
-    # Put dependencies and SSP overrides in their final location
+    # Install dependencies
     RUN /tmp/install-deps-and-ssp-overrides.sh
 
     # Copy in any custom files needed, which are stored in this repo.

action-services.yml

@@ -56,8 +56,4 @@ services:
       APIAXLE_SECRET: developer-portal-dev-secret
       APIAXLE_SSL_VERIFYPEER: 'false'
       GOOGLE_OAUTH_ENABLED: 'false'
-      SAML_ENTITY_ID: http://developer-portal.local/simplesaml/module.php/saml/sp/metadata.php/default-sp
-      SAML_ADMIN_PASSWORD: dummy-for-tests-q6.eYWtfLF-BTQXf-OktD5lVFCOFyC4B
-      SAML_SECRET_SALT: dummy-for-tests-Ac4MTgO9UJ6_wpXXKc6EGU_.gWNNkdMe
-      SAML_IDP: NONE
     working_dir: /data

application/composer.json

@@ -13,17 +13,11 @@
         "hybridauth/hybridauth": "^3.6.0",
         "silinternational/php-env": "0.* || ^2.1 || ^3.0",
         "silinternational/apiaxle-sdk-php": "^2.0",
-        "simplesamlphp/simplesamlphp": "~1.18.6 || ^1.19",
         "guzzlehttp/guzzle-services": "^0.6 || ^1.0"
     },
     "require-dev": {
         "phake/phake": "^3.1",
         "phpunit/phpunit": "^9.0",
         "roave/security-advisories": "dev-master"
-    },
-    "config": {
-        "allow-plugins": {
-            "simplesamlphp/composer-module-installer": true
-        }
     }
 }