Skip to content

IDSDEV-678- Add new publishing points for token failures #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tharsigam wants to merge 28 commits into
base: mig-release-2.2.0-integration
Choose a base branch
from
Open

IDSDEV-678- Add new publishing points for token failures #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c198234
change for UserConsent IDSDEV-489
May 5, 2017
c906795
db script and loa.xml updated
May 28, 2017
49bd67c
DB script updated with consent deny table
May 29, 2017
eb4d169
DB Script updated to merge consent deny table for JIRA IDSDEV-489
May 31, 2017
aa8b6a6
DB script updated with consent deny table
May 29, 2017
eb1b0b2
DB Script updated to merge consent deny table for JIRA IDSDEV-489
May 31, 2017
90def02
DB script updated to modify consent Table Structure
Jun 7, 2017
8faaff6
LOA 3 fix
Jun 14, 2017
0aac73d
Added self service configs
madushak Apr 20, 2017
1f2d75b
Added correct core util version - IDSDEV-379
madushak Apr 28, 2017
be3c522
Added correct core util version - IDSDEV-379
madushak Apr 28, 2017
e89d7f0
Added new mobile connect configs and bundle self service portal on pa…
madushak May 24, 2017
160a398
Added new mobile connect configs and bundle self service portal on pa…
madushak May 24, 2017
a0b7c9b
Added new mobile connect configs and bundle self service portal on pa…
madushak May 24, 2017
311993b
Added new mobile connect config for msisdn claim - IDSDEV-379
madushak May 24, 2017
840dcd5
Merge branch 'mig-release-2.2.0-m3' into mig-release-2.2.0-integration
udithadissanayake Jul 6, 2017
bab1d84
scope_log Table change
Jul 24, 2017
44330f7
IDSDEV-606 Add new property to mobile connect XML
nilan84 Jun 29, 2017
52920ca
IDSDEV-606 Add new property to mobile connect XML
nilan84 Jul 3, 2017
fb9456c
release version change
nilan84 Jul 3, 2017
68bc3f7
Fixing building issue
wasanthawso2 Jul 14, 2017
17ab20b
IDSDEV-647
nilan84 Jul 24, 2017
06e7319
IDSDEV-365 Mobile Connect Request Validator Capability in IDGW Relate…
udithadissanayake Apr 18, 2017
6705fab
IDSDEV-365 Discovery Call modifications
udithadissanayake Jun 7, 2017
7d7499e
Adding minor changes to resolve merge issues
udithadissanayake Jul 26, 2017
ce82ebb
IDSDEV-658
nilan84 Jul 28, 2017
3a5da65
IDSDEV-658
nilan84 Jul 28, 2017
5d5fc36
IDSDEV-678-Add New Publishing Points for Token Failure
tharsigam Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions modules/dbscripts/mig_connectdb.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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`;

Expand Down Expand Up @@ -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`),
Expand Down
1 change: 1 addition & 0 deletions modules/distribution/src/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
<include>authproxy.war</include>
<include>sessionupdater.war</include>
<include>saaserver.war</include>
<include>selfserviceportal.war</include>
</includes>
</fileSet>

Expand Down
6 changes: 5 additions & 1 deletion modules/idsconfig/LOA.xml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<Authenticators>
<!--<Authenicator onfail="fallback">HeaderEnrichmentAuthenticator</Authenicator>-->
<Authenicator onfail="fallback" supportiveFlow="onnet">HeaderEnrichmentAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="onnet">ConsentAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="onnet">USSDPinAuthenticator</Authenicator>
<!-- If onFail attribute values is 'break', and that authenticator fails,whole LOA should fail -->
</Authenticators>
Expand All @@ -85,6 +86,7 @@
<Authentication>
<Authenticators>
<Authenicator onfail="break" supportiveFlow="any">MSISDNAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="any">ConsentAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="any">USSDPinAuthenticator</Authenicator>
<!-- If onFail attribute values is 'break', and that authenticator fails,whole LOA should fail -->
</Authenticators>
Expand All @@ -96,6 +98,7 @@
<LevelToFallback>21</LevelToFallback>
<Authenticators>
<Authenicator onfail="fallback" supportiveFlow="onnet">HeaderEnrichmentAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="onnet">ConsentAuthenticator</Authenicator>
<!-- If onFail attribute values is 'break', and that authenticator fails,whole LOA should fail -->
</Authenticators>
</Authentication>
Expand All @@ -107,8 +110,9 @@
<Authenticators>
<Authenicator onfail="break" supportiveFlow="any">MSISDNAuthenticator</Authenicator>
<Authenicator onfail="continue" supportiveFlow="any">SmartPhoneAppAuthenticator</Authenicator>
<Authenicator onfail="break" supportiveFlow="any">ConsentAuthenticator</Authenicator>
<Authenicator onfail="fallback" supportiveFlow="any">USSDAuthenticator</Authenicator>
<!-- If onFail attribute values is 'break', and that authenticator fails,whole LOA should fail -->
<!-- If onFail attribute values is 'break', and that authenticator fails,whole LOA should fail -->
</Authenticators>
</Authentication>
</AuthenticationLevel>
Expand Down
21 changes: 21 additions & 0 deletions modules/idsconfig/claim-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,27 @@
<Description>LOA</Description>
<SupportedByDefault />
</Claim>
<Claim>
<ClaimURI>http://wso2.org/claims/operator</ClaimURI>
<DisplayName>Operator</DisplayName>
<AttributeID>operator</AttributeID>
<Description>Operator</Description>
<SupportedByDefault />
</Claim>
<Claim>
<ClaimURI>http://wso2.org/claims/status</ClaimURI>
<DisplayName>Status</DisplayName>
<AttributeID>status</AttributeID>
<Description>Status</Description>
<SupportedByDefault />
</Claim>
<Claim>
<ClaimURI>http://wso2.org/claims/regMode</ClaimURI>
<DisplayName>Registration Mode</DisplayName>
<AttributeID>regMode</AttributeID>
<Description>RegMode</Description>
<SupportedByDefault />
</Claim>
<Claim>
<ClaimURI>http://wso2.org/claims/challengeQuestion1</ClaimURI>
<DisplayName>Challenge Question1</DisplayName>
Expand Down
11 changes: 9 additions & 2 deletions modules/idsconfig/identity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,10 @@
<TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
<!-- Supported Client Authentication Methods -->
<ClientAuthHandlers>
<ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
<!-- <ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
<Property Name="StrictClientCredentialValidation">false</Property>
</ClientAuthHandler> -->
<ClientAuthHandler Class="com.wso2telco.carbon.identity.oauth2.token.handlers.clientauth.SeamlessProvisionClientAuthHandler">
<Property Name="StrictClientCredentialValidation">false</Property>
</ClientAuthHandler>
</ClientAuthHandlers>
Expand All @@ -189,9 +192,13 @@
</SupportedResponseTypes>
<!-- Supported Grant Types -->
<SupportedGrantTypes>
<SupportedGrantType>
<!-- <SupportedGrantType>
<GrantTypeName>authorization_code</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType> -->
<SupportedGrantType>
<GrantTypeName>authorization_code</GrantTypeName>
<GrantTypeHandlerImplClass>com.wso2telco.openidtokenbuilder.CustomAuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType>
<SupportedGrantType>
<GrantTypeName>password</GrantTypeName>
Expand Down
Empty file added modules/idsconfig/mobile-connect.out.xml
View file
Open in desktop
Empty file.
Loading