April 2014 - Jredmine-commits - mailman.cloud.codelutin.com

r437 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . report
by tchemit＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: tchemit Date: 2014-04-16 10:21:41 +0200 (Wed, 16 Apr 2014) New Revision: 437 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/437 Log: fixes #3152 Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2014-04-16 07:51:06 UTC (rev 436) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2014-04-16 08:21:41 UTC (rev 437) @@ -158,9 +158,6 @@ /** the date format used to write a date */ protected DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); -// /** flag to mark if a runOnce goal was done */ -// protected boolean runOnceDone; - /** flag to mark if service was sucessfull init */ protected boolean serviceInit; @@ -230,16 +227,6 @@ this.url = url; } -// /////////////////////////////////////////////////////////////////////////// -// /// AbstractRedmineMojo -// /////////////////////////////////////////////////////////////////////////// -// -// protected abstract boolean isGoalSkip(); -// -// protected abstract boolean isRunOnce(); -// -// protected abstract boolean checkRunOnceDone(); - /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// @@ -378,11 +365,6 @@ } } -// @Override -// public boolean isRunOnceDone() { -// return runOnceDone; -// } - /** * Convinient method to throw the given {@code message} * if {@link #safe} flag is on. Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2014-04-16 07:51:06 UTC (rev 436) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2014-04-16 08:21:41 UTC (rev 437) @@ -43,6 +43,7 @@ import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; +import org.nuiton.jredmine.plugin.report.IssueReportGenerator; import org.nuiton.jredmine.service.RedmineServiceException; import org.nuiton.plugin.PluginHelper; @@ -197,6 +198,20 @@ @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") protected boolean runOnlyOnRoot; + /** + * Template strings per system that is used to discover the URL to use to display an issue report. Each key in this + * map denotes the (case-sensitive) identifier of the issue tracking system and its value gives the URL template. + * + * There are 2 template tokens you can use. <code>%URL%</code>: this is computed by getting the + * <code><issueManagement>/<url></code> value from the POM, and removing the last '/' + * and everything that comes after it. <code>%ISSUE%</code>: this is the issue number. + * + * + * @since 1.7 + */ + @Parameter(property = "redmine.issueLinkTemplate", defaultValue = "%URL%/issues/show/%ISSUE%") + protected String issueLinkTemplate = "%URL%/issues/show/%ISSUE%"; + /////////////////////////////////////////////////////////////////////////// /// Mojo internal attributes /////////////////////////////////////////////////////////////////////////// @@ -642,6 +657,8 @@ } } + String redmineUrl = url.toString(); + // iterate on actions ? or order it for (Entry<Integer, String> entry : trackerToAction.entrySet()) { @@ -660,11 +677,17 @@ action.setIssue(issue.getId() + ""); action.setType(type); + String issueUrl = IssueReportGenerator.parseIssueLink(issueLinkTemplate, redmineUrl, action.getIssue()); + + String issueLogPrefix = "issue " + action.getIssue() + " '" + issue.getSubject() + "' "; + String issueLogSuffix = " (see " + issueUrl + ")"; + + if (issue.getDueDate() != null) { action.setDate(dateFormat.format(issue.getDueDate())); } else { if (verbose) { - getLog().warn("issue " + issue.getSubject() + " has no dueDate..."); + getLog().warn(issueLogPrefix + " has no dueDate, the changes report may not be complete." + issueLogSuffix); } } @@ -676,7 +699,7 @@ id = issue.getAuthorId(); if (id == 0) { - getLog().warn("issue " + issue.getSubject() + " is not created to any user, this is not normal..."); + getLog().warn(issueLogPrefix + " is not created to any user, the changes report may not be complete." + issueLogSuffix); id = issue.getAuthorId(); } a = IdAbles.byId(id, users); @@ -690,7 +713,7 @@ id = issue.getAssignedToId(); if (id == 0) { - getLog().warn("issue " + issue.getSubject() + " is not assigned to any user, this is not normal..."); + getLog().warn(issueLogPrefix + " is not assigned to a user, the changes report may not be complete." + issueLogSuffix); id = issue.getAuthorId(); } a = IdAbles.byId(id, users); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2014-04-16 07:51:06 UTC (rev 436) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2014-04-16 08:21:41 UTC (rev 437) @@ -537,14 +537,7 @@ } protected String parseIssueLink(String issue) { - String parseLink; - String issueLink = issueLinkTemplate; - parseLink = issueLink.replaceFirst(ISSUE_TOKEN, issue); - - if (parseLink.contains(URL_TOKEN)) { - parseLink = parseLink.replaceFirst(URL_TOKEN, url); - } - + String parseLink = parseIssueLink(issueLinkTemplate, url, issue); return parseLink; } @@ -694,4 +687,16 @@ sink.sectionTitle1_(); } + + public static String parseIssueLink(String issueLinkTemplate, String url, String issue) { + String parseLink; + String issueLink = issueLinkTemplate; + parseLink = issueLink.replaceFirst(IssueReportGenerator.ISSUE_TOKEN, issue); + + if (parseLink.contains(IssueReportGenerator.URL_TOKEN)) { + parseLink = parseLink.replaceFirst(IssueReportGenerator.URL_TOKEN, url); + } + + return parseLink; + } }

1 0

r436 - in trunk: jredmine-client/src/main/redmine/jredmine-2.x jredmine-client/src/site/apt jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: tchemit Date: 2014-04-16 09:51:06 +0200 (Wed, 16 Apr 2014) New Revision: 436 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/436 Log: fixes #2381 (update doc) Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/README.rdoc trunk/jredmine-client/src/site/apt/rails_api.apt trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/README.rdoc =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/README.rdoc 2014-04-16 07:40:23 UTC (rev 435) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/README.rdoc 2014-04-16 07:51:06 UTC (rev 436) @@ -2,6 +2,7 @@ This plugin expose some services via a the REST protocol: +jredmine/get_user jredmine/get_projects jredmine/get_issue_statuses jredmine/get_issue_priorities Modified: trunk/jredmine-client/src/site/apt/rails_api.apt =================================================================== --- trunk/jredmine-client/src/site/apt/rails_api.apt 2014-04-16 07:40:23 UTC (rev 435) +++ trunk/jredmine-client/src/site/apt/rails_api.apt 2014-04-16 07:51:06 UTC (rev 436) @@ -133,6 +133,8 @@ *--------------------------*-----------------------------------+ | <action[.xml\|.json]> | <données récupérées> | *--------------------------*-----------------------------------+ +| <<get_user>> | l'utilisateur connecté | +*--------------------------*-----------------------------------+ | <<get_projects>> | tous les projets | *--------------------------*-----------------------------------+ | <<get_user_projects>> | tous les projets dont l'utilisateur connecté est membre | @@ -142,6 +144,19 @@ | <<get_issue_priorities>> | toutes les prioritiés de demandes | *--------------------------*-----------------------------------+ +** get_user + + Ce service nécessite une configuration authentifiée ou bien des paramètres d'authentification dans la requète. + + Nous suivons la solution proposée par redmine (http://www.redmine.org/projects/redmine/wiki/Rest_api#Authentication) + + Requètes : + +-------------------------------------------------------------------------------- +jredmine/get_user.xml +jredmine/get_user.json +-------------------------------------------------------------------------------- + ** get_projects Ce service ne requiert pas de paramètre. Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2014-04-16 07:40:23 UTC (rev 435) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2014-04-16 07:51:06 UTC (rev 436) @@ -66,7 +66,7 @@ /** * The redmine's server login apiKey. * - * Note: This parameter (or username/password) is mandatory if you + * Note: This parameter (or {@link #username} + {@link #password}) is mandatory if you * not use a {@code anonymous} service. * * @since 1.5 @@ -77,7 +77,7 @@ /** * The redmine's server login. * - * Note: This parameter (or username/password) is mandatory if you + * Note: This parameter (+ {@link #password}) (or {@link #apiKey}) is mandatory if you * not use a {@code anonymous} service. * * @since 1.0.0 @@ -88,7 +88,7 @@ /** * The redmine's server password. * - * Note: This parameter (or username/password) is mandatory if you + * Note: This parameter (+ {@link #username}) (or {@link #apiKey}) is mandatory if you * not use a {@code anonymous} service. * * @since 1.0.0

1 0

r435 - in trunk/jredmine-client/src/main/redmine/jredmine-2.x: app/controllers config
by tchemit＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: tchemit Date: 2014-04-16 09:40:23 +0200 (Wed, 16 Apr 2014) New Revision: 435 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/435 Log: refs #3151 (push back login and logout for backward compat) Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-16 07:25:29 UTC (rev 434) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-16 07:40:23 UTC (rev 435) @@ -34,7 +34,7 @@ before_filter :check_current_user, :only => [:get_user, :get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] # find project and check permission - before_filter :find_project, :except => [:ping, :get_user, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] + before_filter :find_project, :except => [:ping, :login, :logout, :get_user, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] # find project's version before_filter :find_version, :only => [:get_version, :get_version_issues, :get_version_opened_issues, :get_version_attachments, :add_version_attachment] @@ -51,8 +51,44 @@ # ping service (just to test if service is reachable) def ping render :text => "ping", :status => 200 - end + end + # Login request and validation + def login + if !request.post? + # Logout user : get method not possible + self.logged_user = nil + render_status 405, "POST method required" + else + # Authenticate user + #user = User.try_to_login(params[:username], params[:password]) + user = find_current_user + if user.nil? + # Invalid credentials + render_status 401, "Invalid credentials" + #elsif user.new_record? + # # Onthefly creation failed, + # render_status 401, "User not activated" + else + # Valid user + self.logged_user = user + # always generate a key and set autologin cookie + token = Token.create(:user => user, :action => 'autologin') + cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now } + render_status 200, "User logged in" + end + end + end + + # Log out current user and redirect to welcome page + def logout + cookies.delete :autologin + Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged? + # user is no more connected + self.logged_user = nil + render_status 200, "User logged out" + end + # recuperation des projets def get_projects @projects = Project.find(:all) Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-16 07:25:29 UTC (rev 434) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-16 07:40:23 UTC (rev 435) @@ -27,7 +27,8 @@ # jredmine : actions with no project context match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] - match 'jredmine/:action', :to => 'jredmine#:action', :action => ['get_user', 'ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action', :to => 'jredmine#:action', :action => ['login'], :format => 'xml', :via => ['post'] + match 'jredmine/:action', :to => 'jredmine#:action', :action => ['get_user', 'ping', 'logout', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] # jredmine/action/:pid : actions with project context match 'jredmine/:action.xml/:pid', :to=> 'jredmine#:action', :pid => /.+/, :format => 'xml', :via => ['get', 'post']

1 0

r434 - in trunk: jredmine-client/src/main/java/org/nuiton/jredmine/service jredmine-client/src/main/redmine/jredmine-2.x/app/controllers jredmine-client/src/main/redmine/jredmine-2.x/config jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: tchemit Date: 2014-04-16 09:25:29 +0200 (Wed, 16 Apr 2014) New Revision: 434 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/434 Log: refs-50 #2381 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineLogguedService.java trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java 2014-04-15 20:04:28 UTC (rev 433) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java 2014-04-16 07:25:29 UTC (rev 434) @@ -205,6 +205,18 @@ /////////////////////////////////////////////////////////////////////////// @Override + public User getCurrentUser() throws RedmineServiceException { + checkLoggued(); + RedmineRequest<User> request = + RedmineRequestHelper.action("get_user.xml", User.class); + //FIXME-tchemit-2014-05-16 Should remove this! + if (getClient().getConfiguration().getAuthConfiguration().isUseApiKey()) { + request.getParams().put("key", getClient().getConfiguration().getAuthConfiguration().getApiKey()); + } + return executeRequestAndReturnData(request); + } + + @Override public Project[] getUserProjects() throws RedmineServiceException { checkLoggued(); RedmineRequest<Project> request = RedmineRequestHelper.action( Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineLogguedService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineLogguedService.java 2014-04-15 20:04:28 UTC (rev 433) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineLogguedService.java 2014-04-16 07:25:29 UTC (rev 434) @@ -29,6 +29,7 @@ import org.nuiton.jredmine.model.News; import org.nuiton.jredmine.model.Project; import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; @@ -47,6 +48,15 @@ public interface RedmineLogguedService { /** + * Obtain the redmine user from the credentials given in the service configuration. + * + * @return the current user using the credentials of the service configuration + * @throws RedmineServiceException if any pb + * @since 1.7 + */ + User getCurrentUser() throws RedmineServiceException; + + /** * Obtain for the loggued user, all projets where he belongs. * * Note: This method requires to be loggued on redmine server. Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 20:04:28 UTC (rev 433) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-16 07:25:29 UTC (rev 434) @@ -31,10 +31,10 @@ before_filter :try_find_current_user # check user exists - before_filter :check_current_user, :only => [:get_current_user, :get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] + before_filter :check_current_user, :only => [:get_user, :get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] # find project and check permission - before_filter :find_project, :except => [:ping, :get_current_user, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] + before_filter :find_project, :except => [:ping, :get_user, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] # find project's version before_filter :find_version, :only => [:get_version, :get_version_issues, :get_version_opened_issues, :get_version_attachments, :add_version_attachment] @@ -70,8 +70,8 @@ render_array_result result, "projects" end - def get_current_user - User.current + def get_user + render_result User.current end # recuperation des priorities d'issues @@ -416,10 +416,10 @@ end end - # Check if User.current exists + # Check if User.current is loggued def check_current_user - if User.current.nil? - render_status 401, "Not connected" + if User.current.anonymous? + render_status 401, "No user connected" end end Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-15 20:04:28 UTC (rev 433) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-16 07:25:29 UTC (rev 434) @@ -25,9 +25,9 @@ RedmineApp::Application.routes.draw do # jredmine : actions with no project context - match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_current_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] - match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_current_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] - match 'jredmine/:action', :to => 'jredmine#:action', :action => ['get_current_user', 'ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] + match 'jredmine/:action', :to => 'jredmine#:action', :action => ['get_user', 'ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] # jredmine/action/:pid : actions with project context match 'jredmine/:action.xml/:pid', :to=> 'jredmine#:action', :pid => /.+/, :format => 'xml', :via => ['get', 'post'] Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2014-04-15 20:04:28 UTC (rev 433) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2014-04-16 07:25:29 UTC (rev 434) @@ -168,25 +168,36 @@ protected boolean initReleaseUser() throws MojoExecutionException { - if (StringUtils.isBlank(username)) { - throw new MojoExecutionException("required a username parameter"); + if (StringUtils.isBlank(username) && StringUtils.isBlank(apiKey)) { + throw new MojoExecutionException("required a username or apikey parameter"); } try { users = service.getProjectMembers(projectId); - User user = User.byLogin(username, users); + User user = null; + if (getAuthConfiguration().isUseApiKey()) { + + // get user by his api key + user = service.getCurrentUser(); + } + + if (user == null && StringUtils.isNotBlank(username)) { + + // try to get user by his login + user = User.byLogin(username, users); + } + if (user == null) { - return false; } + releaseUser = user; return true; } catch (RedmineServiceException e) { - getLog().warn("could not retrieve user '" + username + - "', for reason " + e.getMessage(), e); + getLog().warn("could not retrieve user", e); return false; } }

1 0

r433 - trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers
by tchemit＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: tchemit Date: 2014-04-15 22:04:28 +0200 (Tue, 15 Apr 2014) New Revision: 433 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/433 Log: refs-20 #2381 (add method get_current_user in redmine rails plugin) Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 20:02:56 UTC (rev 432) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 20:04:28 UTC (rev 433) @@ -34,7 +34,7 @@ before_filter :check_current_user, :only => [:get_current_user, :get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] # find project and check permission - before_filter :find_project, :except => [:ping, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] + before_filter :find_project, :except => [:ping, :get_current_user, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] # find project's version before_filter :find_version, :only => [:get_version, :get_version_issues, :get_version_opened_issues, :get_version_attachments, :add_version_attachment]

1 0

r432 - in trunk/jredmine-client/src/main/redmine/jredmine-2.x: app/controllers config
by tchemit＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: tchemit Date: 2014-04-15 22:02:56 +0200 (Tue, 15 Apr 2014) New Revision: 432 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/432 Log: refs-20 #2381 (add method get_current_user in redmine rails plugin) Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 18:51:13 UTC (rev 431) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 20:02:56 UTC (rev 432) @@ -31,7 +31,7 @@ before_filter :try_find_current_user # check user exists - before_filter :check_current_user, :only => [:get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] + before_filter :check_current_user, :only => [:get_current_user, :get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] # find project and check permission before_filter :find_project, :except => [:ping, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] @@ -70,6 +70,10 @@ render_array_result result, "projects" end + def get_current_user + User.current + end + # recuperation des priorities d'issues def get_issue_priorities get_enumeration "IssuePriority" Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-15 18:51:13 UTC (rev 431) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-15 20:02:56 UTC (rev 432) @@ -25,9 +25,9 @@ RedmineApp::Application.routes.draw do # jredmine : actions with no project context - match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] - match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] - match 'jredmine/:action', :to => 'jredmine#:action', :action => ['ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_current_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_current_user', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] + match 'jredmine/:action', :to => 'jredmine#:action', :action => ['get_current_user', 'ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] # jredmine/action/:pid : actions with project context match 'jredmine/:action.xml/:pid', :to=> 'jredmine#:action', :pid => /.+/, :format => 'xml', :via => ['get', 'post']

1 0

r431 - in trunk: . jredmine-client/src/main/java/org/nuiton/jredmine/client jredmine-client/src/main/redmine/jredmine-2.x/app/controllers jredmine-client/src/main/redmine/jredmine-2.x/config
by tchemit＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: tchemit Date: 2014-04-15 20:51:13 +0200 (Tue, 15 Apr 2014) New Revision: 431 Url: http://forge.nuiton.org/projects/jredmine/repository/revisions/431 Log: fixes #3151 Modified: trunk/ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.iml *.ipr *.iws + target *.iml *.ipr *.iws .idea Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2014-03-02 14:43:10 UTC (rev 430) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2014-04-15 18:51:13 UTC (rev 431) @@ -106,12 +106,12 @@ client = new DefaultHttpClient(); clientContext = new BasicHttpContext(); - // Create a local instance of cookie store - CookieStore cookieStore = new BasicCookieStore(); +// // Create a local instance of cookie store +// CookieStore cookieStore = new BasicCookieStore(); +// +// // Bind custom cookie store to the local context +// clientContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); - // Bind custom cookie store to the local context - clientContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); - // Get server uri try { serverURI = configuration.getUrl().toURI(); @@ -167,28 +167,28 @@ throw e; } - if (!configuration.isAnonymous()) { +// if (!configuration.isAnonymous()) { +// +// // log in +// RedmineClientAuthConfiguration conf = +// getConfiguration().getAuthConfiguration(); +// RedmineRequest<Void> loginRequest; +// +// if (conf.isUseApiKey()) { +// +// // use api key to login +// loginRequest = RedmineRequestHelper.postAction("login", void.class). +// parameter("apiKey", conf.getApiKey()); +// } else { +// // use normal login / password +// loginRequest = RedmineRequestHelper.postAction("login", void.class). +// parameter("username", conf.getUsername()). +// parameter("password", conf.getPassword()); +// } +// +// executeRequest(loginRequest); +// } - // log in - RedmineClientAuthConfiguration conf = - getConfiguration().getAuthConfiguration(); - RedmineRequest<Void> loginRequest; - - if (conf.isUseApiKey()) { - - // use api key to login - loginRequest = RedmineRequestHelper.postAction("login", void.class). - parameter("apiKey", conf.getApiKey()); - } else { - // use normal login / password - loginRequest = RedmineRequestHelper.postAction("login", void.class). - parameter("username", conf.getUsername()). - parameter("password", conf.getPassword()); - } - - executeRequest(loginRequest); - } - open = true; } } @@ -231,9 +231,6 @@ } try { - if (!open) { - throw new IllegalStateException("the session is not opened"); - } HttpRequestBase gm = prepareRequest(request); @@ -256,23 +253,31 @@ try { - RedmineRequest<Void> request = - RedmineRequestHelper.action("logout", void.class); - executeRequest(request); - } catch (Exception e) { - throw new IOException( - "could not close client for reason " + - e.getMessage(), e); + client.getConnectionManager().shutdown(); } finally { - try { + open = false; + } - client.getConnectionManager().shutdown(); - } finally { - - open = false; - } - } +// try { +// +// RedmineRequest<Void> request = +// RedmineRequestHelper.action("logout", void.class); +// executeRequest(request); +// } catch (Exception e) { +// throw new IOException( +// "could not close client for reason " + +// e.getMessage(), e); +// } finally { +// +// try { +// +// client.getConnectionManager().shutdown(); +// } finally { +// +// open = false; +// } +// } } } Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-03-02 14:43:10 UTC (rev 430) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2014-04-15 18:51:13 UTC (rev 431) @@ -26,12 +26,15 @@ # post request before_filter :check_post, :only => [:add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] - - # find user (after login) - before_filter :find_user, :only => [:get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] - + + # try to get user from request (if found, then put it in User.current_user) + before_filter :try_find_current_user + + # check user exists + before_filter :check_current_user, :only => [:get_user_projects, :add_version, :update_version, :next_version, :add_news, :add_attachment, :add_version_attachment, :add_issue_time, :update_issue_time] + # find project and check permission - before_filter :find_project, :except => [:ping, :login, :logout, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] + before_filter :find_project, :except => [:ping, :get_projects, :get_user_projects, :get_issue_statuses, :get_issue_priorities, :get_enumeration] # find project's version before_filter :find_version, :only => [:get_version, :get_version_issues, :get_version_opened_issues, :get_version_attachments, :add_version_attachment] @@ -42,47 +45,14 @@ # find project's issue before_filter :find_issue, :only => [:get_issue_times, :add_issue_time, :update_time_issue] + # remove User.current + after_filter :remove_current_user + # ping service (just to test if service is reachable) def ping render :text => "ping", :status => 200 end - # Login request and validation - def login - if !request.post? - # Logout user : get method not possible - self.logged_user = nil - render_status 405, "POST method required" - else - # Authenticate user - #user = User.try_to_login(params[:username], params[:password]) - user = find_current_user - if user.nil? - # Invalid credentials - render_status 401, "Invalid credentials" - #elsif user.new_record? - # # Onthefly creation failed, - # render_status 401, "User not activated" - else - # Valid user - self.logged_user = user - # always generate a key and set autologin cookie - token = Token.create(:user => user, :action => 'autologin') - cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now } - render_status 200, "User logged in" - end - end - end - - # Log out current user and redirect to welcome page - def logout - cookies.delete :autologin - Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged? - # user is no more connected - self.logged_user = nil - render_status 200, "User logged out" - end - # recuperation des projets def get_projects @projects = Project.find(:all) @@ -441,28 +411,26 @@ end end end - - def find_user - # Check the settings cache for each request - Setting.check_cache - # Find the current user - User.current = find_current_user - if !session[:user_id] + + # Check if User.current exists + def check_current_user + if User.current.nil? render_status 401, "Not connected" end end + # Clean current user + def remove_current_user + User.current = nil + end + # Returns the current user or nil if no user is logged in - def find_current_user + def try_find_current_user + # Check the settings cache for each request + Setting.check_cache + # Find the current user user = nil - if session[:user_id] - # existing session - user = (User.active.find(session[:user_id]) rescue nil) - elsif cookies[:autologin] - # auto-login feature - user = User.find_by_autologin_key(cookies[:autologin]) - end - if user.nil? && Setting.rest_api_enabled? + if Setting.rest_api_enabled? if (key = api_key_from_request) # Use API key user = User.find_by_api_key(key) @@ -477,7 +445,7 @@ # Last chance using request params user = User.try_to_login(params[:username], params[:password]) end - user + User.current = user end # Returns the API key present in the request Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-03-02 14:43:10 UTC (rev 430) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/config/routes.rb 2014-04-15 18:51:13 UTC (rev 431) @@ -25,10 +25,9 @@ RedmineApp::Application.routes.draw do # jredmine : actions with no project context - match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] - match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] - match 'jredmine/:action', :to => 'jredmine#:action', :action => ['login'], :format => 'xml', :via => ['post'] - match 'jredmine/:action', :to => 'jredmine#:action', :action => ['ping', 'logout', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.xml', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] + match 'jredmine/:action.json', :to => 'jredmine#:action', :action => ['get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'json', :via => ['get'] + match 'jredmine/:action', :to => 'jredmine#:action', :action => ['ping', 'get_projects', 'get_user_projects', 'get_issue_statuses', 'get_issue_priorities', 'get_enumeration'], :format => 'xml', :via => ['get'] # jredmine/action/:pid : actions with project context match 'jredmine/:action.xml/:pid', :to=> 'jredmine#:action', :pid => /.+/, :format => 'xml', :via => ['get', 'post'] Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-02 14:43:10 UTC (rev 430) +++ trunk/pom.xml 2014-04-15 18:51:13 UTC (rev 431) @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0</version> + <version>5.0.5</version> </parent> <artifactId>jredmine</artifactId>

1 0