Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
770 Commits 1 Branch 0 Tags 507 MiB
4eab663c8e
Commit Graph

770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trisha Anand
4eab663c8e Bug fix for forgot password error "user not found". During reset password, the user is not logged in and hence the permissions can not be applied during repository findByEmail 2020-06-12 13:57:57 +05:30
Trisha Anand
da8185f650 Merge branch 'bug/acl-invite-email-link-missing' into 'feature/acl-spring-object' 
In case of sending email for an existing user, fixed the URL.

See merge request theappsmith/internal-tools-server!380
 2020-06-12 08:06:51 +00:00
Trisha Anand
3dafccba2e In case of sending email for an existing user, fixed the URL. 2020-06-12 13:30:53 +05:30
Shrikant Kandula
c1a5f768c6 Merge branch 'bug/applications-not-invited-to' into 'feature/acl-spring-object' 
Fix problem where not all apps were getting policies when invited.

See merge request theappsmith/internal-tools-server!379
 2020-06-11 15:32:26 +00:00
Shrikant Kandula
ab83bc0223 Fix problem where not all apps were getting policies when invited. 2020-06-11 20:56:52 +05:30
Trisha Anand
dde850e367 Merge branch 'bug/acl-update-layout' into 'feature/acl-spring-object' 
Fixed the repository function which was failing for fetching actions during updateLayout.

See merge request theappsmith/internal-tools-server!378
 2020-06-11 07:22:16 +00:00
Trisha Anand
e7e008dcd2 Fixed the repository function which was failing for fetching actions during updateLayout. 2020-06-11 07:22:16 +00:00
Trisha Anand
e3b6129d77 Merge branch 'bug/acl-app-viewer-org' into 'feature/acl-spring-object' 
App viewer user in an organization should have read:organizations permission.

See merge request theappsmith/internal-tools-server!376
 2020-06-10 10:34:26 +00:00
Trisha Anand
7a658ce5ea App viewer user in an organization should have read:organizations permission. 2020-06-10 15:55:29 +05:30
Trisha Anand
84b74813a5 Merge branch 'bug/acl-create-query' into 'feature/acl-spring-object' 
In case of global datasource, no need to check for organizationId during action create.

See merge request theappsmith/internal-tools-server!375
 2020-06-10 09:08:01 +00:00
Trisha Anand
491afc3599 In case of global datasource, no need to check for organizationId during action create. 2020-06-10 09:08:01 +00:00
Trisha Anand
ee1889da14 Merge branch 'bug/acl-app-datasource-permissions' into 'feature/acl-spring-object' 
Fixes bugs : 1. read:datasource permission should not be applied to application; 2. A user shouldn't be added to an organization if the user already exists in the organization. 3. Save action was failing .

See merge request theappsmith/internal-tools-server!374
 2020-06-10 06:22:16 +00:00
Trisha Anand
a89355a5ec Fixes bugs : 1. read:datasource permission should not be applied to application; 2. A user shouldn't be added to an organization if the user already exists in the organization. 2020-06-10 06:22:16 +00:00
Trisha Anand
27fcb2dff8 Merge branch 'feature/acl-datasource-crud-policies' into 'feature/acl-spring-object' 
Bug Fix : 1. user permissions during create/update of actions and datasources would now be set. 2. During update, policies are set to null in the update object to ensure that the policies are not overwritten to empty set.

See merge request theappsmith/internal-tools-server!373
 2020-06-09 15:01:59 +00:00
Trisha Anand
ac06cc9668 1. user permissions during create/update of actions and datasources would now be set. 
2. During update, policies are set to null in the update object to ensure that the policies are not overwritten to empty set.
 2020-06-09 20:25:13 +05:30
Trisha Anand
7d83cfdae9 Merge branch 'bug/acl-empty-role-name' into 'feature/acl-spring-object' 
Bug : When the user tries to invite without selecting the role user, this leads to null pointer exception. Fix : A user CAN NOT be invited to an organization without specifying the role.

See merge request theappsmith/internal-tools-server!369
 2020-06-08 14:56:12 +00:00
Trisha Anand
061577d2c9 Bug : When the user tries to invite without selecting the role user, this leads to null pointer exception. 
Fix : A user CAN NOT be invited to an organization without specifying the role.
 2020-06-08 14:56:12 +00:00
Trisha Anand
a3af1384d1 Merge branch 'bug/acl-get-all-actions' into 'feature/acl-spring-object' 
Bug Fix : Get all actions by application ID returning empty result : Changed the get all actions function to fix the bug where find by Example is not working. Instead the same has now been implemented using criteria.

See merge request theappsmith/internal-tools-server!368
 2020-06-08 12:05:49 +00:00
Trisha Anand
a888d54059 Changed the get all actions function to fix the bug where find by Example is not working. Instead the same has now been implemented using criteria. 2020-06-08 12:05:49 +00:00
Trisha Anand
9ac7e817cc Merge branch 'feature/acl-remove-getCurrentOrganization' into 'feature/acl-spring-object' 
Removed the usage of get current organization id. Added organization id to a few api calls.

See merge request theappsmith/internal-tools-server!367
 2020-06-08 06:45:04 +00:00
Trisha Anand
a31796a216 Removed the usage of get current organization id. Requires addition of organization id to a few api calls. 2020-06-08 06:45:04 +00:00
Trisha Anand
bea724570f Merge branch 'feature/acl-rapid-api' into 'feature/acl-spring-object' 
Adding a 3P Api to a page now also expects the client to send the organization id.

See merge request theappsmith/internal-tools-server!366
 2020-06-08 05:41:53 +00:00
Trisha Anand
f9d63f9881 Adding a 3P Api to a page now also expects the client to send the organization id. 2020-06-05 16:14:15 +05:30
Trisha Anand
1923f0ddea Merge branch 'feature/acl-datasource' into 'feature/acl-spring-object' 
ACL for datasource

See merge request theappsmith/internal-tools-server!362
 2020-06-05 10:05:23 +00:00
Trisha Anand
87aafd6cf4 Adding test case for testDatasource 
Refactoring the testDatasource code by moving the business logic to the service layer.
 2020-06-05 10:05:23 +00:00
Trisha Anand
c7cd46bed4 Merge branch 'feature/acl-add-orgId-application-pages' into 'feature/acl-spring-object' 
Add OrgId to the output of the api used to return all the page ids and names given an application (id or name)

See merge request theappsmith/internal-tools-server!364
 2020-06-04 08:08:15 +00:00
Trisha Anand
9e1742c289 Add OrgId to the output of the api used to return all the page ids and names given an application (id or name) 2020-06-04 08:08:15 +00:00
Trisha Anand
fa3a593bc2 Merge branch 'feature/acl-invite-user' into 'feature/acl-spring-object' 
New Invite User Flow

See merge request theappsmith/internal-tools-server!359
 2020-06-01 17:39:27 +00:00
Trisha Anand
f8cf87e3c8 Invite existing user to an organization works. Updated the test case for adding user to an organization as well to use the new API. 2020-06-01 17:39:27 +00:00
Arpit Mohan
b0b72d965c Merge branch 'bug/acl-new-user-policies' into 'feature/acl-spring-object' 
Bug : New users aren't able to read their own user object and hence homepage doesnt load. Fix : Added lateral permissions for user on create.

See merge request theappsmith/internal-tools-server!358
 2020-05-29 05:28:30 +00:00
Trisha Anand
f1e1e6959a Bug : New users aren't able to read their own user object and hence homepage doesnt load. 
Fix : Added lateral permissions for user on create.
 2020-05-29 05:28:30 +00:00
Trisha Anand
53d81e8ed6 Merge branch 'bug/acl-empty-homepage' into 'feature/acl-spring-object' 
Bug Root Cause : New users have no applications inside the organizations(s). In this case, get all applications does not return back organizationApplications object. Fix : In getAllApplications, instead of iterating over collections of applications which

See merge request theappsmith/internal-tools-server!357
 2020-05-28 08:13:37 +00:00
Trisha Anand
d6670c70cc Bug Root Cause : New users have no applications inside the organizations(s). In this case, get all applications does not return back organizationApplications object. 
Fix : In getAllApplications, instead of iterating over collections of applications which could be empty, we iterate over organizations where we are guaranteed to have atleast one organization.
 2020-05-28 13:31:24 +05:30
Arpit Mohan
a24633e391 Merge branch 'feaure/acl-cascade-org-permissions' into 'feature/acl-spring-object' 
Acl : Cascade org permissions to applications, pages and eventually actions.

See merge request theappsmith/internal-tools-server!355
 2020-05-27 14:36:58 +00:00
Trisha Anand
6475be63d1 Baseline code added for cascading the org level permissions to applications, pages and eventually actions. 2020-05-27 14:36:57 +00:00
Trisha Anand
59a83d414b Added description to roles for organization appsmith roles. 2020-05-26 10:49:42 +05:30
Arpit Mohan
c8cd7ad934 Merge branch 'bug/acl-getAllActions' into 'feature/acl-spring-object' 
BaseRepository : findAll function fixed.

See merge request theappsmith/internal-tools-server!353
 2020-05-22 10:31:35 +00:00
Trisha Anand
0c9c95bc9a Fixed the findAll repository function which was leading to get all actions via application id to throw an internal server error. 2020-05-22 15:56:09 +05:30
Trisha Anand
10b07d5912 Merge branch 'feature/acl-org-user-role' into 'feature/acl-spring-object' 
GET Organization Users & part base code to update permissions given an org level role.

See merge request theappsmith/internal-tools-server!339
 2020-05-21 15:05:43 +00:00
Trisha Anand
d98fce3d09 WIP: adding helper functions for adding/removing roles from an organization. Adding role updates the organization right now. Removing role -> added a helper. 
TODO : finish the above code flows + cascade these to the children objects of the organization -> Applications/Pages/Actions.
 2020-05-21 15:05:43 +00:00
Trisha Anand
8caf66d68a Merge branch 'feature/acl-new-create-application' into 'feature/acl-spring-object' 
create application now expects organization id.

See merge request theappsmith/internal-tools-server!347
 2020-05-19 17:09:51 +00:00
Trisha Anand
e95b680169 create application now expects organization id. Fixed the test cases which broke because of this basic change in the way applications are created. 2020-05-19 17:09:51 +00:00
Trisha Anand
5829a92998 Merge branch 'release' into feature/acl-spring-object 
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
 2020-05-13 23:37:31 +05:30
Trisha Anand
7b851fce7a Merge branch 'feature/acl-403' into 'feature/acl-spring-object' 
In case of anonymous user, return 401 instead of 403 when fetching user profile.

See merge request theappsmith/internal-tools-server!335
 2020-05-13 18:00:03 +00:00
Trisha Anand
9a8bf9dc89 In case the user is not signed in, return a 401 so that the user can be redirected to login by the frontend. 2020-05-13 18:00:03 +00:00
Shrikant Kandula
1c33380820 Merge branch 'chore/rename-should-cache-field' into 'release' 
Rename ActionExecutionResult.shouldCacheResponse -> isExecutionSuccess.

See merge request theappsmith/internal-tools-server!334
 2020-05-12 13:50:56 +00:00
Shrikant Kandula
9c48f42990 Rename ActionExecutionResult.shouldCacheResponse -> isExecutionSuccess. 2020-05-12 18:25:49 +05:30
Arpit Mohan
d2d0805146 Merge branch 'feat/use-unique-name-on-post-datasource' into 'release' 
Automatically use a unique name for creating datasources without name.

In the request from frontend for datasource creation, if the data
doesn't have a `name` value, we now set it to an automatically numbered
value and save with that.

See merge request theappsmith/internal-tools-server!333
 2020-05-12 12:23:23 +00:00
Shrikant Kandula
b65690ec74 Automatically use a unique name for creating datasources without name. 
In the request from frontend for datasource creation, if the data
doesn't have a `name` value, we now set it to an automatically numbered
value and save with that.
 2020-05-12 16:05:29 +05:30
Nikhil Nandagopal
5dad85ff3e Update form.json 2020-05-12 09:48:56 +00:00