-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #131 from ls1intum/develop
Develop
- Loading branch information
Showing
16 changed files
with
363 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
src/main/java/de/tum/cit/ase/service/artemis/util/ArtemisUserDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package de.tum.cit.ase.service.artemis.util; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class ArtemisUserDTO { | ||
|
|
||
| public boolean activated = true; | ||
| public List<String> authorities = List.of("ROLE_USER"); | ||
| public List<String> groups = List.of(); | ||
| public List<String> guidedTourSettings = List.of(); | ||
| public String email; | ||
| public String firstName; | ||
| public String lastName; | ||
| public String login; | ||
| public String password; | ||
| public String visibleRegistrationNumber; | ||
|
|
||
| public boolean isActivated() { | ||
| return activated; | ||
| } | ||
|
|
||
| public void setActivated(boolean activated) { | ||
| this.activated = activated; | ||
| } | ||
|
|
||
| public List<String> getAuthorities() { | ||
| return authorities; | ||
| } | ||
|
|
||
| public void setAuthorities(List<String> authorities) { | ||
| this.authorities = authorities; | ||
| } | ||
|
|
||
| public List<String> getGroups() { | ||
| return groups; | ||
| } | ||
|
|
||
| public void setGroups(List<String> groups) { | ||
| this.groups = groups; | ||
| } | ||
|
|
||
| public List<String> getGuidedTourSettings() { | ||
| return guidedTourSettings; | ||
| } | ||
|
|
||
| public void setGuidedTourSettings(List<String> guidedTourSettings) { | ||
| this.guidedTourSettings = guidedTourSettings; | ||
| } | ||
|
|
||
| public String getEmail() { | ||
| return email; | ||
| } | ||
|
|
||
| public void setEmail(String email) { | ||
| this.email = email; | ||
| } | ||
|
|
||
| public String getFirstName() { | ||
| return firstName; | ||
| } | ||
|
|
||
| public void setFirstName(String firstName) { | ||
| this.firstName = firstName; | ||
| } | ||
|
|
||
| public String getLastName() { | ||
| return lastName; | ||
| } | ||
|
|
||
| public void setLastName(String lastName) { | ||
| this.lastName = lastName; | ||
| } | ||
|
|
||
| public String getLogin() { | ||
| return login; | ||
| } | ||
|
|
||
| public void setLogin(String login) { | ||
| this.login = login; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public void setPassword(String password) { | ||
| this.password = password; | ||
| } | ||
|
|
||
| public String getVisibleRegistrationNumber() { | ||
| return visibleRegistrationNumber; | ||
| } | ||
|
|
||
| public void setVisibleRegistrationNumber(String visibleRegistrationNumber) { | ||
| this.visibleRegistrationNumber = visibleRegistrationNumber; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,8 @@ public enum ArtemisServer { | |
| LOCAL, | ||
| TS1, | ||
| TS3, | ||
| TS7, | ||
| TS8, | ||
| STAGING, | ||
| STAGING2, | ||
| PRODUCTION, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.