Merge pull request #720 from kameshsr/develop

Mosip:15286 changed openapi.json file name of authentication-service
mosip · Dec 20, 2021 · 31b0bf7 · 31b0bf7
2 parents dd3e116 + 5c1b8e4
commit 31b0bf7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 6 deletions.
diff --git a/authentication/authentication-internal-service/pom.xml b/authentication/authentication-internal-service/pom.xml
@@ -222,7 +222,7 @@
 						<configuration>
 							<apiDocsUrl>http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Internal%20Service
 							</apiDocsUrl>
-							<outputFileName>openapi.json</outputFileName>
+							<outputFileName>${name}-openapi.json</outputFileName>
 							<outputDir>${project.build.directory}</outputDir>
 							<skip>false</skip>
 						</configuration>

diff --git a/authentication/authentication-internal-service/src/test/resources/application.properties b/authentication/authentication-internal-service/src/test/resources/application.properties
@@ -787,4 +787,23 @@ openapi.info.license.url=https://docs.mosip.io/platform/license
 openapi.service.servers[0].url=${mosipbox.public.url}${server.servlet.context-path}
 openapi.service.servers[0].description=Id Authentication Internal Service
 openapi.group.name=${openapi.info.title}
-openapi.group.paths[0]=/**
+openapi.group.paths[0]=/**
+ida-websub-idchage-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
+ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
+ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
+ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
+ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
+ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
+ida-websub-masterdata-templates-callback-relative-url=
+ida-websub-masterdata-titles-callback-relative-url=
+ida-websub-ca-cert-callback-relative-url=
+
+
+# Callback url for MISP/Partner change notification events
+ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
+ida-websub-partner-service-partner-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_updated
+ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/policy_updated
+ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
+ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
+ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
diff --git a/authentication/authentication-otp-service/pom.xml b/authentication/authentication-otp-service/pom.xml
@@ -118,6 +118,8 @@
 						<configuration>
 							<executable>true</executable>
 							<layout>ZIP</layout>
+							<wait>1000</wait>
+							<maxAttempts>180</maxAttempts>
 						</configuration>
 						<executions>
 							<execution>
@@ -167,7 +169,7 @@
 						<configuration>
 							<apiDocsUrl>http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20OTP%20Service
 							</apiDocsUrl>
-							<outputFileName>openapi.json</outputFileName>
+							<outputFileName>${name}-openapi.json</outputFileName>
 							<outputDir>${project.build.directory}</outputDir>
 							<skip>false</skip>
 						</configuration>

diff --git a/authentication/authentication-otp-service/src/test/resources/application.properties b/authentication/authentication-otp-service/src/test/resources/application.properties
@@ -728,4 +728,6 @@ auth.server.admin.issuer.uri=${mosipbox.public.url}/keycloak/auth/realms/
 mosip.service-context=${server.servlet.context-path}
 mosip.service.end-points=/**/*
 mosip.service.exclude.auth.allowed.method=GET,POST
-
+ida-websub-masterdata-templates-callback-relative-url=
+ida-websub-masterdata-titles-callback-relative-url=
+ida-websub-ca-cert-callback-relative-url=
diff --git a/authentication/authentication-service/pom.xml b/authentication/authentication-service/pom.xml
@@ -233,7 +233,7 @@
                         <configuration>
                             <apiDocsUrl>http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Service
                             </apiDocsUrl>
-                            <outputFileName>openapi.json</outputFileName>
+                            <outputFileName>${name}-openapi.json</outputFileName>
                             <outputDir>${project.build.directory}</outputDir>
                             <skip>false</skip>
                         </configuration>

diff --git a/authentication/authentication-service/src/test/resources/application.properties b/authentication/authentication-service/src/test/resources/application.properties
@@ -615,4 +615,7 @@ openapi.info.license.url=https://docs.mosip.io/platform/license
 openapi.service.servers[0].url=${mosipbox.public.url}${server.servlet.context-path}
 openapi.service.servers[0].description=Id Authentication Service
 openapi.group.name=${openapi.info.title}
-openapi.group.paths[0]=/**
+openapi.group.paths[0]=/**
+ida-websub-masterdata-templates-callback-relative-url=
+ida-websub-masterdata-titles-callback-relative-url=
+ida-websub-ca-cert-callback-relative-url=