CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-02 10:54:44 +12:00
Code Issues Projects Releases Wiki Activity

Fix for invite join screen

Browse source
This commit is contained in:
Eldad Fux 2020-01-31 02:00:31 +02:00
parent d898e31a59
commit f1e31e474c
8 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/api/teams.php
View file

@ -420,7 +420,6 @@ $utopia->patch('/v1/teams/:teamId/memberships/:inviteId/status')
->label('sdk.namespace', 'teams')
->label('sdk.method', 'updateMembershipStatus')
->label('sdk.description', '/docs/references/teams/update-team-membership-status.md')
->label('sdk.cookies', true)
->param('teamId', '', function () { return new UID(); }, 'Team unique ID.')
->param('inviteId', '', function () { return new UID(); }, 'Invite unique ID')
->param('userId', '', function () { return new UID(); }, 'User unique ID')

2
app/sdks/javascript/docs/examples/projects/delete.md
View file

@ -5,7 +5,7 @@ sdk
.setKey('')
;
let promise = sdk.projects.delete('[PROJECT_ID]');
let promise = sdk.projects.delete('[PROJECT_ID]', '[PASSWORD]');
promise.then(function (response) {
console.log(response);

20
app/sdks/javascript/src/sdk.js
View file

@ -1988,18 +1988,27 @@
*
*
* @param {string} projectId
* @param {string} password
* @throws {Error}
* @return {Promise}
*/
delete: function(projectId) {
delete: function(projectId, password) {
if(projectId === undefined) {
throw new Error('Missing required parameter: "projectId"');
}
if(password === undefined) {
throw new Error('Missing required parameter: "password"');
}
let path = '/projects/{projectId}'.replace(new RegExp('{projectId}', 'g'), projectId);
let payload = {};
if(password) {
payload['password'] = password;
}
return http
.delete(path, {
'content-type': 'application/json',
@ -3519,7 +3528,7 @@
* @param {string} userId
* @param {string} secret
* @throws {Error}
* @return {null}
* @return {Promise}
*/
updateMembershipStatus: function(teamId, inviteId, userId, secret) {
if(teamId === undefined) {
@ -3550,9 +3559,10 @@
payload['secret'] = secret;
}
payload['project'] = config.project;
return iframe('patch', path, payload);
return http
.patch(path, {
'content-type': 'application/json',
}, payload);
}
};

8
app/sdks/javascript/src/sdk.min.js vendored
View file

@ -161,8 +161,10 @@ if(legalState){payload.legalState=legalState}
if(legalCity){payload.legalCity=legalCity}
if(legalAddress){payload.legalAddress=legalAddress}
if(legalTaxId){payload.legalTaxId=legalTaxId}
return http.patch(path,{'content-type':'application/json',},payload)},delete:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"')}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.delete(path,{'content-type':'application/json',},payload)},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"')}
return http.patch(path,{'content-type':'application/json',},payload)},delete:function(projectId,password){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"')}
if(password===undefined){throw new Error('Missing required parameter: "password"')}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};if(password){payload.password=password}
return http.delete(path,{'content-type':'application/json',},payload)},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"')}
let path='/projects/{projectId}/keys'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},createKey:function(projectId,name,scopes){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"')}
if(name===undefined){throw new Error('Missing required parameter: "name"')}
if(scopes===undefined){throw new Error('Missing required parameter: "scopes"')}
@ -325,7 +327,7 @@ if(userId===undefined){throw new Error('Missing required parameter: "userId"')}
if(secret===undefined){throw new Error('Missing required parameter: "secret"')}
let path='/teams/{teamId}/memberships/{inviteId}/status'.replace(new RegExp('{teamId}','g'),teamId).replace(new RegExp('{inviteId}','g'),inviteId);let payload={};if(userId){payload.userId=userId}
if(secret){payload.secret=secret}
payload.project=config.project;return iframe('patch',path,payload)}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload.search=search}
return http.patch(path,{'content-type':'application/json',},payload)}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload.search=search}
if(limit){payload.limit=limit}
if(offset){payload.offset=offset}
if(orderType){payload.orderType=orderType}

5
app/views/home/auth/join.phtml
View file

@ -3,7 +3,7 @@
data-service="teams.updateMembershipStatus"
data-scope="console"
data-event="submit"
data-param-invite-id="{{router.params.teamId}}"
data-param-team-id="{{router.params.teamId}}"
data-param-invite-id="{{router.params.inviteId}}"
data-param-user-id="{{router.params.userId}}"
data-param-secret="{{router.params.secret}}"
@ -11,7 +11,8 @@
data-success-param-redirect-url="/console?project={{router.params.project}}"
data-success-param-alert-text="Joined Team Successfully"
data-success-param-trigger-events="teams.updateMembershipStatus"
data-failure="alert"
data-failure="redirect,alert"
data-success-param-redirect-url="/console"
data-failure-param-alert-text="Failed to join team. Please try again later"
data-failure-param-alert-classname="error">

8
public/dist/scripts/app-all.js vendored
View file

@ -167,8 +167,10 @@ if(legalState){payload['legalState']=legalState;}
if(legalCity){payload['legalCity']=legalCity;}
if(legalAddress){payload['legalAddress']=legalAddress;}
if(legalTaxId){payload['legalTaxId']=legalTaxId;}
return http.patch(path,{'content-type':'application/json',},payload);},delete:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.delete(path,{'content-type':'application/json',},payload);},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
return http.patch(path,{'content-type':'application/json',},payload);},delete:function(projectId,password){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
if(password===undefined){throw new Error('Missing required parameter: "password"');}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};if(password){payload['password']=password;}
return http.delete(path,{'content-type':'application/json',},payload);},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
let path='/projects/{projectId}/keys'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},createKey:function(projectId,name,scopes){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
if(name===undefined){throw new Error('Missing required parameter: "name"');}
if(scopes===undefined){throw new Error('Missing required parameter: "scopes"');}
@ -331,7 +333,7 @@ if(userId===undefined){throw new Error('Missing required parameter: "userId"');}
if(secret===undefined){throw new Error('Missing required parameter: "secret"');}
let path='/teams/{teamId}/memberships/{inviteId}/status'.replace(new RegExp('{teamId}','g'),teamId).replace(new RegExp('{inviteId}','g'),inviteId);let payload={};if(userId){payload['userId']=userId;}
if(secret){payload['secret']=secret;}
payload['project']=config.project;return iframe('patch',path,payload);}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload['search']=search;}
return http.patch(path,{'content-type':'application/json',},payload);}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload['search']=search;}
if(limit){payload['limit']=limit;}
if(offset){payload['offset']=offset;}
if(orderType){payload['orderType']=orderType;}

8
public/dist/scripts/app-dep.js vendored
View file

@ -167,8 +167,10 @@ if(legalState){payload['legalState']=legalState;}
if(legalCity){payload['legalCity']=legalCity;}
if(legalAddress){payload['legalAddress']=legalAddress;}
if(legalTaxId){payload['legalTaxId']=legalTaxId;}
return http.patch(path,{'content-type':'application/json',},payload);},delete:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.delete(path,{'content-type':'application/json',},payload);},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
return http.patch(path,{'content-type':'application/json',},payload);},delete:function(projectId,password){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
if(password===undefined){throw new Error('Missing required parameter: "password"');}
let path='/projects/{projectId}'.replace(new RegExp('{projectId}','g'),projectId);let payload={};if(password){payload['password']=password;}
return http.delete(path,{'content-type':'application/json',},payload);},listKeys:function(projectId){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
let path='/projects/{projectId}/keys'.replace(new RegExp('{projectId}','g'),projectId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},createKey:function(projectId,name,scopes){if(projectId===undefined){throw new Error('Missing required parameter: "projectId"');}
if(name===undefined){throw new Error('Missing required parameter: "name"');}
if(scopes===undefined){throw new Error('Missing required parameter: "scopes"');}
@ -331,7 +333,7 @@ if(userId===undefined){throw new Error('Missing required parameter: "userId"');}
if(secret===undefined){throw new Error('Missing required parameter: "secret"');}
let path='/teams/{teamId}/memberships/{inviteId}/status'.replace(new RegExp('{teamId}','g'),teamId).replace(new RegExp('{inviteId}','g'),inviteId);let payload={};if(userId){payload['userId']=userId;}
if(secret){payload['secret']=secret;}
payload['project']=config.project;return iframe('patch',path,payload);}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload['search']=search;}
return http.patch(path,{'content-type':'application/json',},payload);}};let users={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/users';let payload={};if(search){payload['search']=search;}
if(limit){payload['limit']=limit;}
if(offset){payload['offset']=offset;}
if(orderType){payload['orderType']=orderType;}

20
public/scripts/dependencies/appwrite.js
View file

@ -1988,18 +1988,27 @@
*
*
* @param {string} projectId
* @param {string} password
* @throws {Error}
* @return {Promise}
*/
delete: function(projectId) {
delete: function(projectId, password) {
if(projectId === undefined) {
throw new Error('Missing required parameter: "projectId"');
}
if(password === undefined) {
throw new Error('Missing required parameter: "password"');
}
let path = '/projects/{projectId}'.replace(new RegExp('{projectId}', 'g'), projectId);
let payload = {};
if(password) {
payload['password'] = password;
}
return http
.delete(path, {
'content-type': 'application/json',
@ -3519,7 +3528,7 @@
* @param {string} userId
* @param {string} secret
* @throws {Error}
* @return {null}
* @return {Promise}
*/
updateMembershipStatus: function(teamId, inviteId, userId, secret) {
if(teamId === undefined) {
@ -3550,9 +3559,10 @@
payload['secret'] = secret;
}
payload['project'] = config.project;
return iframe('patch', path, payload);
return http
.patch(path, {
'content-type': 'application/json',
}, payload);
}
};