Skip to content

Commit

Permalink
Merge pull request #326 from asit-asso/bug-user-324-2fa
Browse files Browse the repository at this point in the history 
Bug création de user (2FA)
  • Loading branch information
@yblatti
yblatti authored Aug 14, 2024
2 parents 3cef96c + 7a594fc commit 0a13ec4
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 27 deletions.
4 changes: 2 additions & 2 deletions extract-connector-easysdiv4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-connector-easysdiv4</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extract-interface/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-archive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-archive</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-email/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-email</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-fmedesktop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-fmedesktop</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-fmeserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-fmeserver</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-qgisprint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-qgisprint</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>

<repositories>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-reject/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-reject</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-remark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-remark</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract-task-validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-task-validation</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>jar</packaging>
<pluginRepositories>
<pluginRepository>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extract/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>ch.asit_asso</groupId>
<artifactId>extract</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<packaging>war</packaging>

<name>extract</name>
Expand Down Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-plugin-commoninterface</artifactId>
<version>2.1.2-RELEASE</version>
<version>2.1.3-RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
14 changes: 9 additions & 5 deletions extract/src/main/java/ch/asit_asso/extract/web/model/UserModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,15 @@ public final User updateDomainObject(final User domainUser, final Secrets secret

domainUser.setMailActive(this.isMailActive());


if (this.isBeingCreated()){
// User type is set only at creation (or via the migration tool)
domainUser.setUserType(this.getUserType());

// At creation 2FA status is always inactive (but is changed later if TwoFactorForced == true)
domainUser.setTwoFactorStatus(TwoFactorStatus.INACTIVE);
}

//this.processTwoFactorChange(domainUser, isCurrentUserAdmin, encryptor, twoFactorService);
//domainUser.setTwoFactorStatus(this.getTwoFactorStatus());

Expand All @@ -539,11 +548,6 @@ public final User updateDomainObject(final User domainUser, final Secrets secret

this.logger.debug("The new forced status of the domain user is {}.", domainUser.isTwoFactorForced());

if (this.isBeingCreated()){
// User type is set only at creation (or via the migration tool)
domainUser.setUserType(this.getUserType());
}

if (domainUser.getUserType() == UserType.LOCAL) {
domainUser.setEmail(this.getEmail());
domainUser.setLogin(this.getLogin());
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.asit_asso</groupId>
<artifactId>extract-base</artifactId>
<version>2.1.2</version>
<version>2.1.3</version>
<packaging>pom</packaging>
<name>extract-base</name>

Expand Down

0 comments on commit 0a13ec4

Please sign in to comment.