diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml index 273b5f3ea6..e9b763d60d 100644 --- a/app/views/console/settings/index.phtml +++ b/app/views/console/settings/index.phtml @@ -552,16 +552,6 @@ $smtpEnabled = $this->getParam('smtpEnabled', false); - - - diff --git a/app/views/console/users/team.phtml b/app/views/console/users/team.phtml index 38396dedb4..37e100b6f9 100644 --- a/app/views/console/users/team.phtml +++ b/app/views/console/users/team.phtml @@ -147,17 +147,6 @@ - - - diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php index acdf0b3166..b2d1af886f 100644 --- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php +++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php @@ -400,7 +400,6 @@ class ProjectsConsoleClientTest extends Scope 'x-appwrite-project' => $id, 'cookie' => 'a_session_'.$id.'=' . $session, ]), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php index a094975af5..ad57737297 100644 --- a/tests/e2e/Services/Teams/TeamsBaseClient.php +++ b/tests/e2e/Services/Teams/TeamsBaseClient.php @@ -52,7 +52,6 @@ trait TeamsBaseClient 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => $name, 'roles' => ['admin', 'editor'], @@ -85,7 +84,6 @@ trait TeamsBaseClient 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], diff --git a/tests/e2e/Services/Teams/TeamsBaseServer.php b/tests/e2e/Services/Teams/TeamsBaseServer.php index f678ff8381..3e58904c89 100644 --- a/tests/e2e/Services/Teams/TeamsBaseServer.php +++ b/tests/e2e/Services/Teams/TeamsBaseServer.php @@ -48,7 +48,6 @@ trait TeamsBaseServer 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], @@ -67,32 +66,6 @@ trait TeamsBaseServer $userUid = $response['body']['userId']; $membershipUid = $response['body']['$id']; - /** - * Test for Custom ID - */ - $membershipId = \uniqid(); - $email2 = uniqid().'friend@localhost.test'; - $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([ - 'content-type' => 'application/json', - 'x-appwrite-project' => $this->getProject()['$id'], - ], $this->getHeaders()), [ - 'membershipId' => $membershipId, - 'email' => $email2, - 'name' => 'Friend User', - 'roles' => ['admin', 'editor'], - 'url' => 'http://localhost:5000/join-us#title' - ]); - - $this->assertEquals(201, $response['headers']['status-code']); - $this->assertNotEmpty($response['body']['$id']); - $this->assertEquals($membershipId, $response['body']['$id']); - $this->assertNotEmpty($response['body']['userId']); - $this->assertNotEmpty($response['body']['teamId']); - $this->assertCount(2, $response['body']['roles']); - $this->assertIsInt($response['body']['joined']); - $this->assertGreaterThan(0, $response['body']['joined']); - $this->assertEquals(true, $response['body']['confirm']); - // $response = $this->client->call(Client::METHOD_GET, '/users/'.$userUid, array_merge([ // 'content-type' => 'application/json', // 'x-appwrite-project' => $this->getProject()['$id'], @@ -111,7 +84,6 @@ trait TeamsBaseServer 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], @@ -124,7 +96,6 @@ trait TeamsBaseServer 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => 'dasdkaskdjaskdjasjkd', 'name' => 'Friend User', 'roles' => ['admin', 'editor'], @@ -137,7 +108,6 @@ trait TeamsBaseServer 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => 'bad string', @@ -150,7 +120,6 @@ trait TeamsBaseServer 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php index 5b54fa26b0..a702dfafbf 100644 --- a/tests/e2e/Services/Webhooks/WebhooksBase.php +++ b/tests/e2e/Services/Webhooks/WebhooksBase.php @@ -493,7 +493,6 @@ trait WebhooksBase 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'], @@ -552,7 +551,6 @@ trait WebhooksBase 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'membershipId' => 'unique()', 'email' => $email, 'name' => 'Friend User', 'roles' => ['admin', 'editor'],