diff --git a/modules/dbscripts/mig_connectdb.sql b/modules/dbscripts/mig_connectdb.sql index b036d1b..a8025b2 100755 --- a/modules/dbscripts/mig_connectdb.sql +++ b/modules/dbscripts/mig_connectdb.sql @@ -228,6 +228,8 @@ CREATE TABLE `scope_parameter` ( `msisdn_mismatch_result` VARCHAR(255), `he_failure_result` VARCHAR(255), `is_multiscope` TINYINT DEFAULT 0, + `is_consent_page` TINYINT NOT NULL DEFAULT 0, + `description` VARCHAR(255), PRIMARY KEY (`param_id`), UNIQUE (`scope`) ) ENGINE=INNODB DEFAULT CHARSET=LATIN1; @@ -263,6 +265,60 @@ VALUES(9,'address',1); INSERT INTO scope_parameter(param_id,scope,is_multiscope) VALUES(10,'mc_identity_phonenumber_hashed',1); +INSERT INTO scope_parameter(param_id,scope,is_login_hint_mandatory,is_header_msisdn_mandatory,is_tnc_visible,msisdn_mismatch_result,he_failure_result,is_multiscope,is_consent_page) +VALUES(11,'api',0,0,0,'CONTINUE_WITH_HEADER','TRUST_LOGINHINT_MSISDN',0,1); + +INSERT INTO scope_parameter(param_id,scope,is_multiscope,is_consent_page,description) +VALUES(12,'sms',1,1,'SMS is Charged 5 per sms'); + +INSERT INTO scope_parameter(param_id,scope,is_multiscope,is_consent_page,description) +VALUES(13,'charge',1,1,'Charge API will be charged per transaction'); + +INSERT INTO scope_parameter(param_id,scope,is_multiscope,is_consent_page,description) +VALUES(14,'payment',1,1,'A convenient fee of 1% charged'); + + +DROP TABLE IF EXISTS `consent`; + +CREATE TABLE `consent` ( + `consent_id` INT(20) NOT NULL AUTO_INCREMENT, + `client_id` VARCHAR(100) NOT NULL, + `scope_id` INT(20) NOT NULL, + `operator_id` INT(20) NOT NULL, + `approve_status` VARCHAR(45), + PRIMARY KEY (`consent_id`), + FOREIGN KEY (`scope_id`) REFERENCES `scope_parameter`(`param_id`), + UNIQUE (`client_id`,`scope_id`,`operator_id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + +DROP TABLE IF EXISTS `user_consent`; + +CREATE TABLE `user_consent` ( + `user_consent_id` INT(20) NOT NULL AUTO_INCREMENT, + `msisdn` VARCHAR(255) NOT NULL, + `client_id` VARCHAR(100) NOT NULL, + `scope_id` INT(20) NOT NULL, + `operator_id` INT(20) NOT NULL, + `approve` TINYINT DEFAULT 0, + PRIMARY KEY (`user_consent_id`), + FOREIGN KEY (`scope_id`) REFERENCES `scope_parameter`(`param_id`), + UNIQUE (`msisdn`,`client_id`,`scope_id`,`operator_id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +DROP TABLE IF EXISTS `consent_history`; + +CREATE TABLE `consent_history` ( + `id` INT(20) NOT NULL AUTO_INCREMENT, + `msisdn` VARCHAR(255) NOT NULL, + `client_id` VARCHAR(100) NOT NULL, + `scope_id` INT(20) NOT NULL, + `operator_id` INT(20) NOT NULL, + `approve_status` VARCHAR(45), + `consent_date` TIMESTAMP NULL DEFAULT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`scope_id`) REFERENCES `scope_parameter`(`param_id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; DROP TABLE IF EXISTS `prompt_configuration`; @@ -368,6 +424,7 @@ DROP TABLE IF EXISTS `scope_log`; CREATE TABLE `scope_log` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `access_token` VARCHAR(125) DEFAULT NULL, + `scope` VARCHAR(255) DEFAULT NULL, `created_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `sub` VARCHAR(200) DEFAULT NULL, PRIMARY KEY (`id`), diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index d01fbdd..f264961 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -178,6 +178,7 @@ authproxy.war sessionupdater.war saaserver.war + selfserviceportal.war diff --git a/modules/idsconfig/LOA.xml b/modules/idsconfig/LOA.xml old mode 100755 new mode 100644 index 0d5289b..4c8fe8b --- a/modules/idsconfig/LOA.xml +++ b/modules/idsconfig/LOA.xml @@ -75,6 +75,7 @@ HeaderEnrichmentAuthenticator + ConsentAuthenticator USSDPinAuthenticator @@ -85,6 +86,7 @@ MSISDNAuthenticator + ConsentAuthenticator USSDPinAuthenticator @@ -96,6 +98,7 @@ 21 HeaderEnrichmentAuthenticator + ConsentAuthenticator @@ -107,8 +110,9 @@ MSISDNAuthenticator SmartPhoneAppAuthenticator + ConsentAuthenticator USSDAuthenticator - + diff --git a/modules/idsconfig/claim-config.xml b/modules/idsconfig/claim-config.xml index 357929a..3f38355 100755 --- a/modules/idsconfig/claim-config.xml +++ b/modules/idsconfig/claim-config.xml @@ -25,6 +25,27 @@ LOA + + http://wso2.org/claims/operator + Operator + operator + Operator + + + + http://wso2.org/claims/status + Status + status + Status + + + + http://wso2.org/claims/regMode + Registration Mode + regMode + RegMode + + http://wso2.org/claims/challengeQuestion1 Challenge Question1 diff --git a/modules/idsconfig/identity.xml b/modules/idsconfig/identity.xml index f267126..f21a939 100755 --- a/modules/idsconfig/identity.xml +++ b/modules/idsconfig/identity.xml @@ -164,7 +164,10 @@ org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor - + + false @@ -189,9 +192,13 @@ - + + + authorization_code + com.wso2telco.openidtokenbuilder.CustomAuthorizationCodeGrantHandler password diff --git a/modules/idsconfig/mobile-connect.out.xml b/modules/idsconfig/mobile-connect.out.xml new file mode 100644 index 0000000..e69de29 diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml index 9f80708..5b6db56 100755 --- a/modules/idsconfig/mobile-connect.xml +++ b/modules/idsconfig/mobile-connect.xml @@ -22,23 +22,34 @@ false - http://localhost:9763/ussdstub/v1/outbound + http://localhost:9763/ussdstub/v1/outbound + 4442137174b27a9837e745c711f4e31 http://localhost:9763/authenticationendpoint/sms - To login to ${application}, follow this link Do not share as it is unique to you. ${link} - To registration to ${application}, follow this link Do not share as it is unique to you. ${link} + To login to ${application}, follow this link Do not share as it is unique to you. + ${link} + + To registration to ${application}, follow this link Do not share as it is unique to + you. ${link} + - op1 To login to ${application}, follow this link Do not share as it is unique to you. ${link} - op1 To register to ${application}, follow this link Do not share as it is unique to you. ${link} + op1 To login to ${application}, follow this link Do not share as it is unique to + you. ${link} + + op1 To register to ${application}, follow this link Do not share as it is + unique to you. ${link} + - op1 To login to ${application}, follow this link Do not share as it is unique to you. ${link} + op1 To login to ${application}, follow this link Do not share as it is unique to + you. ${link} + @@ -54,13 +65,16 @@ 30 true - Welcome to Mobile Connect - a simple and safer way to login which is always free. Please visit - http://mobileconnect.in to know more. + Welcome to Mobile Connect - a simple and safer way to login which is always free. Please + visit + http://mobileconnect.in to know more. + spark - Spark welcomes you on Mobile Connect - a simple and safer way to login which is always free. Please visit + Spark welcomes you on Mobile Connect - a simple and safer way to login which is always free. + Please visit http://mobileconnect.in to know more. true @@ -75,54 +89,74 @@ http://localhost:9763/ussdstub/v1/outbound Authorization token to access the USSD API - Message content for USSD authentication - Message content for USSD pin authentication + Message content for USSD authentication + + Message content for USSD pin authentication + 1721 123 true Mobile connect Callback URL for USSD authentication - http://localhost:9763/sessionupdater/tnspoints/endpoint/login/ussd - http://localhost:9763/sessionupdater/tnspoints/endpoint/registration/ussd - http://localhost:9763/sessionupdater/tnspoints/endpoint/pin/login/ussd - http://localhost:9763/sessionupdater/tnspoints/endpoint/pin/registration/ussd - Login message for ussd pin ${application} 1. Yes 2. No - Registration message for ussd pin ${application} 1. Yes 2. No + http://localhost:9763/sessionupdater/tnspoints/endpoint/login/ussd + + http://localhost:9763/sessionupdater/tnspoints/endpoint/registration/ussd + + http://localhost:9763/sessionupdater/tnspoints/endpoint/pin/login/ussd + + http://localhost:9763/sessionupdater/tnspoints/endpoint/pin/registration/ussd + + Login message for ussd pin ${application} 1. Yes 2. No + + Registration message for ussd pin ${application} 1. Yes 2. No + - op1 Registration message for ussd pin ${application} 1. Yes 2. No + op1 Registration message for ussd pin ${application} 1. Yes 2. No + op1 Login message for ussd pin ${application} 1. Yes 2. No - op2 Registration message for ussd pin ${application} 1. Yes 2. No + op2 Registration message for ussd pin ${application} 1. Yes 2. No + op2 Login message for ussd pin ${application} 1. Yes 2. No Re-enter your PIN - Invalid format. Please re-enter your pin - Pin mismatch. Please re-enter your pin - Registration Success - Access Denied. You have exceeded maximum number of retry attempts - Access Denied. You have exceeded maximum number of confirmation attempts + Invalid format. Please re-enter your pin + + Pin mismatch. Please re-enter your pin + + Registration Success + + Access Denied. You have exceeded maximum number of retry attempts + + Access Denied. You have exceeded maximum number of confirmation attempts + Callback URL for USSD pin authentication - Message content for USSD registration ${application} 1. Yes 2. No + Message content for USSD registration ${application} 1. Yes 2. No + 4 3 3 - Message content for USSD login ${application} 1. Yes 2. No - 1,yes,ok,y + Message content for USSD login ${application} 1. Yes 2. No + + 1,yes,ok,y + 2,no,n - op1 Message content for USSD registration ${application} 1. Yes 2. No + op1 Message content for USSD registration ${application} 1. Yes 2. No + op1 Message content for USSD login ${application} 1. Yes 2. No - op2 Message content for USSD registration ${application} 1. Yes 2. No + op2 Message content for USSD registration ${application} 1. Yes 2. No + op2 Message content for USSD login ${application} 1. Yes 2. No @@ -134,9 +168,13 @@ - http://localhost:9763/saaserver/services/serverAPI/api/v1/clients/{msisdn}/authenticate - http://localhost:9763/saaserver/services/serverAPI/api/v1/clients/{msisdn}/is_registered - http://localhost:9763/saaserver/services/pushServiceAPI/client/{msisdn}/send + + http://localhost:9763/saaserver/services/serverAPI/api/v1/clients/{msisdn}/authenticate + + http://localhost:9763/saaserver/services/serverAPI/api/v1/clients/{msisdn}/is_registered + + http://localhost:9763/saaserver/services/pushServiceAPI/client/{msisdn}/send + https://localhost:9443/acrengine/ @@ -190,7 +228,7 @@ FROM IP:TO IP XX.XX.XX.XX:XX.XX.XX.XX XX.XX.XX.XX:XX.XX.XX.XX - XX.XX.XX.XX:XX.XX.XX.XX + XX.XX.XX.XX:XX.XX.XX.XX @@ -204,10 +242,110 @@ - true + false admin admin tcp://localhost:7612 ssl://localhost:7712 + + true + + J2lAGcsgEILuhiSyPwsljG4OoxzyIiaX + EBmKGJmSsOsniAXY + + https://integration.mobileconnect.io/rv/v1/exchange/organizations/dialog_srilanka/validate + + + + https://india.discover.mobileconnect.io/gsma/v2/discovery/ + http://jenkins.wso2telco.com:9763/playground2/oauth2.jsp + 919958713388 + + + + + 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 + + + + admin + admin + + + + + operator1 + operator1 + + + operator2 + operator2 + + + spark + spark + + + + + + + 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} + + + msisdn + + + + discovery + https://url + oauthCode + + + 100 + + + 100 + diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 009365c..cf76996 100755 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -9,7 +9,7 @@ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ distributed under the License is distributead on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. @@ -134,6 +134,9 @@ com.wso2telco.ids:com.wso2telco.ids.openidtokenbuilder.feature:${com.wso2telco.ids.version} + + com.wso2telco.ids:com.wso2telco.ids.spseamlessprovision.feature:${com.wso2telco.ids.version} + com.wso2telco.ids:com.wso2telco.ids.authproxyservice.feature:${com.wso2telco.ids.version} @@ -143,6 +146,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.urlshorten.feature:${com.wso2telco.ids.version} @@ -152,6 +158,12 @@ com.wso2telco.ids:com.wso2telco.ids.datapublisher.feature:${com.wso2telco.ids.version} + + com.wso2telco.core:com.wso2telco.core.spprovisionservice.feature:${com.wso2telco.core.version} + + + com.wso2telco.core:com.wso2telco.core.spprovisionservice.feature:${com.wso2telco.core.version} + @@ -455,6 +467,7 @@ org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version} + @@ -883,6 +896,10 @@ com.wso2telco.core.mncresolver.feature.group ${com.wso2telco.core.version} + + com.wso2telco.core.spprovisionservice.feature.group + ${com.wso2telco.core.version} + com.wso2telco.ids.sign.ui.feature.group ${com.wso2telco.ids.version} @@ -922,6 +939,11 @@ com.wso2telco.ids.openidtokenbuilder.feature.group ${com.wso2telco.ids.version} + + + com.wso2telco.ids.spseamlessprovision.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.authproxyservice.feature.group @@ -933,6 +955,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} @@ -1023,6 +1050,10 @@ com.wso2telco.core.mncresolver.feature.group ${com.wso2telco.core.version} + + com.wso2telco.core.spprovisionservice.feature.group + ${com.wso2telco.core.version} + com.wso2telco.ids.sign.ui.feature.group ${com.wso2telco.ids.version} @@ -1063,6 +1094,11 @@ ${com.wso2telco.ids.version} + + com.wso2telco.ids.spseamlessprovision.feature.group + ${com.wso2telco.ids.version} + + com.wso2telco.ids.authproxyservice.feature.group ${com.wso2telco.ids.version} @@ -1073,6 +1109,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} @@ -1499,6 +1540,10 @@ com.wso2telco.core.mncresolver.feature.group ${com.wso2telco.core.version} + + com.wso2telco.core.spprovisionservice.feature.group + ${com.wso2telco.core.version} + com.wso2telco.ids.sign.ui.feature.group ${com.wso2telco.ids.version} @@ -1538,6 +1583,11 @@ com.wso2telco.ids.openidtokenbuilder.feature.group ${com.wso2telco.ids.version} + + + com.wso2telco.ids.spseamlessprovision.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.authproxyservice.feature.group @@ -1549,6 +1599,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} @@ -1958,6 +2013,10 @@ com.wso2telco.core.mncresolver.feature.group ${com.wso2telco.core.version} + + com.wso2telco.core.spprovisionservice.feature.group + ${com.wso2telco.core.version} + com.wso2telco.ids.sign.ui.feature.group ${com.wso2telco.ids.version} @@ -1997,6 +2056,11 @@ com.wso2telco.ids.openidtokenbuilder.feature.group ${com.wso2telco.ids.version} + + + com.wso2telco.ids.spseamlessprovision.feature.group + ${com.wso2telco.ids.version} + com.wso2telco.ids.authproxyservice.feature.group @@ -2008,6 +2072,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 f85455e..6617628 100755 --- a/pom.xml +++ b/pom.xml @@ -1130,6 +1130,11 @@ com.wso2telco.core.spconfig.feature ${com.wso2telco.core.version} + + com.wso2telco.core + com.wso2telco.core.spprovisionservice.feature + ${com.wso2telco.core.version} + com.wso2telco.core com.wso2telco.core.mncresolver.feature @@ -1170,6 +1175,11 @@ com.wso2telco.ids.datapublisher.feature ${com.wso2telco.ids.version} + + com.wso2telco.ids + com.wso2telco.ids.spseamlessprovision.feature + ${com.wso2telco.ids.version} + com.wso2telco.ids com.wso2telco.ids.openidtokenbuilder.feature @@ -1205,6 +1215,11 @@ com.wso2telco.ids.saaserver.feature ${com.wso2telco.ids.version} + + com.wso2telco.ids + com.wso2telco.ids.selfserviceportal.feature + ${com.wso2telco.ids.version} + @@ -1362,8 +1377,8 @@ - 2.1.0 - 2.0.21 + 2.2.0-SNAPSHOT + 2.0.23-SNAPSHOT 5.2.2