left merge changes from Develop to master merge

.github/workflows/package.yml

@@ -1,4 +1,3 @@
-
 name: Package
 
 on:
@@ -29,7 +28,6 @@ jobs:
 
     - name: Checkout code 
       uses: actions/checkout@v2
-
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:

.github/workflows/sast-and-package.yml

@@ -28,13 +28,11 @@ jobs:
 
     - name: Checkout code 
       uses: actions/checkout@v2
-
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
-
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

.java-version

@@ -0,0 +1 @@
+1.8

README.md

@@ -26,8 +26,15 @@ This service has been tested on Wildfly as the application server.
 * Redis
 * MySQL Database
 
+## Environment and setup
+
+1. Install dependencies `mvn clean install`
+2. You can copy `common_example.properties` to `common_local.properties` and edit the file accordingly. The file is under `src/main/environment` folder.
+3. Run the spring server with local configuration `mvn spring-boot:run -DENV_VAR=local`
+
 ## Integrations
 * RMNCH (Reproductive, Maternal, Newborn, and Child Health)
+
 ## Usage
 All features have been exposed as REST endpoints. Refer to the SWAGGER API specification for details.
 

pom.xml

@@ -29,7 +29,7 @@
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
 		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
-		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
+		<source-properties>target/classes/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>
 		<sonar.java.binaries>target</sonar.java.binaries>
 	</properties>
@@ -211,16 +211,14 @@
 			<properties>
 				<final-name>1097identityapi-v1.0</final-name>
 				<target-properties>target/classes/application.properties</target-properties>
-				<source-properties>src/main/environment/1097_${environment}.properties</source-properties>
+				<source-properties>target/classes/1097_${environment}.properties</source-properties>
 			</properties>
 			<build>
 				<finalName>1097identityapi-v1.0</finalName>
 			</build>
 		</profile>
 	</profiles>
 
-
-
 	<build>
 		<finalName>identity-0.0.1</finalName>
 		<plugins>
@@ -255,6 +253,32 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+						<configuration>
+							<delimiters>@</delimiters>
+							<useDefaultDelimiters>false</useDefaultDelimiters>
+							<resources>
+								<resource>
+									<directory>src/main/environment</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>common_${environment}.properties</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -265,11 +289,11 @@
 						<goals>
 							<goal>run</goal>
 						</goals>
-						<id>properties-updated</id>
+						<id>merge-properties</id>
 						<configuration>
 							<target>
 								<echo>
-									concatinating properties file ${target-properties} and
+									concatenating properties file ${target-properties} and
 									${source-properties}
 								</echo>
 								<concat destfile="${target-properties}" append="yes"
@@ -280,6 +304,20 @@
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>clean-property-files</id>
+						<configuration>
+							<tasks>
+								<delete>
+									<file file="${source-properties}"/>
+								</delete>
+							</tasks>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>

src/main/environment/1097_ci.properties

@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=@env.DATABASE_URL@
+spring.datasource.username=@env.DATABASE_USERNAME@
+spring.datasource.password=@env.DATABASE_PASSWORD@
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_ci.properties

@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=@env.DATABASE_URL@
+spring.datasource.username=@env.DATABASE_USERNAME@
+spring.datasource.password=@env.DATABASE_PASSWORD@
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_example.properties

@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_test.properties

@@ -1,8 +1,5 @@
 # DataSource settings: set here your own configurations for the database
-
 spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-

src/main/java/com/iemr/common/identity/config/BlockingHttpMethodInterceptor.java

@@ -0,0 +1,36 @@
+package com.iemr.common.identity.config;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+public class BlockingHttpMethodInterceptor implements HandlerInterceptor {
+	@Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String method = request.getMethod();
+        if (!("GET".equals(method) || "POST".equals(method))) {
+            response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+            return false;
+        }
+        return true;
+}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+			throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+}

src/main/java/com/iemr/common/identity/config/InterceptorConfig.java

@@ -35,9 +35,16 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter
 	@Autowired
 	HTTPRequestInterceptor requestInterceptor;
 
+//	@Override
+//	public void addInterceptors(InterceptorRegistry registry)
+//	{
+//		registry.addInterceptor(requestInterceptor);
+//	}
+
 	@Override
 	public void addInterceptors(InterceptorRegistry registry)
 	{
-		registry.addInterceptor(requestInterceptor);
+		 registry.addInterceptor(new BlockingHttpMethodInterceptor())
+         .addPathPatterns("/**"); 
 	}
 }