[zanata/zanata-platform] f7c78f: ZNTA-2227 auto merge saml user to existing account

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: f7c78f7a99f3a5398d3d65c9688f70e17242e816
      https://github.com/zanata/zanata-platform/commit/f7c78f7a99f3a5398d3d65c9688f70e17242e816
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M server/docker/conf/zanata-config.cli
    A server/services/src/main/java/org/zanata/security/SamlAccountService.kt
    M server/services/src/main/java/org/zanata/servlet/SAMLFilter.kt
    A server/services/src/test/java/org/zanata/security/SamlAccountServiceTest.kt
    M server/services/src/test/java/org/zanata/servlet/SAMLFilterTest.kt

  Log Message:
  -----------
  ZNTA-2227 auto merge saml user to existing account


  Commit: 0f67f18a47cce0891831afbb0fead21df3787557
      https://github.com/zanata/zanata-platform/commit/0f67f18a47cce0891831afbb0fead21df3787557
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M server/services/src/main/java/org/zanata/security/AuthenticationManager.java

  Log Message:
  -----------
  ZNTA-2227 - fix case: username does not match saml


  Commit: 1c52f6dceba0bc2ef0c9e910a58fb1b6f46106de
      https://github.com/zanata/zanata-platform/commit/1c52f6dceba0bc2ef0c9e910a58fb1b6f46106de
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M server/docker/conf/zanata-config.cli
    M server/services/src/main/java/org/zanata/security/AuthenticationManager.java
    A server/services/src/main/java/org/zanata/security/SamlAccountService.kt
    M server/services/src/main/java/org/zanata/servlet/SAMLFilter.kt
    A server/services/src/test/java/org/zanata/security/SamlAccountServiceTest.kt
    M server/services/src/test/java/org/zanata/servlet/SAMLFilterTest.kt

  Log Message:
  -----------
  Merge pull request #599 from zanata/ZNTA-2227-auto-merge-account

ZNTA-2227 auto merge saml user to existing account


Compare: https://github.com/zanata/zanata-platform/compare/6cbf301424b4...1c52f6dceba0