8.2.6

- Expand the existing user lookup to prevent unwanted user duplication (#134)

.github/auto-label.json

@@ -0,0 +1,9 @@
+{
+  "rules": {
+    "patch": ["*.info.yml"],
+    "frontend": ["*.js", "*.scss", "*.css", "*.twig", ".theme"],
+    "backend": ["*.php", "*.module"],
+    "ci": [".circleci", "blt", ".github"],
+    "tests": ["tests"]
+  }
+}

.github/workflows/label.yml

@@ -0,0 +1,28 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+name: PR Labeler
+on:
+  pull_request:
+    types: [opened, synchronize]
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: codelytv/pr-size-labeler@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          xs_max_size: '100'
+          s_max_size: '500'
+          m_max_size: '1000'
+          l_max_size: '3000'
+          fail_if_xl: 'false'
+          message_if_xl: ''
+      - uses: banyan/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,18 +1,29 @@
-# .github/workflows/release.yml
-name: Release
-
-on:
-  pull_request:
-    types: closed
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Tag
-        uses: K-Phoen/semver-release-action@master
-        with:
-          release_branch: master
-          tag_format: "%major%.%minor%.%patch%"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+# .github/workflows/release.yml
+name: Release
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
+    steps:
+      - name: Tag
+        id: tag
+        uses: K-Phoen/semver-release-action@master
+        with:
+          release_branch: main
+          tag_format: "%major%.%minor%.%patch%"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v3
+        with:
+          ref: 'main'
+          fetch-depth: 0
+      - name: Back to Dev
+        if: ${{ steps.tag.outputs.tag }}
+        run: |
+          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan back-to-dev ${{ steps.tag.outputs.tag }} $GITHUB_WORKSPACE main

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ jobs:
     name: PHPUnit Coverage Tests
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:php8
+      image: pookmish/drupal8ci:latest
     services:
       mysql:
         image: mysql:5.7
@@ -27,33 +27,84 @@ jobs:
         run: |
           composer global require su-sws/stanford-caravan:dev-8.x-2.x
           ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage
-
-  acceptance:
-    name: Codeception Acceptance Tests
-    runs-on: ubuntu-latest
-    env:
-      DRUPAL_DATABASE_NAME: drupal
-      DRUPAL_DATABASE_USERNAME: drupal
-      DRUPAL_DATABASE_PASSWORD: drupal
-      DRUPAL_DATABASE_HOST: mysql
-    container:
-      image: pookmish/drupal8ci:php8
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_DATABASE: drupal
-          MYSQL_USER: drupal
-          MYSQL_PASSWORD: drupal
-          MYSQL_ROOT_PASSWORD: drupal
-        ports:
-          - 33306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    steps:
-      - uses: actions/checkout@v3
+      - name: Save Test Results
+        uses: actions/upload-artifact@v3
+        if: failure()
         with:
-          path: project
-      - name: Run tests
-        run: |
-          composer global require su-sws/stanford-caravan:dev-8.x-2.x
-          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance
+          name: unit-tests-results
+          path: /var/www/html/artifacts
+#  acceptance:
+#    name: Codeception Acceptance Tests
+#    runs-on: ubuntu-latest
+#    env:
+#      DRUPAL_DATABASE_NAME: drupal
+#      DRUPAL_DATABASE_USERNAME: drupal
+#      DRUPAL_DATABASE_PASSWORD: drupal
+#      DRUPAL_DATABASE_HOST: mysql
+#    container:
+#      image: pookmish/drupal8ci:latest
+#      options: '--network-alias drupal8ci'
+#    services:
+#      mysql:
+#        image: mysql:5.7
+#        env:
+#          MYSQL_DATABASE: drupal
+#          MYSQL_USER: drupal
+#          MYSQL_PASSWORD: drupal
+#          MYSQL_ROOT_PASSWORD: drupal
+#        ports:
+#          - 33306:3306
+#        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          path: project
+#      - name: Run tests
+#        run: |
+#          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+#          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance
+#      - name: Save Test Results
+#        uses: actions/upload-artifact@v3
+#        if: always()
+#        with:
+#          name: acceptance-tests-results
+#          path: /var/www/html/artifacts
+#  functional:
+#    name: Codeception Functional Tests
+#    runs-on: ubuntu-latest
+#    env:
+#      DRUPAL_DATABASE_NAME: drupal
+#      DRUPAL_DATABASE_USERNAME: drupal
+#      DRUPAL_DATABASE_PASSWORD: drupal
+#      DRUPAL_DATABASE_HOST: mysql
+#    container:
+#      image: pookmish/drupal8ci:latest
+#      options: '--network-alias=drupal8ci'
+#    services:
+#      selenium:
+#        image: selenium/standalone-chrome
+#        options: '--shm-size="2g"'
+#      mysql:
+#        image: mysql:5.7
+#        env:
+#          MYSQL_DATABASE: drupal
+#          MYSQL_USER: drupal
+#          MYSQL_PASSWORD: drupal
+#          MYSQL_ROOT_PASSWORD: drupal
+#        ports:
+#          - 33306:3306
+#        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          path: project
+#      - name: Run tests
+#        run: |
+#          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+#          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=functional
+#      - name: Save Test Results
+#        uses: actions/upload-artifact@v3
+#        if: always()
+#        with:
+#          name: functional-tests-results
+#          path: /var/www/html/artifacts

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Stanford SSP
 
+8.2.6
+--------------------------------------------------------------------------------
+_Release Date: 2023-01-09_
+
+- Expand the existing user lookup to prevent unwanted user duplication (#134)
 
 8.2.5
 --------------------------------------------------------------------------------

composer.json

@@ -5,14 +5,15 @@
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.0.0",
-        "composer/installers": "^1.2",
-        "drupal/simplesamlphp_auth": "^3.1",
-        "ext-json": "*"
+        "php": ">=8.1",
+        "ext-json": "*",
+        "drupal/core": "^9.4 || ^10.0",
+        "drupal/simplesamlphp_auth": "^3.1"
     },
     "require-dev": {
         "su-sws/drupal-patches": "^8.0"
     },
+    "prefer-stable": true,
     "config": {
         "sort-packages": true
     },

config/install/stanford_ssp.settings.yml

@@ -1,6 +1,8 @@
 saml_attribute: eduPersonEntitlement
 use_workgroup_api: false
 hide_local_login: true
+local_login_fieldset_label: 'Drupal Login'
+local_login_fieldset_open: false
 workgroup_api_cert: ''
 workgroup_api_key: ''
 restriction: all

config/schema/stanford_ssp.schema.yml

@@ -12,6 +12,12 @@ stanford_ssp.settings:
     hide_local_login:
       type: boolean
       label: 'Hide core local login form on user page'
+    local_login_fieldset_label:
+      type: string
+      label: 'Local login fieldset label'
+    local_login_fieldset_open:
+      type: boolean
+      label: Default open state for local login fieldset
     use_workgroup_api:
       type: boolean
       label: 'Use workgroup mapping instead of saml attributes'

src/Commands/StanfordSspCommands.php

@@ -71,7 +71,7 @@ public function __construct(AuthmapInterface $auth_map, FormBuilderInterface $fo
    * @command saml:entitlement-role
    * @aliases ssp-ser,saml-entitlement-role
    */
-  public function entitlementRole($entitlement, $role_id) {
+  public function entitlementRole(string $entitlement, string $role_id) {
     $role_id = Html::escape($role_id);
     $existing_roles = user_roles(TRUE);
     if (!isset($existing_roles[$role_id])) {
@@ -120,7 +120,7 @@ public function entitlementRole($entitlement, $role_id) {
    * @command saml:add-user
    * @aliases ssp-au,saml-add-user
    */
-  public function addUser($sunetid, array $options = [
+  public function addUser(string $sunetid, array $options = [
     'name' => NULL,
     'email' => NULL,
     'roles' => NULL,

src/EventSubscriber/StanfordSSPEventSubscriber.php

@@ -84,7 +84,7 @@ public function responseHandler(ResponseEvent $event) {
       $url = Url::fromRoute('user.login', [], ['query' => ['destination' => $destination]]);
       if ($this->samlConfig->get('activate') && $this->stanfordConfig->get('hide_local_login')) {
         global $base_url;
-        $destination = "$base_url/$destination";;
+        $destination = "$base_url/$destination";
         $url = Url::fromRoute('simplesamlphp_auth.saml_login', [], ['query' => ['ReturnTo' => $destination]]);
       }
 

src/Form/RoleSyncForm.php

@@ -124,7 +124,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ],
     ];
 
-    foreach ($form_state->get('mappings', []) as $role_mapping) {
+    foreach ($form_state->get('mappings') as $role_mapping) {
       $form['user_info']['role_population'][$role_mapping] = $this->buildRoleRow($role_mapping);
     }
 
@@ -209,7 +209,7 @@ protected function getRoleHeaders() {
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
-  protected function buildRoleRow($role_mapping_string) {
+  protected function buildRoleRow(string $role_mapping_string): array {
     [$role_id, $comparison] = explode(':', $role_mapping_string, 2);
 
     $exploded_comparison = explode(',', $comparison, 3);
@@ -287,7 +287,7 @@ public function addMappingCallback(array $form, FormStateInterface $form_state)
    *   Current form state.
    */
   public function removeMappingCallback(array $form, FormStateInterface $form_state) {
-    $mappings = $form_state->get('mappings', []);
+    $mappings = $form_state->get('mappings');
     unset($mappings[$form_state->getTriggeringElement()['#mapping']]);
     $form_state->set('mappings', $mappings);
     $form_state->setRebuild();

src/Service/StanfordSSPAuthManager.php

@@ -55,6 +55,7 @@ public function getAttribute($attribute) {
         return $this->getAuthname() . '@stanford.edu';
       }
     }
+    return FALSE;
   }
 
 }