Merge branch 'develop' into 'master'

Develop

See merge request teis/auth-service!13

.gitignore

+.gradle
+.idea
+.git
+*.iml
+application-develop.yaml
+application-local.yaml
+
+out
+build
+*.swp

.gitlab-ci.yml

+stages:
+  - test
+  - build
+  - deploy
+
+variables:
+  USE_RABBIT: "true"
+  USE_REDIS: "true"
+  USE_POSTGRES: "true"
+  USE_SSO: "true"
+  API_CONTEXT_PATH: "/api-auth"
+
+include:
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-init.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/common/.gitlab-ci-java-test.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-build.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-deploy.yml"

.gitmodules

+[submodule "dev-ops"]
+	path = dev-ops
+	url = ../dev-ops.git

LICENSE

+MIT License
+
+Copyright (c) 2020 TEHIK
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

 # auth-service
 
-Authorization service
\ No newline at end of file
+Authorization service
+

build.gradle

+buildscript {
+    repositories {
+
+        mavenLocal()
+        maven {
+            url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
+            credentials {
+                username = "${gradle.ext.artifactoryUser}"
+                password = "${gradle.ext.artifactoryPass}"
+            }
+        }
+    }
+    dependencies {
+        classpath("ee.sm.ti.teis:ee.sm.ti.teis.gradle.plugin:${pluginVersion}")
+    }
+    configurations.all {
+        // Check for updates every build
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
+
+}
+apply plugin: 'ee.sm.ti.teis'
+
+allprojects {
+
+    functionalities {
+        base
+    }
+
+    repositories {
+        mavenLocal()
+        maven {
+            url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
+            credentials {
+                username = "${gradle.ext.artifactoryUser}"
+                password = "${gradle.ext.artifactoryPass}"
+            }
+        }
+        jcenter()
+    }
+
+    group = "${theGroup}"
+    version = "${theVersion}"
+
+    sourceCompatibility = 11
+    targetCompatibility = 11
+
+    jar {
+        manifest {
+            attributes('Implementation-Title': project.name,
+                    'Implementation-Version': project.version)
+        }
+    }
+
+    apply from: this.getClass().getClassLoader().getResource('teis.test-sonar.gradle')
+
+    dependencies {
+        // TeIS
+        compile "ee.sm.ti.teis:common-api-gateway-lib:${commonApiGatewayVersion}"
+        compile "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
+        compile "ee.sm.ti.teis:domain-request-lib:${commonsVersion}"
+        annotationProcessor(
+                "javax.annotation:javax.annotation-api:1.3.2",
+        )
+    }
+
+}

dev-ops @ c7160c7f

+Subproject commit c7160c7f1d748806a18e01a1ea9dc68151e3106a

gradle.properties

+theGroup=ee.sm.ti.teis
+theVersion=0.2.0
+commonsVersion=0.22.3-SNAPSHOT
+commonApiGatewayVersion=0.23.0-SNAPSHOT
+pluginVersion=0.0.19-SNAPSHOT
+mapstructVersion=1.3.0.Final

gradle/wrapper/gradle-wrapper.properties

+#Fri Mar 08 15:54:50 EET 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

gradlew

+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lombok.config

+lombok.addLombokGeneratedAnnotation = true

service/build.gradle

+description = """auth-service"""
+
+functionalities {
+    microservice
+    database
+}
+
+apply from: this.getClass().getClassLoader().getResource('teis.integrationTest.gradle')
+apply from: this.getClass().getClassLoader().getResource('teis.microservice.gradle')
+
+dependencies {
+    // Spring
+    compile 'org.springframework.boot:spring-boot-starter-data-jpa'
+    compile 'org.springframework.boot:spring-boot-starter-data-redis'
+    compile 'org.springframework.boot:spring-boot-starter-security'
+    compile 'org.springframework.boot:spring-boot-starter-aop'
+    compile 'org.keycloak:keycloak-admin-client:8.0.1'
+    compile 'org.jboss.resteasy:resteasy-client:3.8.1.Final'
+    compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.8.1.Final'
+    
+    // Tests
+    integTestImplementation "org.springframework.boot:spring-boot-starter-web"
+    integTestImplementation "org.springframework.boot:spring-boot-starter-amqp"
+    integTestCompile('org.springframework.security:spring-security-test')
+
+    // Misc
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+
+    // Annotation processors
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+
+    // Tests
+    testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+}
+
+
+// Define the main class for the application
+mainClassName = 'ee.sm.ti.teis.authorization.AuthServiceApp'

service/settings.gradle

+gradle.ext.artifactoryUrl = hasProperty('ARTIFACTORY_URL') ? ARTIFACTORY_URL : System.getenv('ARTIFACTORY_URL')
+gradle.ext.artifactoryUser = hasProperty('ARTIFACTORY_USER') ? ARTIFACTORY_USER : System.getenv('ARTIFACTORY_USER')
+gradle.ext.artifactoryPass = hasProperty('ARTIFACTORY_PASS') ? ARTIFACTORY_PASS : System.getenv('ARTIFACTORY_PASS')
+gradle.ext.artifactoryRepoKey = hasProperty('ARTIFACTORY_REPO_KEY') ? ARTIFACTORY_REPO_KEY : System.getenv('ARTIFACTORY_REPO_KEY')
+
+rootProject.name='auth-service'

service/src/integTest/java/ee/sm/ti/teis/authorization/AuthServiceAppTestBase.java

+package ee.sm.ti.teis.authorization;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.io.IOException;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = AuthServiceApp.class)
+@AutoConfigureMockMvc
+@ActiveProfiles("integtest")
+@Testcontainers
+@ContextConfiguration(initializers = {AuthServiceAppTestBase.Initializer.class})
+@DirtiesContext
+public abstract class AuthServiceAppTestBase {
+
+    private static GenericContainer rabbitMQContainer;
+    private static GenericContainer redisContainer;
+
+    static {
+        rabbitMQContainer = new GenericContainer("rabbitmq:latest").withExposedPorts(5672);
+        rabbitMQContainer.start();
+        redisContainer = new GenericContainer<>("redis:5.0.5-alpine").withExposedPorts(6379);
+        redisContainer.start();
+    }
+
+    protected void clearRedisCache() {
+        try {
+            redisContainer.execInContainer("redis-cli", "flushall");
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+        @Override
+        public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+            // We must to ask real host port values form Testcontainers.
+            // It generates random port numbers on host side) and add then to Spring context.
+            TestPropertyValues
+                    .of("spring.rabbitmq.port:" + rabbitMQContainer.getFirstMappedPort(),
+                            "spring.rabbitmq.host:" + rabbitMQContainer.getContainerIpAddress(),
+                            "spring.redis.port:" + redisContainer.getFirstMappedPort(),
+                            "spring.redis.host:" + redisContainer.getContainerIpAddress())
+                    .applyTo(configurableApplicationContext.getEnvironment());
+        }
+    }
+
+}

service/src/integTest/java/ee/sm/ti/teis/authorization/TemplateConfiguration.java

+package ee.sm.ti.teis.authorization;
+
+
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import static org.mockito.Mockito.mock;
+
+@Profile({"integtest"})
+@Configuration
+public class TemplateConfiguration {
+
+    @Profile({"integtest"})
+    @Bean
+    public RabbitTemplate msRabbitTemplate(ConnectionFactory connectionFactory, MessageConverter jsonMessageConverter) {
+        return mock(RabbitTemplate.class);
+    }
+
+    @Profile({"integtest"})
+    @Bean
+    public RabbitTemplate gwRabbitTemplate(ConnectionFactory connectionFactory, MessageConverter jsonMessageConverter) {
+        return mock(RabbitTemplate.class);
+    }
+
+    @Profile({"integtest"})
+    @Bean
+    public RabbitTemplate csRabbitTemplate(ConnectionFactory connectionFactory, MessageConverter jsonMessageConverter) {
+        return mock(RabbitTemplate.class);
+    }
+
+
+}

service/src/integTest/java/ee/sm/ti/teis/authorization/person/PersonGwListenerTest.java

+package ee.sm.ti.teis.authorization.person;
+
+import ee.sm.ti.teis.authorization.AuthServiceAppTestBase;
+import ee.sm.ti.teis.authorization.representatives.RepresentativesService;
+import ee.sm.ti.teis.authorization.role.RoleService;
+import ee.sm.ti.teis.authorization.xroad.XroadArService;
+import ee.sm.ti.teis.authorization.xroad.XroadTorService;
+import ee.sm.ti.teis.commongateway.auth.GetMyCompaniesRequest;
+import ee.sm.ti.teis.commongateway.auth.GetMyCompaniesResponse;
+import ee.sm.ti.teis.domain.ClassifierItemLight;
+import ee.sm.ti.teis.domain.person.Employer;
+import ee.sm.ti.teis.domain.person.LegalPerson;
+import ee.sm.ti.teis.domain.person.Person;
+import ee.sm.ti.teis.domain.representative.Representative;
+import ee.sm.ti.teis.domain.representative.ar.ArRepresentations;
+import ee.sm.ti.teis.domain.role.RoleDefinition;
+import ee.sm.ti.teis.domain.tor.TorEmployers;
+import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
+import ee.sm.ti.teis.types.enums.PersonType;
+import ee.sm.ti.teis.types.enums.RoleType;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+
+@SuppressWarnings("squid:S00100")
+public class PersonGwListenerTest extends AuthServiceAppTestBase {
+
+    private static final String PERSON_ID = "a93b7bdd-b904-4726-9b0d-ffff832ecfee";
+    private static final String EMPLOYER_ID = "69a31369-f74d-404d-a221-ba7d30bf3455";
+    private static final String EMPLOYER_ID2 = "79a31369-f74d-404d-a221-ba7d30bf3455";
+    private static final String ROLE_ID1 = "64625315-9a14-423b-b114-4be4cae15828";
+    private static final String ROLE_ID2 = "86cd6b6e-1b53-4997-a2fd-630b06d33f74";
+    private static final String ROLE_ID3 = "346a9e4c-59c5-4368-8b1f-90e06e3b6514";
+    private static final String REGCODE1 = "12197746";
+
+    @Autowired
+    RabbitTemplate gwRabbitTemplate;
+
+    @Autowired
+    RabbitTemplate msRabbitTemplate;
+
+    @Autowired
+