Merge pull request #163 from silinternational/develop

Release 5.3.7
silinternational · Jun 18, 2024 · ac9b6fc · ac9b6fc
2 parents 9f86c7e + aff1420
commit ac9b6fc
Show file tree

Hide file tree

Showing 59 changed files with 711 additions and 539 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ dist: deps
 logs:
 	docker-compose logs
 	docker-compose exec idp cat /var/log/apache2/error.log
-	
+
 phpmyadmin:
 	docker-compose up -d brokerPhpmyadmin profilePhpmyadmin
 
@@ -26,3 +26,6 @@ clean:
 	docker-compose run --rm node npm run clean
 	docker-compose kill
 	docker-compose rm -f
+
+format:
+	docker-compose run --rm node npm run format
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.0'
-
 services:
   node:
     image: node:18-alpine
@@ -20,11 +18,11 @@ services:
 
   api:
     image: silintl/idp-pw-api:develop
+    platform: linux/amd64
     ports:
       - '8080:80'
     depends_on:
       - profileDb
-      - memcache
       - broker
       - zxcvbn
       - idp
@@ -47,7 +45,6 @@ services:
       SUPPORT_URL: 'https://www.example.org/support'
       SUPPORT_FEEDBACK: 'https://www.example.org/support-feedback'
       UI_URL: 'https://profile.gtis.guru/#'
-      LOGO_URL: 'https://www.sil.org'
       UI_CORS_ORIGIN: 'https://profile.gtis.guru'
       ACCESS_TOKEN_HASH_KEY: 'KEY4TESTING'
       ZXCVBN_API_BASEURL: 'http://zxcvbn:3000'
@@ -66,11 +63,10 @@ services:
       PASSWORD_RULE_minLength: '10'
       PASSWORD_RULE_maxLength: '255'
       PASSWORD_RULE_minScore: '3'
-      MEMCACHE_CONFIG1_host: 'memcache'
     command: [ 'bash', '-c', 'whenavail profileDb 3306 60 ./yii migrate --interactive=0 && ./run.sh' ]
 
   profileDb:
-    image: mariadb:latest
+    image: mariadb:10
     ports:
       - '3306'
     environment:
@@ -80,7 +76,7 @@ services:
       MYSQL_PASSWORD: 'pass'
 
   profilePhpmyadmin:
-    image: phpmyadmin/phpmyadmin
+    image: phpmyadmin:5
     ports:
       - '8081:80'
     depends_on:
@@ -90,19 +86,16 @@ services:
       PMA_USER: 'user'
       PMA_PASSWORD: 'pass'
 
-  memcache:
-    image: memcached:1.4-alpine
-    ports:
-      - "11211"  
-
   zxcvbn:
     image: wcjr/zxcvbn-api
+    platform: linux/amd64
     ports:
       - '3000'
 
   proxy:
     # https://github.com/silinternational/traefik-https-proxy
     image: silintl/traefik-https-proxy
+    platform: linux/amd64
     ports:
       - '80:80'
       - '443:443'
@@ -127,6 +120,7 @@ services:
 
   broker:
     image: silintl/idp-id-broker:develop
+    platform: linux/amd64
     volumes:
       - ./development/m991231_235959_insert_test_users.php:/data/console/migrations/m991231_235959_insert_test_users.php
     ports:
@@ -164,7 +158,7 @@ services:
     command: [ 'bash', '-c', 'whenavail brokerDb 3306 60 ./yii migrate --interactive=0 && ./run.sh' ]
 
   brokerDb:
-    image: mariadb:latest
+    image: mariadb:10
     ports:
       - '3306'
     environment:
@@ -174,7 +168,7 @@ services:
       MYSQL_PASSWORD: 'pass'
 
   brokerPhpmyadmin:
-    image: phpmyadmin/phpmyadmin
+    image: phpmyadmin:5
     ports:
       - '8091:80'
     depends_on:
@@ -186,6 +180,7 @@ services:
 
   idp:
     image: silintl/ssp-base:develop
+    platform: linux/amd64
     volumes:
       - ./development/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
       - ./development/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
@@ -225,7 +220,7 @@ services:
     command: [ 'bash', '-c', 'whenavail silAuthDb 3306 60 ./run-idp.sh' ]
 
   silAuthDb:
-    image: mariadb:latest
+    image: mariadb:10
     ports:
       - '3306'
     environment:
@@ -256,6 +251,7 @@ services:
 
   dynamo:
     image: amazon/dynamodb-local
+    platform: linux/amd64
     ports:
       - "8010:8000"
     environment:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "idp-profile-ui",
-  "version": "5.3.5",
+  "version": "5.3.7",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -12,7 +12,8 @@
     "serve": "vue-cli-service serve",
     "serve:prod": "vue-cli-service serve --mode production",
     "build": "vue-cli-service build --modern",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "format": "prettier --write \"src/**/*.{js,vue}\""
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",

diff --git a/src/2sv/Change.vue b/src/2sv/Change.vue
@@ -13,13 +13,13 @@
     </p>
 
     <ButtonBar>
-      <v-btn to="/profile" outlined> 
+      <v-btn to="/profile" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.no') }}
       </v-btn>
 
       <v-spacer></v-spacer>
-      
-      <v-btn @click.once="yes(requested.id)" color="primary" outlined> 
+
+      <v-btn @click.once="yes(requested.id)" color="primary" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.yes') }}
       </v-btn>
     </ButtonBar>
@@ -32,17 +32,16 @@ import { find, remove, removeWebauthn, mfa, retrieve } from '@/global/mfa'
 export default {
   data: () => ({
     requested: {},
-  isLastOne: mfa.numVerified === 1
+    isLastOne: mfa.numVerified === 1,
   }),
   computed: {
-    label: vm => vm.requested?.label || '2SV',
+    label: (vm) => vm.requested?.label || '2SV',
   },
   methods: {
     async yes(id) {
       if (mfa.keys.id === id) {
         await removeWebauthn(id, mfa.keys.data[0].id)
-      }
-      else {
+      } else {
         await remove(id)
       }
 
@@ -54,4 +53,4 @@ export default {
     this.requested = find(this.$route.params.id)
   },
 }
-</script>
+</script>
diff --git a/src/2sv/Intro.vue b/src/2sv/Intro.vue
@@ -11,8 +11,15 @@
         </v-col>
       </v-row>
       <v-row justify="center">
-        <iframe width="560" height="315" src="https://www.youtube.com/embed/N1CNo4AZLRQ?rel=0" 
-                frameborder="0" allow="autoplay; encrypted-media;" allowfullscreen class="pa-4" />
+        <iframe
+          width="560"
+          height="315"
+          src="https://www.youtube.com/embed/N1CNo4AZLRQ?rel=0"
+          frameborder="0"
+          allow="autoplay; encrypted-media;"
+          allowfullscreen
+          class="pa-4"
+        />
       </v-row>
 
       <v-row justify="center" align="center">
@@ -26,11 +33,11 @@
     </BasePage>
 
     <ButtonBar>
-        <v-spacer></v-spacer>
-        
-        <v-btn to="/2sv/smartphone/intro" color="primary" outlined> 
-          {{ $vuetify.lang.t('$vuetify.global.button.continue') }}
-        </v-btn>
+      <v-spacer></v-spacer>
+
+      <v-btn to="/2sv/smartphone/intro" color="primary" outlined>
+        {{ $vuetify.lang.t('$vuetify.global.button.continue') }}
+      </v-btn>
     </ButtonBar>
   </ProfileWizard>
 </template>
@@ -40,7 +47,7 @@ import ProfileWizard from '@/profile/ProfileWizard'
 
 export default {
   components: {
-    ProfileWizard
-  }
+    ProfileWizard,
+  },
 }
-</script>
+</script>
diff --git a/src/2sv/Removed.vue b/src/2sv/Removed.vue
@@ -9,13 +9,13 @@
     </p>
 
     <ButtonBar>
-      <v-btn to="/profile" color="warning" outlined> 
+      <v-btn to="/profile" color="warning" outlined>
         {{ $vuetify.lang.t('$vuetify.2sv.removed.button.later') }}
       </v-btn>
 
       <v-spacer></v-spacer>
-      
-      <v-btn to="/2sv/intro" color="primary" outlined> 
+
+      <v-btn to="/2sv/intro" color="primary" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.yes') }}
       </v-btn>
     </ButtonBar>

diff --git a/src/2sv/codes/Intro.vue b/src/2sv/codes/Intro.vue
@@ -14,13 +14,13 @@
     </BasePage>
 
     <ButtonBar>
-      <v-btn @click.once="skip" color="warning" tabindex="-1" outlined> 
+      <v-btn @click.once="skip" color="warning" tabindex="-1" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.skip') }}
       </v-btn>
 
       <v-spacer></v-spacer>
-      
-      <v-btn to="/2sv/printable-backup-codes/new" color="primary" outlined> 
+
+      <v-btn to="/2sv/printable-backup-codes/new" color="primary" outlined>
         {{ $vuetify.lang.t('$vuetify.2sv.codes.intro.button.new') }}
       </v-btn>
     </ButtonBar>
@@ -29,18 +29,18 @@
 
 <script>
 import ProfileWizard from '@/profile/ProfileWizard'
-import mfa from '@/global/mfa';
+import mfa from '@/global/mfa'
 
 export default {
   components: {
-    ProfileWizard
+    ProfileWizard,
   },
   data: () => ({
     mfa,
   }),
   computed: {
-    hasOtherTypes: vm => vm.mfa.totp.id || vm.mfa.u2f.id || vm.mfa.keys.id,
-    hasNoMfa: vm => ! (vm.mfa.totp.id || vm.mfa.u2f.id || vm.mfa.keys.id || vm.mfa.backup.id),
+    hasOtherTypes: (vm) => vm.mfa.totp.id || vm.mfa.u2f.id || vm.mfa.keys.id,
+    hasNoMfa: (vm) => !(vm.mfa.totp.id || vm.mfa.u2f.id || vm.mfa.keys.id || vm.mfa.backup.id),
   },
   methods: {
     skip() {
@@ -49,7 +49,7 @@ export default {
       }
 
       this.$router.push('/profile/complete')
-    }
+    },
   },
 }
-</script>
+</script>