Skip to content
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

Jump to bottom

mobile-connect.xml changes for service provision API #157

Open
wants to merge 12 commits into
base: sp-provision-api-feature
Choose a base branch
from
Open

mobile-connect.xml changes for service provision API #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
938ae13
[IDSDEV-945] Fixed conflict issues
madushak Apr 20, 2017
132d292
Added new mobile connect configs and bundle self service portal on pa…
madushak May 24, 2017
0a7eacd
[IDSDEV-971] rebase the master with mig-release-2.2.0-m3 to add Self …
madushak May 24, 2017
2b509ff
mobile-connect.xml changes for service provision API
gayanch Jul 9, 2018
51e4621
copy service provider provision resources into distribution
gayanch Jul 10, 2018
3141ecc
[IDSDEV-916] Add new configurations for SpProvisioning API
Lakini Jun 28, 2018
5a93cc3
mobile-connect.xml changes for service provision API
gayanch Jul 9, 2018
ece68fd
copy service provider provision resources into distribution
gayanch Jul 10, 2018
0ef0944
rebase with Lakini/selfServicePortal
gayanch Jul 11, 2018
ef39e59
Self service portal configuration changes
gayanch Jul 11, 2018
7f2db0b
mobilr-connect config changes
gayanch Jul 12, 2018
e14e070
changed spprovision config to handle multiple operators
gayanch Jul 26, 2018
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
2 changes: 2 additions & 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 @@ -182,6 +182,8 @@
<include>introspect.war</include>
<include>premiuminfo.war</include>
<include>samplerequest.war</include>
<include>selfserviceportal.war</include>
<include>spprovisionservice.war</include>
</includes>
</fileSet>

Expand Down
32 changes: 16 additions & 16 deletions modules/idsconfig/mobile-connect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<IsSpValidationDisabled>true</IsSpValidationDisabled>
<GSMAExchangeConfig>
<SOHost>integration-axiatagroup.apiexchange.org</SOHost>
<Organization>axiaD:\1.6-RC2\log\mobile-connect.xmltagroup</Organization>
<Organization>axiatagroup</Organization>
<AuthToken>d0f865b4453be954b03b8b67556a395</AuthToken>
<ServingOperator>
<mcc>413</mcc>
Expand Down Expand Up @@ -249,7 +249,7 @@
<ClassName>com.wso2telco.claims.RemoteClaimsTelco</ClassName>
</OperatorData>
</OperatorsList>

<SeamlessProvisioningEnabled>true</SeamlessProvisioningEnabled>
<DiscoveryConfigs>
<Auth_clientId>J2lAGcsgEILuhiSyPwsljG4OoxzyIiaX</Auth_clientId>
<Auth_clientSecret>EBmKGJmSsOsniAXY</Auth_clientSecret>
Expand Down Expand Up @@ -289,13 +289,13 @@
</OperatorDiscoveryNamesMapping>

<SelfServicePortal>
<SPOAuthClientKey></SPOAuthClientKey>
<SPOAuthClientSecret></SPOAuthClientSecret>
<UILoginUrl>https://localhost:9443/selfserviceportal/#/login</UILoginUrl>
<TokenEndpoint>https://localhost:9443/oauth2/token</TokenEndpoint>
<CallbackUrl>https://localhost:9443/selfserviceportal/api/v1/auth/callback</CallbackUrl>
<UserInfoCall>https://localhost:9443/oauth2/userinfo?schema=openid</UserInfoCall>
<AuthorizeCall>https://localhost:9443/authproxy/oauth2/authorize/operator/${operator}</AuthorizeCall>
<SPOAuthClientKey>8iwbH6Gtc_1LluEHxZxZw7k5Qh4a</SPOAuthClientKey>
<SPOAuthClientSecret>HDagnd6nncGHmTgEbjfON0WCLzEa</SPOAuthClientSecret>
<UILoginUrl>https://localhost:9444/selfserviceportal/#/login</UILoginUrl>
<TokenEndpoint>https://localhost:9444/oauth2/token</TokenEndpoint>
<CallbackUrl>https://localhost:9444/selfserviceportal/api/v1/auth/callback</CallbackUrl>
<UserInfoCall>https://localhost:9444/oauth2/userinfo?schema=openid</UserInfoCall>
<AuthorizeCall>https://localhost:9444/authproxy/oauth2/authorize/operator/${operator}</AuthorizeCall>
<DiscoveryAPICall></DiscoveryAPICall>
<DiscoveryAPIToken></DiscoveryAPIToken>
<MsisdnClaim>msisdn</MsisdnClaim> <!-- MSISDN claim on user info call -->
Expand Down Expand Up @@ -325,34 +325,34 @@
<ApiManagerUrl>https://localhost:9443</ApiManagerUrl>
<MigUserName>admin</MigUserName>
<MigUserPassword>admin</MigUserPassword>
<AuthUrl>https://localhost:9444/authorize/v1/spark/oauth2/authorize</AuthUrl>
<TokenUrl>https://localhost:9444/token/v1/spark/oauth2/token</TokenUrl>
<AmTokenUrl>https://localhost:9444/token</AmTokenUrl>
<AuthUrl>https://localhost:9444/authorize/v1/${operator}/oauth2/authorize</AuthUrl>
<TokenUrl>https://localhost:9444/oauth2/token</TokenUrl>
<AmTokenUrl>https://localhost:9443/token</AmTokenUrl>
<UserInfoUrl>https://localhost:9444/oauth2/userinfo</UserInfoUrl>
<ApiConfigs>
<Api>
<ApiName>Authorize</ApiName>
<ApiVersion>v1</ApiVersion>
<ApiProvider>admin</ApiProvider>
<ApiTier>Gold</ApiTier>
<ApiTier>Unlimited</ApiTier>
</Api>
<Api>
<ApiName>authorizemnv</ApiName>
<ApiVersion>v1</ApiVersion>
<ApiProvider>admin</ApiProvider>
<ApiTier>Gold</ApiTier>
<ApiTier>Unlimited</ApiTier>
</Api>
<Api>
<ApiName>token</ApiName>
<ApiVersion>v1</ApiVersion>
<ApiProvider>admin</ApiProvider>
<ApiTier>Gold</ApiTier>
<ApiTier>Unlimited</ApiTier>
</Api>
<Api>
<ApiName>tokenmnv</ApiName>
<ApiVersion>v1</ApiVersion>
<ApiProvider>admin</ApiProvider>
<ApiTier>Gold</ApiTier>
<ApiTier>Unlimited</ApiTier>
</Api>
</ApiConfigs>
<OauthVersion>OAuth-2.0</OauthVersion>
Expand Down
6 changes: 6 additions & 0 deletions modules/idsconfig/scope-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,5 +641,11 @@
<ClaimValue>email</ClaimValue>
</Claims>
</Scope>
<Scope>
<Name>openid</Name>
<Claims>
<ClaimValue>msisdn</ClaimValue>
</Claims>
</Scope>
</UserInfoScopes>
</ScopeConfigs>
45 changes: 44 additions & 1 deletion modules/p2-profile-gen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,15 @@
<featureArtifactDef>
com.wso2telco.ids:com.wso2telco.ids.saaserver.feature:${com.wso2telco.ids.version}
</featureArtifactDef>
<featureArtifactDef>
com.wso2telco.ids:com.wso2telco.ids.selfserviceportal.feature:${com.wso2telco.ids.version}
</featureArtifactDef>
<featureArtifactDef>
com.wso2telco.ids:com.wso2telco.ids.samplerequest.feature:${com.wso2telco.ids.version}
</featureArtifactDef>
<featureArtifactDef>
com.wso2telco.ids:com.wso2telco.ids.spprovisionservice.feature:${com.wso2telco.ids.version}
</featureArtifactDef>
<featureArtifactDef>
com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version}
</featureArtifactDef>
Expand Down Expand Up @@ -944,6 +950,16 @@
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.selfserviceportal.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.spprovisionservice.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
Expand Down Expand Up @@ -1087,12 +1103,21 @@
<id>com.wso2telco.ids.saaserver.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.samplerequest.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.selfserviceportal.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.spprovisionservice.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
Expand Down Expand Up @@ -1577,6 +1602,15 @@
<id>com.wso2telco.ids.samplerequest.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>
<feature>
<id>com.wso2telco.ids.spprovisionservice.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.selfserviceportal.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
Expand Down Expand Up @@ -2044,6 +2078,15 @@
<id>com.wso2telco.ids.samplerequest.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>
<feature>
<id>com.wso2telco.ids.spprovisionservice.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.selfserviceportal.feature.group</id>
<version>${com.wso2telco.ids.version}</version>
</feature>

<feature>
<id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
Expand Down
12 changes: 11 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,11 +1211,21 @@
<artifactId>com.wso2telco.ids.samplerequest.feature</artifactId>
<version>${com.wso2telco.ids.version}</version>
</dependency>
<dependency>
<groupId>com.wso2telco.ids</groupId>
<artifactId>com.wso2telco.ids.spprovisionservice.feature</artifactId>
<version>${com.wso2telco.ids.version}</version>
</dependency>
<dependency>
<groupId>com.wso2telco.ids</groupId>
<artifactId>com.wso2telco.ids.tokenintrospection</artifactId>
<version>${com.wso2telco.ids.version}</version>
</dependency>
<dependency>
<groupId>com.wso2telco.ids</groupId>
<artifactId>com.wso2telco.ids.selfserviceportal.feature</artifactId>
<version>${com.wso2telco.ids.version}</version>
</dependency>

<!--custom webapps' runtime environment dependencies -->
<dependency>
Expand Down Expand Up @@ -1373,7 +1383,7 @@
<properties>

<!-- Telco dependency's version-->
<com.wso2telco.ids.version>2.4.0-rc1</com.wso2telco.ids.version>
<com.wso2telco.ids.version>2.4.0-SNAPSHOT</com.wso2telco.ids.version>
<com.wso2telco.core.version>2.4.4-SNAPSHOT</com.wso2telco.core.version>

<!--Carbon Identity Framework Version-->
Expand Down