Merge pull request #48 from udzuki/fix-47-eppn-unique-constraint-error

fix: 重複するalternatenameのePPN登録処理で一意性制約に違反
RCOSDP · Sep 14, 2022 · 9cf3e8e · 9cf3e8e
2 parents 424d7f4 + 221a366
commit 9cf3e8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xapi_stmt_gen/Dockerfile b/xapi_stmt_gen/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:12.22.0
 
-LABEL version="2.9.1"
+LABEL version="2.9.2"
 
 WORKDIR /usr/local/src
 RUN mkdir xapi_stmt_gen

diff --git a/xapi_stmt_gen/xapi_stmt_gen/generator.js b/xapi_stmt_gen/xapi_stmt_gen/generator.js
@@ -3723,7 +3723,7 @@ module.exports = async function main() { // eslint-disable-line max-statements
     // if authenticated using GakuNinLMS's LTI plugin
     const username = (
       (user.auth === 'lti' && config.LRS.ePPNScoped)
-      ? user.alternatename
+      ? user.alternatename // Can be null and not unique
       : user.username
     );
     const eppn = eppns.find((eppn) => {
@@ -3742,7 +3742,8 @@ module.exports = async function main() { // eslint-disable-line max-statements
         scope: scope, // nullable
         acl: scope ? scope.replace(/[.-]/g, '_') : null // used for RLS
       };
-      if (scope) {
+      // Exclude duplicates
+      if (scope && !newEppns.find(e => e.username === username)) {
         newEppns.push(userAttrs[user.id]);
       }
     }