From 938ae13de4ec7c77d0087bd3016e8768388cdfb0 Mon Sep 17 00:00:00 2001 From: madushak Date: Thu, 20 Apr 2017 16:46:09 +0530 Subject: [PATCH 01/11] [IDSDEV-945] Fixed conflict issues --- modules/idsconfig/mobile-connect.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 4f486a9..1c44b14 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -250,7 +250,6 @@ - true J2lAGcsgEILuhiSyPwsljG4OoxzyIiaX From 132d292741b7710982e516e8848f11327cea599d Mon Sep 17 00:00:00 2001 From: madushak Date: Wed, 24 May 2017 10:40:02 +0530 Subject: [PATCH 02/11] Added new mobile connect configs and bundle self service portal on pack - IDSDEV-379 --- modules/distribution/src/assembly/bin.xml | 1 + modules/p2-profile-gen/pom.xml | 23 ++++++++++++++++++++++- pom.xml | 9 +++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index ea09d2e..59026fc 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -182,6 +182,7 @@ introspect.war premiuminfo.war samplerequest.war + selfserviceportal.war diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 98861e7..f1979da 100755 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -143,6 +143,9 @@ com.wso2telco.ids:com.wso2telco.ids.saaserver.feature:${com.wso2telco.ids.version} + + com.wso2telco.ids:com.wso2telco.ids.selfserviceportal.feature:${com.wso2telco.ids.version} + com.wso2telco.ids:com.wso2telco.ids.samplerequest.feature:${com.wso2telco.ids.version} @@ -944,6 +947,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} @@ -1087,11 +1095,14 @@ com.wso2telco.ids.saaserver.feature.group ${com.wso2telco.ids.version} - com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} + + com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.sessionupdater.ui.feature.group @@ -1578,6 +1589,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} @@ -2045,6 +2061,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} diff --git a/pom.xml b/pom.xml index 2976151..b1d6101 100755 --- a/pom.xml +++ b/pom.xml @@ -1216,6 +1216,11 @@ com.wso2telco.ids.tokenintrospection ${com.wso2telco.ids.version} + + com.wso2telco.ids + com.wso2telco.ids.selfserviceportal.feature + ${com.wso2telco.ids.version} + @@ -1373,8 +1378,8 @@ - 2.4.0-rc1 - 2.4.3 + 2.2.0-SNAPSHOT + 2.0.22-SNAPSHOT 5.2.2 From 0a7eacdfdcc5aa6df4275cfc8fcc49028622710a Mon Sep 17 00:00:00 2001 From: madushak Date: Wed, 24 May 2017 10:43:20 +0530 Subject: [PATCH 03/11] [IDSDEV-971] rebase the master with mig-release-2.2.0-m3 to add Self Service Portal implementation --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1d6101..34efb4c 100755 --- a/pom.xml +++ b/pom.xml @@ -1378,8 +1378,8 @@ - 2.2.0-SNAPSHOT - 2.0.22-SNAPSHOT + 2.4.0-SNAPSHOT + 2.4.4-SNAPSHOT 5.2.2 From 2b509ff023d48d2cf094ad101149e1aee5e1c726 Mon Sep 17 00:00:00 2001 From: gayanch Date: Mon, 9 Jul 2018 17:46:45 +0530 Subject: [PATCH 04/11] mobile-connect.xml changes for service provision API --- modules/idsconfig/mobile-connect.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 0420d4c..bb8e742 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -14,7 +14,7 @@ true integration-axiatagroup.apiexchange.org - axiaD:\1.6-RC2\log\mobile-connect.xmltagroup + axiatagroup d0f865b4453be954b03b8b67556a395 413 @@ -323,36 +323,37 @@ 1qaz2wsx@ https://localhost:9443 + https://localhost:9444 admin admin https://localhost:9444/authorize/v1/spark/oauth2/authorize https://localhost:9444/token/v1/spark/oauth2/token - https://localhost:9444/token + https://localhost:9443/token https://localhost:9444/oauth2/userinfo Authorize v1 admin - Gold + Unlimited authorizemnv v1 admin - Gold + Unlimited token v1 admin - Gold + Unlimited tokenmnv v1 admin - Gold + Unlimited OAuth-2.0 From 51e4621040a1eb8acd77cb4a1efc4dd56d003bef Mon Sep 17 00:00:00 2001 From: gayanch Date: Tue, 10 Jul 2018 16:58:51 +0530 Subject: [PATCH 05/11] copy service provider provision resources into distribution --- modules/distribution/src/assembly/bin.xml | 1 + modules/idsconfig/mobile-connect.xml | 1 - modules/p2-profile-gen/pom.xml | 21 +++++++++++++++++++++ pom.xml | 7 ++++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index ea09d2e..0dc89ca 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -182,6 +182,7 @@ introspect.war premiuminfo.war samplerequest.war + spprovisionservice.war diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index bb8e742..401d4b2 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -323,7 +323,6 @@ 1qaz2wsx@ https://localhost:9443 - https://localhost:9444 admin admin https://localhost:9444/authorize/v1/spark/oauth2/authorize diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 98861e7..340cbf3 100755 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -146,6 +146,9 @@ com.wso2telco.ids:com.wso2telco.ids.samplerequest.feature:${com.wso2telco.ids.version} + + com.wso2telco.ids:com.wso2telco.ids.spprovisionservice.feature:${com.wso2telco.ids.version} + com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version} @@ -944,6 +947,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} @@ -1093,6 +1101,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} @@ -1577,6 +1590,10 @@ com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.sessionupdater.ui.feature.group @@ -2044,6 +2061,10 @@ com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.sessionupdater.ui.feature.group diff --git a/pom.xml b/pom.xml index 5da7d66..17db86b 100755 --- a/pom.xml +++ b/pom.xml @@ -1211,6 +1211,11 @@ com.wso2telco.ids.samplerequest.feature ${com.wso2telco.ids.version} + + com.wso2telco.ids + com.wso2telco.ids.spprovisionservice.feature + ${com.wso2telco.ids.version} + com.wso2telco.ids com.wso2telco.ids.tokenintrospection @@ -1373,7 +1378,7 @@ - 2.4.0-rc1 + 2.4.0-SNAPSHOT 2.4.4-SNAPSHOT From 3141ecca9e646e5ff736e167c2c56f541fa181b5 Mon Sep 17 00:00:00 2001 From: lakini Date: Thu, 28 Jun 2018 15:06:26 +0530 Subject: [PATCH 06/11] [IDSDEV-916] Add new configurations for SpProvisioning API --- modules/idsconfig/mobile-connect.xml | 71 +++++++++++++++------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 1c44b14..5e1cb08 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -264,38 +264,6 @@ - - https://localhost:9443/services/OAuthAdminService - https://localhost:9443/services/IdentityApplicationManagementService - admin - admin - 100 - 2 - - false - true - oauth2 - false - null - oauthConsumerSecret - false - false - PRIMARY - true - LOA - false - LOACompositeAuthenticator - true - local - admin - admin - OAuth-2.0 - authorization_code implicit password client_credentials refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer iwa:ntlm - false - false - - - admin admin @@ -352,4 +320,43 @@ http://localhost:9763/sessionupdater/tnspoints/endpoint/serverinitiated/sms/response http://localhost:9763/oauth2/token + + + 1qaz2wsx@ + https://localhost:9443 + admin + admin + https://localhost:9444/authorize/v1/spark/oauth2/authorize + https://localhost:9444/token/v1/spark/oauth2/token + https://localhost:9444/token + https://localhost:9444/oauth2/userinfo + + + Authorize + v1 + admin + Gold + + + authorizemnv + v1 + admin + Gold + + + token + v1 + admin + Gold + + + tokenmnv + v1 + admin + Gold + + + OAuth-2.0 + authorization_code implicit password client_credentials refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer iwa:ntlm + From 5a93cc32edf69a3879ae953605fb0de50b3a2766 Mon Sep 17 00:00:00 2001 From: gayanch Date: Mon, 9 Jul 2018 17:46:45 +0530 Subject: [PATCH 07/11] mobile-connect.xml changes for service provision API --- modules/idsconfig/mobile-connect.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 5e1cb08..ad6b4e6 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -14,7 +14,7 @@ true integration-axiatagroup.apiexchange.org - axiaD:\1.6-RC2\log\mobile-connect.xmltagroup + axiatagroup d0f865b4453be954b03b8b67556a395 413 @@ -324,36 +324,37 @@ 1qaz2wsx@ https://localhost:9443 + https://localhost:9444 admin admin https://localhost:9444/authorize/v1/spark/oauth2/authorize https://localhost:9444/token/v1/spark/oauth2/token - https://localhost:9444/token + https://localhost:9443/token https://localhost:9444/oauth2/userinfo Authorize v1 admin - Gold + Unlimited authorizemnv v1 admin - Gold + Unlimited token v1 admin - Gold + Unlimited tokenmnv v1 admin - Gold + Unlimited OAuth-2.0 From ece68fd3a79979735edcf5d7fee8b447a5c20008 Mon Sep 17 00:00:00 2001 From: gayanch Date: Tue, 10 Jul 2018 16:58:51 +0530 Subject: [PATCH 08/11] copy service provider provision resources into distribution --- modules/distribution/src/assembly/bin.xml | 1 + modules/idsconfig/mobile-connect.xml | 1 - modules/p2-profile-gen/pom.xml | 21 +++++++++++++++++++++ pom.xml | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 59026fc..a9bafb3 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -183,6 +183,7 @@ premiuminfo.war samplerequest.war selfserviceportal.war + spprovisionservice.war diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index ad6b4e6..f5db727 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -324,7 +324,6 @@ 1qaz2wsx@ https://localhost:9443 - https://localhost:9444 admin admin https://localhost:9444/authorize/v1/spark/oauth2/authorize diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index f1979da..8d207ff 100755 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -149,6 +149,9 @@ com.wso2telco.ids:com.wso2telco.ids.samplerequest.feature:${com.wso2telco.ids.version} + + com.wso2telco.ids:com.wso2telco.ids.spprovisionservice.feature:${com.wso2telco.ids.version} + com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version} @@ -949,6 +952,11 @@ com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + + + + com.wso2telco.ids.spprovisionservice.feature.group ${com.wso2telco.ids.version} @@ -1104,6 +1112,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.sessionupdater.ui.feature.group ${com.wso2telco.ids.version} @@ -1588,6 +1601,10 @@ com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.selfserviceportal.feature.group @@ -2060,6 +2077,10 @@ com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} + + com.wso2telco.ids.spprovisionservice.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.selfserviceportal.feature.group diff --git a/pom.xml b/pom.xml index 34efb4c..f76a222 100755 --- a/pom.xml +++ b/pom.xml @@ -1211,6 +1211,11 @@ com.wso2telco.ids.samplerequest.feature ${com.wso2telco.ids.version} + + com.wso2telco.ids + com.wso2telco.ids.spprovisionservice.feature + ${com.wso2telco.ids.version} + com.wso2telco.ids com.wso2telco.ids.tokenintrospection From ef39e59b817a82834ddbb235b8ef8108c3431e1f Mon Sep 17 00:00:00 2001 From: gayanch Date: Wed, 11 Jul 2018 16:07:42 +0530 Subject: [PATCH 09/11] Self service portal configuration changes --- modules/idsconfig/scope-config.xml | 6 ++++++ modules/p2-profile-gen/pom.xml | 23 ++++++----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/modules/idsconfig/scope-config.xml b/modules/idsconfig/scope-config.xml index 3f9db7b..3f50ecb 100755 --- a/modules/idsconfig/scope-config.xml +++ b/modules/idsconfig/scope-config.xml @@ -641,5 +641,11 @@ email + + openid + + msisdn + + \ No newline at end of file diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 2edc60e..0d49585 100755 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -950,17 +950,13 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.selfserviceportal.feature.group + ${com.wso2telco.ids.version} + + -<<<<<<< HEAD com.wso2telco.ids.spprovisionservice.feature.group -======= - com.wso2telco.ids.selfserviceportal.feature.group - ${com.wso2telco.ids.version} - - - - com.wso2telco.ids.spprovisionservice.feature.group ->>>>>>> spp-rebase-lakini ${com.wso2telco.ids.version} @@ -1111,13 +1107,9 @@ com.wso2telco.ids.samplerequest.feature.group ${com.wso2telco.ids.version} - - com.wso2telco.ids.selfserviceportal.feature.group - ${com.wso2telco.ids.version} - - com.wso2telco.ids.spprovisionservice.feature.group + com.wso2telco.ids.selfserviceportal.feature.group ${com.wso2telco.ids.version} @@ -1614,14 +1606,11 @@ com.wso2telco.ids.spprovisionservice.feature.group ${com.wso2telco.ids.version} -<<<<<<< HEAD -======= com.wso2telco.ids.selfserviceportal.feature.group ${com.wso2telco.ids.version} ->>>>>>> spp-rebase-lakini com.wso2telco.ids.sessionupdater.ui.feature.group From 7f2db0b4e2a216b0d7072697d6f86946c2a02d62 Mon Sep 17 00:00:00 2001 From: gayanch Date: Thu, 12 Jul 2018 18:10:29 +0530 Subject: [PATCH 10/11] mobilr-connect config changes --- modules/idsconfig/mobile-connect.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index bc23776..5e4dc95 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -289,13 +289,13 @@ - - - https://localhost:9443/selfserviceportal/#/login - https://localhost:9443/oauth2/token - https://localhost:9443/selfserviceportal/api/v1/auth/callback - https://localhost:9443/oauth2/userinfo?schema=openid - https://localhost:9443/authproxy/oauth2/authorize/operator/${operator} + 8iwbH6Gtc_1LluEHxZxZw7k5Qh4a + HDagnd6nncGHmTgEbjfON0WCLzEa + https://localhost:9444/selfserviceportal/#/login + https://localhost:9444/oauth2/token + https://localhost:9444/selfserviceportal/api/v1/auth/callback + https://localhost:9444/oauth2/userinfo?schema=openid + https://localhost:9444/authproxy/oauth2/authorize/operator/${operator} msisdn @@ -326,7 +326,7 @@ admin admin https://localhost:9444/authorize/v1/spark/oauth2/authorize - https://localhost:9444/token/v1/spark/oauth2/token + https://localhost:9444/oauth2/token https://localhost:9443/token https://localhost:9444/oauth2/userinfo From e14e070f2c77cc2ecb2fa3508ac7d1a5abb5d9fc Mon Sep 17 00:00:00 2001 From: gayanch Date: Thu, 26 Jul 2018 14:25:52 +0530 Subject: [PATCH 11/11] changed spprovision config to handle multiple operators --- modules/idsconfig/mobile-connect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 5e4dc95..ff6d9a9 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -325,7 +325,7 @@ https://localhost:9443 admin admin - https://localhost:9444/authorize/v1/spark/oauth2/authorize + https://localhost:9444/authorize/v1/${operator}/oauth2/authorize https://localhost:9444/oauth2/token https://localhost:9443/token https://localhost:9444/oauth2/userinfo