import org.cacert.gigi.database.GigiResultSet;
import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
import org.cacert.gigi.dbObjects.CATS.CATSType;
-import org.cacert.gigi.dbObjects.CountryCode.CountryCodeType;
+import org.cacert.gigi.dbObjects.Country.CountryCodeType;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.pages.PasswordResetPage;
private Locale locale;
- private final Set<Group> groups = new HashSet<>();
+ private Set<Group> groups = new HashSet<>();
public static final int MINIMUM_AGE = 16;
private Name preferredName;
- private CountryCode residenceCountry;
+ private Country residenceCountry;
protected User(GigiResultSet rs) {
super(rs.getInt("id"));
try {
if (rs.getString("Country") != null) {
- residenceCountry = CountryCode.getCountryCode(rs.getString("Country"), CountryCode.CountryCodeType.CODE_2_CHARS);
+ residenceCountry = Country.getCountryByCode(rs.getString("Country"), Country.CountryCodeType.CODE_2_CHARS);
}
} catch (GigiApiException e) {
throw new Error(e);
locale = Language.getLocaleFromString(localeStr);
}
+ refreshGroups();
+ }
+
+ public synchronized void refreshGroups() {
+ HashSet<Group> hs = new HashSet<>();
try (GigiPreparedStatement psg = new GigiPreparedStatement("SELECT `permission` FROM `user_groups` WHERE `user`=? AND `deleted` is NULL")) {
- psg.setInt(1, rs.getInt("id"));
+ psg.setInt(1, getId());
try (GigiResultSet rs2 = psg.executeQuery()) {
while (rs2.next()) {
- groups.add(Group.getByString(rs2.getString(1)));
+ hs.add(Group.getByString(rs2.getString(1)));
}
}
}
+ groups = hs;
}
- public User(String email, String password, DayDate dob, Locale locale, CountryCode residenceCountry, NamePart... preferred) throws GigiApiException {
+ public User(String email, String password, DayDate dob, Locale locale, Country residenceCountry, NamePart... preferred) throws GigiApiException {
this.email = email;
this.dob = dob;
this.locale = locale;
query.setString(4, locale.toString());
query.setInt(5, getId());
query.setInt(6, preferredName.getId());
- query.setString(7, residenceCountry == null ? null : residenceCountry.getCountryCode());
+ query.setString(7, residenceCountry == null ? null : residenceCountry.getCode());
query.execute();
}
new EmailAddress(this, email, locale);
public Name[] getNames() {
try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `id` FROM `names` WHERE `uid`=? AND `deleted` IS NULL", true)) {
+ gps.setInt(1, getId());
return fetchNamesToArray(gps);
}
}
public Name[] getNonDeprecatedNames() {
try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `id` FROM `names` WHERE `uid`=? AND `deleted` IS NULL AND `deprecated` IS NULL", true)) {
+ gps.setInt(1, getId());
return fetchNamesToArray(gps);
}
}
private Name[] fetchNamesToArray(GigiPreparedStatement gps) {
- gps.setInt(1, getId());
GigiResultSet rs = gps.executeQuery();
rs.last();
Name[] dt = new Name[rs.getRow()];
public int getExperiencePoints() {
try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT count(*) FROM ( SELECT `names`.`uid` FROM `notary` INNER JOIN `names` ON `names`.`id` = `to` WHERE `from`=? AND `notary`.`deleted` IS NULL AND `method` = ? ::`notaryType` GROUP BY `names`.`uid`) as p")) {
query.setInt(1, getId());
- query.setString(2, AssuranceType.FACE_TO_FACE.getDescription());
+ query.setEnum(2, AssuranceType.FACE_TO_FACE);
GigiResultSet rs = query.executeQuery();
int points = 0;
return Collections.unmodifiableSet(groups);
}
- public void grantGroup(User granter, Group toGrant) {
+ public void grantGroup(User granter, Group toGrant) throws GigiApiException {
+ if (toGrant.isManagedBySupport() && !granter.isInGroup(Group.SUPPORTER)) {
+ throw new GigiApiException("Group may only be managed by supporter");
+ }
+ if (toGrant.isManagedBySupport() && granter == this) {
+ throw new GigiApiException("Group may only be managed by supporter that is not oneself");
+ }
groups.add(toGrant);
try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) {
ps.setInt(1, getId());
- ps.setString(2, toGrant.getDatabaseName());
+ ps.setEnum(2, toGrant);
ps.setInt(3, granter.getId());
ps.execute();
}
}
- public void revokeGroup(User revoker, Group toRevoke) {
+ public void revokeGroup(User revoker, Group toRevoke) throws GigiApiException {
+ if (toRevoke.isManagedBySupport() && !revoker.isInGroup(Group.SUPPORTER)) {
+ throw new GigiApiException("Group may only be managed by supporter");
+ }
groups.remove(toRevoke);
try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `user_groups` SET `deleted`=CURRENT_TIMESTAMP, `revokedby`=? WHERE `deleted` IS NULL AND `permission`=?::`userGroup` AND `user`=?")) {
ps.setInt(1, revoker.getId());
- ps.setString(2, toRevoke.getDatabaseName());
+ ps.setEnum(2, toRevoke);
ps.setInt(3, getId());
ps.execute();
}
private Assurance assuranceByRes(GigiResultSet res) {
try {
- return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), Name.getById(res.getInt("to")), res.getString("location"), res.getString("method"), res.getInt("points"), res.getString("date"), res.getString("country") == null ? null : CountryCode.getCountryCode(res.getString("country"), CountryCodeType.CODE_2_CHARS));
+ return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), Name.getById(res.getInt("to")), res.getString("location"), res.getString("method"), res.getInt("points"), res.getString("date"), res.getString("country") == null ? null : Country.getCountryByCode(res.getString("country"), CountryCodeType.CODE_2_CHARS));
} catch (GigiApiException e) {
throw new Error(e);
}
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {}
- public CountryCode getResidenceCountry() {
+ public Country getResidenceCountry() {
return residenceCountry;
}
- public void setResidenceCountry(CountryCode residenceCountry) {
+ public void setResidenceCountry(Country residenceCountry) {
this.residenceCountry = residenceCountry;
rawUpdateCountryData();
}
private void rawUpdateCountryData() {
try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET country=? WHERE id=?")) {
- update.setString(1, residenceCountry == null ? null : residenceCountry.getCountryCode());
+ update.setString(1, residenceCountry == null ? null : residenceCountry.getCode());
update.setInt(2, getId());
update.executeUpdate();
}