You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/01/23 18:26:35 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-11049: Fix for
Reset Credentials is broken
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 3820111 IGNITE-11049: Fix for Reset Credentials is broken
3820111 is described below
commit 3820111d225ced4f0e91d25b941c9f34a1b796d4
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Jan 23 21:26:32 2019 +0300
IGNITE-11049: Fix for Reset Credentials is broken
---
.../main/java/org/apache/ignite/ci/ITcHelper.java | 1 -
.../main/java/org/apache/ignite/ci/TcHelper.java | 3 +--
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/web/rest/login/UserService.java | 21 ++++++++++-----------
ignite-tc-helper-web/src/main/webapp/user.html | 1 +
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
index 4427044..ae45495 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
@@ -18,7 +18,6 @@
package org.apache.ignite.ci;
import org.apache.ignite.ci.user.ICredentialsProv;
-import org.apache.ignite.ci.user.UserAndSessionsStorage;
/**
* Teamcity Bot main interface. This inteface became too huge.
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
index 073910b..0b094e7 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
@@ -17,7 +17,6 @@
package org.apache.ignite.ci;
-import java.util.Objects;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.user.ICredentialsProv;
@@ -41,7 +40,7 @@ public class TcHelper implements ITcHelper {
/** {@inheritDoc} */
@Override public boolean isServerAuthorized() {
- return !Objects.isNull(serverAuthorizerCreds);
+ return serverAuthorizerCreds != null;
}
@Override public String primaryServerId() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 1d4090e..26fd5c0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190122";
+ public static final String VERSION = "20190123";
/** TC Bot Version. */
public String version = VERSION;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
index 5ab720d..5aa6cdb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
@@ -40,7 +40,6 @@ import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.teamcity.pure.ITcLogin;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.user.TcHelperUser;
-import org.apache.ignite.ci.user.UserAndSessionsStorage;
import org.apache.ignite.ci.web.CtxListener;
import org.apache.ignite.ci.web.model.CredentialsUi;
import org.apache.ignite.ci.web.model.SimpleResult;
@@ -158,12 +157,12 @@ public class UserService {
@POST
@Path("addService")
- public SimpleResult addCredentials(@FormParam("serviceId") String serviceId,
- @FormParam("serviceLogin") String serviceLogin,
- @FormParam("servicePassword") String servicePassword) {
- Preconditions.checkState(!Strings.isNullOrEmpty(serviceId));
- Preconditions.checkState(!Strings.isNullOrEmpty(serviceLogin));
- Preconditions.checkState(!Strings.isNullOrEmpty(servicePassword));
+ public SimpleResult addCredentials(@FormParam("serviceId") String svcId,
+ @FormParam("serviceLogin") String svcLogin,
+ @FormParam("servicePassword") String svcPwd) {
+ Preconditions.checkState(!Strings.isNullOrEmpty(svcId));
+ Preconditions.checkState(!Strings.isNullOrEmpty(svcLogin));
+ Preconditions.checkState(!Strings.isNullOrEmpty(svcPwd));
final ICredentialsProv prov = ICredentialsProv.get(req);
final String currUserLogin = prov.getPrincipalId();
@@ -174,18 +173,18 @@ public class UserService {
final TcHelperUser user = users.getUser(currUserLogin);
//todo check service credentials first
- final User tcAddUser = tcLogin.checkServiceUserAndPassword(serviceId, serviceLogin, servicePassword);
+ final User tcAddUser = tcLogin.checkServiceUserAndPassword(svcId, svcLogin, svcPwd);
if (tcAddUser == null)
return new SimpleResult("Service rejected credentials/user not found");
- final TcHelperUser.Credentials credentials = new TcHelperUser.Credentials(serviceId, serviceLogin);
+ final TcHelperUser.Credentials creds = new TcHelperUser.Credentials(svcId, svcLogin);
- credentials.setPassword(servicePassword, prov.getUserKey());
+ creds.setPassword(svcPwd, prov.getUserKey());
user.enrichUserData(tcAddUser);
- user.getCredentialsList().add(credentials);
+ user.getCredentialsList().add(creds);
users.putUser(currUserLogin, user);
diff --git a/ignite-tc-helper-web/src/main/webapp/user.html b/ignite-tc-helper-web/src/main/webapp/user.html
index e2db33b..7986f65 100644
--- a/ignite-tc-helper-web/src/main/webapp/user.html
+++ b/ignite-tc-helper-web/src/main/webapp/user.html
@@ -87,6 +87,7 @@ function doResetCreds() {
$.ajax({
type: "POST",
url: url,
+ contentType: "application/x-www-form-urlencoded; charset=utf-8",
success: function(data) {
loadData();
},