fixed multi tenant login issue

8 years ago · 9d64fd0d4b
parent de0d304bca
commit 9d64fd0d4b
9 changed files with 14 additions and 10 deletions
--- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/webapp/WEB-INF/web.xml
@ -20,10 +20,6 @@
        <param-name>doAuthentication</param-name>
        <param-value>true</param-value>
    </context-param>
-    <context-param>
-        <param-name>isSharedWithAllTenants</param-name>
-        <param-value>true</param-value>
-    </context-param>

    <!--publish to apim-->
    <context-param>
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/web.xml
@ -50,6 +50,10 @@
        <param-name>doAuthentication</param-name>
        <param-value>true</param-value>
    </context-param>
+	<context-param>
+		<param-name>isSharedWithAllTenants</param-name>
+		<param-value>true</param-value>
+	</context-param>
    <!--<context-param>-->
    <!--<param-name>managed-api-version</param-name>-->
    <!--<param-value>1.0.0</param-value>-->
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
@ -16,7 +16,7 @@
            "owner": "admin@carbon.super",
            "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
            "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
+            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon",
            "tokenScope": "admin",
            "callbackUrl": "%https.ip%/api/device-mgt/v1.0"
        },
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/oauth/token-handler-utils.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/oauth/token-handler-utils.js
@ -214,7 +214,7 @@ var utils = function () {

                // calling oauth provider token service endpoint
                var requestURL = deviceMgtProps["oauthProvider"]["tokenServiceURL"];
-                var requestPayload = "grant_type=urn:ietf:params:oauth:grant-type:saml2-bearer&" +
+                var requestPayload = "grant_type=urn:ietf:params:oauth:grant-type:saml2-carbon&" +
                    "assertion=" + encodeURIComponent(encodedAssertion) + "&scope=" + scopes;

                var xhr = new XMLHttpRequest();
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/web.xml
@ -56,6 +56,10 @@
        <param-name>doAuthentication</param-name>
        <param-value>true</param-value>
    </context-param>
+	<context-param>
+		<param-name>isSharedWithAllTenants</param-name>
+		<param-value>true</param-value>
+	</context-param>
    <context-param>
        <param-name>nonSecuredEndPoints</param-name>
        <param-value>/api/device-mgt/windows/v1.0/discovery/get,/api/device-mgt/windows/v1.0/discovery/post,
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
@ -16,7 +16,7 @@
            "owner": "admin@carbon.super",
            "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
            "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
+            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon",
            "tokenScope": "admin",
            "callbackUrl": "%https.ip%/api/device-mgt/v1.0"
        },
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handler-utils.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handler-utils.js
@ -214,7 +214,7 @@ var utils = function () {

                // calling oauth provider token service endpoint
                var requestURL = deviceMgtProps["oauthProvider"]["tokenServiceURL"];
-                var requestPayload = "grant_type=urn:ietf:params:oauth:grant-type:saml2-bearer&" +
+                var requestPayload = "grant_type=urn:ietf:params:oauth:grant-type:saml2-carbon&" +
                    "assertion=" + encodeURIComponent(encodedAssertion) + "&scope=" + scopes;

                var xhr = new XMLHttpRequest();
--- a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/devicetypes/android_sense.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/devicetypes/android_sense.xml
@ -49,7 +49,7 @@
    </Features>

    <ProvisioningConfig>
-        <SharedWithAllTenants>false</SharedWithAllTenants>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
    </ProvisioningConfig>

    <PushNotificationProvider type="MQTT">
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@ -49,7 +49,7 @@
    </License>

    <ProvisioningConfig>
-        <SharedWithAllTenants>false</SharedWithAllTenants>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
    </ProvisioningConfig>

    <DataSource>