+-- noinspection SqlNoDataSourceInspectionForFile
+
CREATE TABLE "ORGANIZATIONS" (
"UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
"KEE" VARCHAR(32) NOT NULL,
"USER_LOCAL" BOOLEAN,
"ONBOARDED" BOOLEAN NOT NULL,
"CREATED_AT" BIGINT,
- "UPDATED_AT" BIGINT
+ "UPDATED_AT" BIGINT,
+ "HOMEPAGE_TYPE" VARCHAR(40),
+ "HOMEPAGE_VALUE" VARCHAR(40)
);
CREATE UNIQUE INDEX "USERS_LOGIN" ON "USERS" ("LOGIN");
CREATE INDEX "USERS_UPDATED_AT" ON "USERS" ("UPDATED_AT");
private String salt;
private Long createdAt;
private Long updatedAt;
+ private String homepageType;
+ private String homepageValue;
private boolean local = true;
private boolean root = false;
private boolean onboarded = false;
return this;
}
+ @CheckForNull
+ public String getHomepageType() {
+ return homepageType;
+ }
+
+ public UserDto setHomepageType(@Nullable String homepageType) {
+ this.homepageType = homepageType;
+ return this;
+ }
+
+ @CheckForNull
+ public String getHomepageValue() {
+ return homepageValue;
+ }
+
+ public UserDto setHomepageValue(@Nullable String homepageValue) {
+ this.homepageValue = homepageValue;
+ return this;
+ }
+
public boolean isRoot() {
return root;
}
u.is_root as "root",
u.onboarded as "onboarded",
u.created_at as "createdAt",
- u.updated_at as "updatedAt"
+ u.updated_at as "updatedAt",
+ u.homepage_type as "homepageType",
+ u.homepage_value as "homepageValue"
</sql>
<select id="selectByLogin" parameterType="String" resultType="User">
is_root,
onboarded,
created_at,
- updated_at
+ updated_at,
+ homepage_type,
+ homepage_value
) values (
#{user.login,jdbcType=VARCHAR},
#{user.name,jdbcType=VARCHAR},
#{user.root,jdbcType=BOOLEAN},
#{user.onboarded,jdbcType=BOOLEAN},
#{now,jdbcType=BIGINT},
- #{now,jdbcType=BIGINT}
+ #{now,jdbcType=BIGINT},
+ #{user.homepageType,jdbcType=VARCHAR},
+ #{user.homepageValue,jdbcType=VARCHAR}
)
</insert>
onboarded = #{user.onboarded, jdbcType=BOOLEAN},
salt = #{user.salt, jdbcType=VARCHAR},
crypted_password = #{user.cryptedPassword, jdbcType=BIGINT},
- updated_at = #{now, jdbcType=BIGINT}
+ updated_at = #{now, jdbcType=BIGINT},
+ homepage_type = #{user.homepageType, jdbcType=VARCHAR},
+ homepage_value = #{user.homepageValue, jdbcType=VARCHAR}
where
login = #{user.login, jdbcType=VARCHAR}
</update>
.setExternalIdentityProvider("github")
.setLocal(true)
.setCreatedAt(date)
- .setUpdatedAt(date);
+ .setUpdatedAt(date)
+ .setHomepageType("project")
+ .setHomepageValue("OB1");
underTest.insert(db.getSession(), userDto);
db.getSession().commit();
assertThat(user.getExternalIdentityProvider()).isEqualTo("github");
assertThat(user.isLocal()).isTrue();
assertThat(user.isRoot()).isFalse();
+ assertThat(user.getHomepageType()).isEqualTo("project");
+ assertThat(user.getHomepageValue()).isEqualTo("OB1");
}
@Test
.setCryptedPassword("abcde")
.setExternalIdentity("johngithub")
.setExternalIdentityProvider("github")
- .setLocal(false);
+ .setLocal(false)
+ .setHomepageType("project")
+ .setHomepageValue("OB1");
underTest.update(db.getSession(), userUpdate);
UserDto reloaded = underTest.selectByLogin(db.getSession(), user.getLogin());
assertThat(reloaded.getExternalIdentityProvider()).isEqualTo("github");
assertThat(reloaded.isLocal()).isFalse();
assertThat(reloaded.isRoot()).isFalse();
+ assertThat(reloaded.getHomepageType()).isEqualTo("project");
+ assertThat(reloaded.getHomepageValue()).isEqualTo("OB1");
}
@Test
assertThat(userReloaded.getExternalIdentityProvider()).isNull();
assertThat(userReloaded.isRoot()).isFalse();
assertThat(userReloaded.getUpdatedAt()).isEqualTo(NOW);
+ assertThat(userReloaded.getHomepageType()).isNull();
+ assertThat(userReloaded.getHomepageValue()).isNull();
assertThat(underTest.selectUserById(session, otherUser.getId())).isNotNull();
}
.setActive(true)
.setScmAccounts("\nma\nmarius33\n")
.setSalt("79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365")
- .setCryptedPassword("650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"));
+ .setCryptedPassword("650d2261c98361e2f67f90ce5c65a95e7d8ea2fg")
+ .setHomepageType("project")
+ .setHomepageValue("OB1"));
UserDto user2 = db.users().insertUser();
underTest.setRoot(session, user2.getLogin(), true);
assertThat(dto.isRoot()).isFalse();
assertThat(dto.getCreatedAt()).isEqualTo(user1.getCreatedAt());
assertThat(dto.getUpdatedAt()).isEqualTo(user1.getUpdatedAt());
+ assertThat(dto.getHomepageType()).isEqualTo("project");
+ assertThat(dto.getHomepageValue()).isEqualTo("OB1");
dto = underTest.selectOrFailByLogin(session, user2.getLogin());
assertThat(dto.isRoot()).isTrue();
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.server.platform.db.migration.version.v70;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.server.platform.db.migration.sql.AddColumnsBuilder;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.newVarcharColumnDefBuilder;
+
+public class AddHomepageToUsers extends DdlChange {
+
+ public AddHomepageToUsers(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ context.execute(new AddColumnsBuilder(getDialect(), "users")
+ .addColumn(newVarcharColumnDefBuilder()
+ .setColumnName("homepage_type")
+ .setIsNullable(true)
+ .setLimit(40)
+ .build())
+ .addColumn(newVarcharColumnDefBuilder()
+ .setColumnName("homepage_value")
+ .setIsNullable(true)
+ .setLimit(40)
+ .build())
+ .build());
+ }
+}
.add(1920, "Read 'sonar.qualitygate' setting and set the value to default organization", ReadGlobalSonarQualityGateSettingToDefaultOrg.class)
.add(1921, "Delete 'sonar.qualitygate' setting at global level", DeleteGlobalSonarQualityGateSetting.class)
.add(1922, "Make ORGANIZATIONS.DEFAULT_QUALITY_GATE_UUID not nullable", SetDefaultQualityGateUuidAsNotNullableInOrganizations.class)
+ .add(1923, "Add users.homepage_type and users.homepage_value", AddHomepageToUsers.class)
;
}
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v70;
+
+import java.sql.SQLException;
+import java.sql.Types;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.db.CoreDbTester;
+
+import static java.sql.Types.BOOLEAN;
+import static java.sql.Types.VARCHAR;
+import static org.junit.rules.ExpectedException.none;
+import static org.sonar.db.CoreDbTester.createForSchema;
+
+public class AddHomepageToUsersTest {
+
+ @Rule
+ public final CoreDbTester dbTester = createForSchema(AddHomepageToUsersTest.class, "initial.sql");
+
+ @Rule
+ public ExpectedException expectedException = none();
+
+ private AddHomepageToUsers underTest = new AddHomepageToUsers(dbTester.database());
+
+ @Test
+ public void column_is_added_to_table() throws SQLException {
+ underTest.execute();
+
+ dbTester.assertColumnDefinition("users", "homepage_type", VARCHAR, 40, true);
+ dbTester.assertColumnDefinition("users", "homepage_value", VARCHAR, 40, true);
+ }
+
+ @Test
+ public void migration_is_not_reentrant() throws SQLException {
+ underTest.execute();
+
+ expectedException.expect(IllegalStateException.class);
+
+ underTest.execute();
+ }
+
+}
@Test
public void verify_migration_count() {
- verifyMigrationCount(underTest, 23);
+ verifyMigrationCount(underTest, 24);
}
}
--- /dev/null
+CREATE TABLE "USERS" (
+ "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ "LOGIN" VARCHAR(255),
+ "NAME" VARCHAR(200),
+ "EMAIL" VARCHAR(100),
+ "CRYPTED_PASSWORD" VARCHAR(40),
+ "SALT" VARCHAR(40),
+ "ACTIVE" BOOLEAN DEFAULT TRUE,
+ "SCM_ACCOUNTS" VARCHAR(4000),
+ "EXTERNAL_IDENTITY" VARCHAR(255),
+ "EXTERNAL_IDENTITY_PROVIDER" VARCHAR(100),
+ "IS_ROOT" BOOLEAN NOT NULL,
+ "USER_LOCAL" BOOLEAN,
+ "ONBOARDED" BOOLEAN NOT NULL,
+ "CREATED_AT" BIGINT,
+ "UPDATED_AT" BIGINT
+);
+CREATE UNIQUE INDEX "USERS_LOGIN" ON "USERS" ("LOGIN");
+CREATE INDEX "USERS_UPDATED_AT" ON "USERS" ("UPDATED_AT");
import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
+import javax.annotation.CheckForNull;
import org.sonar.api.server.ws.Change;
import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService.NewController;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.db.user.UserDto;
import org.sonar.server.issue.ws.AvatarResolver;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.Users.CurrentWsResponse;
-import org.sonarqube.ws.Users.CurrentWsResponse.Homepage;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.emptyToNull;
+import static java.lang.String.format;
import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.sonar.core.util.Protobuf.setNullable;
import static org.sonar.server.ws.WsUtils.writeProtobuf;
+import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.MY_PROJECTS;
+import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.ORGANIZATION;
import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.PROJECT;
import static org.sonarqube.ws.Users.CurrentWsResponse.Permissions;
import static org.sonarqube.ws.Users.CurrentWsResponse.newBuilder;
private final DefaultOrganizationProvider defaultOrganizationProvider;
private final AvatarResolver avatarResolver;
- public CurrentAction(UserSession userSession, DbClient dbClient, DefaultOrganizationProvider defaultOrganizationProvider, AvatarResolver avatarResolver) {
+ public CurrentAction(UserSession userSession, DbClient dbClient, DefaultOrganizationProvider defaultOrganizationProvider,
+ AvatarResolver avatarResolver) {
this.userSession = userSession;
this.dbClient = dbClient;
this.defaultOrganizationProvider = defaultOrganizationProvider;
.addAllGroups(groups)
.addAllScmAccounts(user.getScmAccountsAsList())
.setPermissions(Permissions.newBuilder().addAllGlobal(getGlobalPermissions()).build())
- .setHomepage(Homepage.newBuilder().setType(PROJECT).setValue("project-key").build())
+ .setHomepage(findHomepageFor(dbSession, user))
.setShowOnboardingTutorial(!user.isOnboarded());
setNullable(emptyToNull(user.getEmail()), builder::setEmail);
setNullable(emptyToNull(user.getEmail()), u -> builder.setAvatar(avatarResolver.create(user)));
return OrganizationPermission.all()
.filter(permission -> userSession.hasPermission(permission, defaultOrganizationUuid))
.map(OrganizationPermission::getKey)
- .collect(Collectors.toList());
+ .collect(toList());
}
+
+ private CurrentWsResponse.Homepage findHomepageFor(DbSession dbSession, UserDto user) {
+ if (user.getHomepageType() == null) {
+ return defaultHomepageOf();
+ }
+ String homepageValue = getHomepageValue(dbSession, user.getHomepageType(), user.getHomepageValue());
+ CurrentWsResponse.Homepage.Builder homepage = CurrentWsResponse.Homepage.newBuilder()
+ .setType(CurrentWsResponse.HomepageType.valueOf(user.getHomepageType()));
+ setNullable(homepageValue, homepage::setValue);
+ return homepage.build();
+ }
+
+ @CheckForNull
+ private String getHomepageValue(DbSession dbSession, String homepageType, String homepageValue) {
+ if (PROJECT.toString().equals(homepageType)) {
+ return dbClient.componentDao().selectByUuid(dbSession, homepageValue)
+ .transform(ComponentDto::getKey)
+ .or(() -> {
+ throw new IllegalStateException(format("Unknown component '%s' for homepageValue", homepageValue));
+ });
+ }
+ if (ORGANIZATION.toString().equals(homepageType)) {
+ return dbClient.organizationDao().selectByUuid(dbSession, homepageValue)
+ .map(OrganizationDto::getKey)
+ .orElseThrow(() -> new IllegalStateException(format("Unknown organization '%s' for homepageValue", homepageValue)));
+ }
+ return null;
+ }
+
+ // Default WIP implementation to be done in SONAR-10185
+ private static CurrentWsResponse.Homepage defaultHomepageOf() {
+ return CurrentWsResponse.Homepage.newBuilder()
+ .setType(MY_PROJECTS)
+ .build();
+ }
+
}
},
"homepage": {
"type": "PROJECT",
- "value": "project-key"
+ "value": "death-star-key"
}
}
import org.sonar.api.utils.System2;
import org.sonar.db.DbClient;
import org.sonar.db.DbTester;
+import org.sonar.db.component.ComponentDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.issue.ws.AvatarResolverImpl;
import org.sonar.server.organization.DefaultOrganizationProvider;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonar.db.user.GroupTesting.newGroupDto;
import static org.sonar.test.JsonAssert.assertJson;
+import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.MY_PROJECTS;
public class CurrentActionTest {
@Rule
.setExternalIdentity("obiwan")
.setExternalIdentityProvider("sonarqube")
.setScmAccounts(newArrayList("obiwan:github", "obiwan:bitbucket"))
- .setOnboarded(false));
+ .setOnboarded(false)
+ .setHomepageType("MY_PROJECTS"));
userSessionRule.logIn("obiwan.kenobi");
CurrentWsResponse response = call();
assertThat(response)
- .extracting(CurrentWsResponse::getIsLoggedIn, CurrentWsResponse::getLogin, CurrentWsResponse::getName, CurrentWsResponse::getEmail, CurrentWsResponse::getAvatar, CurrentWsResponse::getLocal,
+ .extracting(CurrentWsResponse::getIsLoggedIn, CurrentWsResponse::getLogin, CurrentWsResponse::getName, CurrentWsResponse::getEmail, CurrentWsResponse::getAvatar,
+ CurrentWsResponse::getLocal,
CurrentWsResponse::getExternalIdentity, CurrentWsResponse::getExternalProvider, CurrentWsResponse::getScmAccountsList, CurrentWsResponse::getShowOnboardingTutorial)
.containsExactly(true, "obiwan.kenobi", "Obiwan Kenobi", "obiwan.kenobi@starwars.com", "f5aa64437a1821ffe8b563099d506aef", true, "obiwan", "sonarqube",
newArrayList("obiwan:github", "obiwan:bitbucket"), true);
+
+ assertThat(response.getHomepage()).isNotNull();
+ assertThat(response.getHomepage()).extracting(CurrentWsResponse.Homepage::getType)
+ .containsExactly(MY_PROJECTS);
+
}
@Test
.setExternalIdentity("obiwan.kenobi")
.setExternalIdentityProvider("sonarqube")
.setScmAccounts(newArrayList("obiwan:github", "obiwan:bitbucket"))
- .setOnboarded(true));
+ .setOnboarded(true)
+ .setHomepageType("PROJECT")
+ .setHomepageValue("UUID-of-the-death-star"));
db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Jedi")), obiwan);
db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Rebel")), obiwan);
+ db.components().insertPublicProject(u->u.setUuid("UUID-of-the-death-star"), u->u.setDbKey("death-star-key"));
+
String response = ws.newRequest().execute().getInput();
assertJson(response).isSimilarTo(getClass().getResource("current-example.json"));
return ws.newRequest().executeProtobuf(CurrentWsResponse.class);
}
+ @Test
+ public void fail_with_ISE_when_user_homepage_project_does_not_exist_in_db() {
+ UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageValue("not-existing-project-uuid"));
+ userSessionRule.logIn(user.getLogin());
+
+ expectedException.expect(IllegalStateException.class);
+ expectedException.expectMessage("Unknown component 'not-existing-project-uuid' for homepageValue");
+
+ call();
+ }
+
+ @Test
+ public void fail_with_ISE_when_user_homepage_organization_does_not_exist_in_db() {
+ UserDto user = db.users().insertUser(u -> u.setHomepageType("ORGANIZATION").setHomepageValue("not-existing-organization-uuid"));
+ userSessionRule.logIn(user.getLogin());
+
+ expectedException.expect(IllegalStateException.class);
+ expectedException.expectMessage("Unknown organization 'not-existing-organization-uuid' for homepageValue");
+
+ call();
+ }
+
+
}
projects / sonarqube.git / commitdiff