removed org id from account api response #2073

Author: Maria Farooq

Diff for: restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/AccountConverter.java

@@ -67,7 +67,6 @@ public void marshal(final Object object, final HierarchicalStreamWriter writer,
         writeDateUpdated(account.getDateUpdated(), writer);
         writeAuthToken(account, writer);
         writeUri(account.getUri(), writer);
-        writeOrganizationSid(account, writer);
         writeSubResourceUris(account, writer);
         writer.endNode();
     }
@@ -85,7 +84,6 @@ public JsonElement serialize(final Account account, final Type type, final JsonS
         writeDateUpdated(account.getDateUpdated(), object);
         writeAuthToken(account, object);
         writeUri(account, object);
-        writeOrganizationSid(account, object);
         writeSubResourceUris(account, object);
         return object;
     }
@@ -118,18 +116,6 @@ private void writeAuthToken(final Account account, final JsonObject object) {
         object.addProperty("auth_token", account.getAuthToken());
     }
 
-    private void writeOrganizationSid(final Account account, final HierarchicalStreamWriter writer) {
-        writer.startNode("OrganizationSid");
-        String organizationSid = account.getOrganizationSid() == null ? "" : account.getOrganizationSid().toString();
-        writer.setValue(organizationSid);
-        writer.endNode();
-    }
-
-    private void writeOrganizationSid(final Account account, final JsonObject object) {
-        String organizationSid = account.getOrganizationSid() == null ? "" : account.getOrganizationSid().toString();
-        object.addProperty("organization_sid", organizationSid);
-    }
-
     private void writeAvailablePhoneNumbers(final Account account, final HierarchicalStreamWriter writer) {
         writer.startNode("AvailablePhoneNumbers");
         writer.setValue(prefix(account) + "/AvailablePhoneNumbers");

Diff for: restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointTest.java

@@ -100,8 +100,6 @@ public class AccountsEndpointTest extends EndpointTest {
     SipPhone thinhPhone;
     //String thinhContact = "sip:[email protected]:5090";
 
-	private final Object DEFAULT_ORG_SID = "ORafbe225ad37541eba518a74248f0ac4c";
-
     @BeforeClass
     public static void beforeClass() {
         tool1 = new SipStackTool("AccountsEndpointTest");
@@ -161,9 +159,7 @@ public void testCreateAccount() {
                 adminUsername, adminAuthToken, createdUsernanme, createdPassword);
         JsonObject getAccountResponse = RestcommAccountsTool.getInstance().getAccount(deploymentUrl.toString(), adminUsername,
                 adminAuthToken, createdUsernanme);
-        assertTrue(getAccountResponse.get("sid").getAsString().equals(createdAccountSid));
-        // account should be assigned a default org
-        assertTrue(getAccountResponse.get("organization_sid").getAsString().equals(DEFAULT_ORG_SID));        
+        assertTrue(getAccountResponse.get("sid").getAsString().equals(createdAccountSid));     
         assertEquals(createdAuthToken, getAccountResponse.get("auth_token").getAsString());
         assertTrue(createAccountResponse.get("sid").getAsString().equals(createdAccountSid));
         assertEquals(createdAuthToken, createAccountResponse.get("auth_token").getAsString());