Merge pull request #201 from silinternational/develop

Release 10.0.0-alpha.1 - included modules

.gitignore

@@ -4,6 +4,7 @@ local.env
 .vagrant
 composer.phar
 /nbproject/
-local.*.env
+*.env
 *.aes
 dockercfg
+node_modules/

Dockerfile

@@ -39,20 +39,24 @@ COPY composer.lock /data/
 RUN composer self-update --no-interaction
 RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
 
-# Copy in SSP override files
 ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp
+
+# Copy modules into simplesamlphp
+COPY modules/ $SSP_PATH/modules
+
+# 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
 RUN mv $SSP_PATH/www/saml2/idp/SingleLogoutService.php $SSP_PATH/www/saml2/idp/ssp-SingleLogoutService.php
 COPY dockerbuild/ssp-overrides/SingleLogoutService.php $SSP_PATH/www/saml2/idp/SingleLogoutService.php
 COPY dockerbuild/ssp-overrides/saml20-idp-remote.php $SSP_PATH/metadata/saml20-idp-remote.php
 COPY dockerbuild/ssp-overrides/saml20-sp-remote.php $SSP_PATH/metadata/saml20-sp-remote.php
-COPY dockerbuild/ssp-overrides/config.php $SSP_PATH/config/config.php
+COPY dockerbuild/config/* $SSP_PATH/config/
 COPY dockerbuild/ssp-overrides/id.php $SSP_PATH/www/id.php
 COPY dockerbuild/ssp-overrides/announcement.php $SSP_PATH/announcement/announcement.php
 COPY tests /data/tests
 
-RUN cp $SSP_PATH/modules/sildisco/sspoverrides/www_saml2_idp/SSOService.php $SSP_PATH/www/saml2/idp/
+RUN cp $SSP_PATH/modules/sildisco/lib/SSOService.php $SSP_PATH/www/saml2/idp/
 RUN chmod a+x /data/run.sh /data/run-tests.sh
 
 ADD https://github.com/silinternational/config-shim/releases/latest/download/config-shim.gz config-shim.gz

Makefile

@@ -1,10 +1,5 @@
-start: ssp
-
-ssp: clean
-	docker-compose up -d ssp
-
 hub: clean
-	docker-compose up -d ssp-hub.local ssp-sp1.local sp2 ssp-idp1.local idp2
+	docker-compose up -d ssp-hub.local
 
 clean:
 	docker-compose kill
@@ -21,3 +16,15 @@ test:
 
 test-integration:
 	docker-compose run --rm test ./run-integration-tests.sh
+
+copyJsLib:
+	cp ./node_modules/@simplewebauthn/browser/dist/bundle/index.umd.min.js ./modules/material/www/simplewebauthn/browser.js
+	cp ./node_modules/@simplewebauthn/browser/LICENSE.md ./www/simplewebauthn/LICENSE.md
+
+deps:
+	docker-compose run --rm node npm install --ignore-scripts
+	make copyJsLib
+
+depsupdate:
+	docker-compose run --rm node npm update --ignore-scripts
+	make copyJsLib