Merge pull request #170 from silinternational/develop

Release 5.3.8
silinternational · Jul 31, 2024 · 0f909e2 · 0f909e2
2 parents ac9b6fc + edf9a3e
commit 0f909e2
Show file tree

Hide file tree

Showing 15 changed files with 1,173 additions and 1,153 deletions.
diff --git a/.github/workflows/deepfactor.yml b/.github/workflows/deepfactor.yml
diff --git a/development/authsources.php b/development/authsources.php
@@ -1,6 +1,6 @@
 <?php
 
-use Sil\SilAuth\config\ConfigManager;
+use SimpleSAML\Module\silauth\Auth\Source\config\ConfigManager;
 
 $config = [
     'admin' => [

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -63,7 +63,7 @@ services:
       PASSWORD_RULE_minLength: '10'
       PASSWORD_RULE_maxLength: '255'
       PASSWORD_RULE_minScore: '3'
-    command: [ 'bash', '-c', 'whenavail profileDb 3306 60 ./yii migrate --interactive=0 && ./run.sh' ]
+    command: ['bash', '-c', 'whenavail profileDb 3306 60 ./yii migrate --interactive=0 && ./run.sh']
 
   profileDb:
     image: mariadb:10
@@ -91,7 +91,7 @@ services:
     platform: linux/amd64
     ports:
       - '3000'
-  
+
   proxy:
     # https://github.com/silinternational/traefik-https-proxy
     image: silintl/traefik-https-proxy
@@ -152,10 +152,10 @@ services:
       MFA_WEBAUTHN_apiKey: 10345678-1234-1234-1234-123456789012
       MFA_WEBAUTHN_apiSecret: 11345678-1234-1234-1234-12345678
       MFA_WEBAUTHN_appId: https://profile.gtis.guru/
-      MFA_WEBAUTHN_rpDisplayName: "Local Development IDP"
+      MFA_WEBAUTHN_rpDisplayName: 'Local Development IDP'
       MFA_WEBAUTHN_rpId: gtis.guru
 
-    command: [ 'bash', '-c', 'whenavail brokerDb 3306 60 ./yii migrate --interactive=0 && ./run.sh' ]
+    command: ['bash', '-c', 'whenavail brokerDb 3306 60 ./yii migrate --interactive=0 && ./run.sh']
 
   brokerDb:
     image: mariadb:10
@@ -217,7 +217,8 @@ services:
       PASSWORD_CHANGE_URL: 'https://profile.gtis.guru/#/password/create'
       PASSWORD_FORGOT_URL: 'https://profile.gtis.guru/#/password/forgot'
       PROFILE_URL: 'https://profile.gtis.guru/#'
-    command: [ 'bash', '-c', 'whenavail silAuthDb 3306 60 ./run-idp.sh' ]
+      TRUSTED_URL_DOMAINS: profile.gtis.guru
+    command: ['bash', '-c', 'whenavail silAuthDb 3306 60 ./run-idp.sh']
 
   silAuthDb:
     image: mariadb:10
@@ -229,7 +230,6 @@ services:
       MYSQL_USER: 'user'
       MYSQL_PASSWORD: 'pass'
 
-
   dynamorestart:
     build: ./dynamorestart
     ports:
@@ -241,7 +241,7 @@ services:
       AWS_DEFAULT_REGION: us-east-1
       AWS_ACCESS_KEY_ID: abc123
       AWS_SECRET_ACCESS_KEY: abc123
-      AWS_DISABLE_SSL: "true"
+      AWS_DISABLE_SSL: 'true'
       API_KEY_TABLE: ApiKey
       WEBAUTHN_TABLE: WebAuthn
     depends_on:
@@ -253,12 +253,12 @@ services:
     image: amazon/dynamodb-local
     platform: linux/amd64
     ports:
-      - "8010:8000"
+      - '8010:8000'
     environment:
       AWS_ACCESS_KEY_ID: abc123
       AWS_SECRET_ACCESS_KEY: abc123
       AWS_DEFAULT_REGION: us-east-1
-    command: "-jar DynamoDBLocal.jar -sharedDb"
+    command: '-jar DynamoDBLocal.jar -sharedDb'
 
   mfaapi:
     build: ./serverless-mfa-api
@@ -271,11 +271,11 @@ services:
       AWS_DEFAULT_REGION: us-east-1
       AWS_ACCESS_KEY_ID: abc123
       AWS_SECRET_ACCESS_KEY: abc123
-      AWS_DISABLE_SSL: "true"
+      AWS_DISABLE_SSL: 'true'
       API_KEY_TABLE: ApiKey
       WEBAUTHN_TABLE: WebAuthn
     depends_on:
       - dynamo
       - dynamorestart
     working_dir: /src
-    command: bash -c "go run ./server/"
+    command: bash -c "go run ./server/"