CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-02 19:04:49 +12:00
Code Issues Projects Releases Wiki Activity

drop membership custom id

Browse source
This commit is contained in:
Damodar Lohani 2021-08-06 15:16:29 +05:45
parent 338fcf2a63
commit fc92b3f294
6 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/console/settings/index.phtml
View file

@ -552,16 +552,6 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
<input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
<input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}/auth/join?project={{router.params.project}}" />
<label for="membership">Membership ID</label>
<input
type="hidden"
data-custom-id
data-id-type="auto"
data-validator="teams.getMembership"
required
maxlength="36"
name="membershipId" />
<label for="email">Email</label>
<input name="email" id="email" type="email" autocomplete="email" required>

11
app/views/console/users/team.phtml
View file

@ -147,17 +147,6 @@
<input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{team.$id}}">
<input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}" />
<label for="membershipId">Membership ID</label>
<input
type="hidden"
data-custom-id
data-id-type="auto"
data-validator="teams.getMembership"
required
maxlength="36"
name="membershipId"
id="membershipId" />
<label for="email">Email</label>
<input name="email" id="email" type="email" autocomplete="email" required>

1
tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
View file

@ -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'],

2
tests/e2e/Services/Teams/TeamsBaseClient.php
View file

@ -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'],

31
tests/e2e/Services/Teams/TeamsBaseServer.php
View file

@ -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'],

2
tests/e2e/Services/Webhooks/WebhooksBase.php
View file

@ -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'],