Adding fix for API Store/Publisher login

modules/distribution/src/repository/conf/api-manager.xml

@@ -149,9 +149,7 @@
                 <!--
 							Server URL of the API gateway.
 					-->
-                <ServerURL>
+                <ServerURL>https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}/services/</ServerURL>
-                    https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}/services/
-                </ServerURL>
                 <!--
 							Admin username for the API gateway.
 					-->
@@ -281,9 +279,7 @@
         <!--
             Server URL of the API key manager
         -->
-        <ServerURL>
+        <ServerURL>https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}/services/</ServerURL>
-            https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}/services/
-        </ServerURL>
 
         <!--
             Admin username for API key manager.

modules/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml

@@ -0,0 +1,24 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
+    <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>

modules/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>

modules/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml

@@ -0,0 +1,25 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>

modules/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml

@@ -0,0 +1,24 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
+    <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>