Commit Graph

695 Commits

Author SHA1 Message Date
Trisha Anand
b7435e546f Added action inheritance for permissions during create. No update permissions for action added. Fixed the existing test cases to run with the new code.
TODO : Add test cases for action permissions.
2020-05-08 15:39:36 +00:00
Trisha Anand
c12d83caa5 Merge branch 'feature/acl-page-inheritance' into 'feature/acl-spring-object'
Completed the loop on page inheritance from application

See merge request theappsmith/internal-tools-server!328
2020-05-08 11:07:52 +00:00
Trisha Anand
d7637355fe Create Page always sets the inherited policies from the application. Update Application policy remains to be done. Leaving it as a TODO for now. 2020-05-08 16:32:46 +05:30
Trisha Anand
5fa667aecc Merge branch 'feature/add-delete-perm-obj' into 'feature/acl-spring-object'
Add and Remove Policies to an Object

See merge request theappsmith/internal-tools-server!325
2020-05-07 14:14:51 +00:00
Trisha Anand
44ce0bbf01 Added baseservice function add and remove policies to an object. This would be used for updating permissions for an object. 2020-05-07 19:39:36 +05:30
Trisha Anand
47e7f6a8c5 Merge branch 'feature/acl-getAllApplications' into 'feature/acl-spring-object'
Feature/acl get all applications

See merge request theappsmith/internal-tools-server!317
2020-05-07 10:49:48 +00:00
Trisha Anand
957116409d Resolved the review comments. Changed the structure of the DTO returned. Added the userPermissions as part of the base domain leading to this field always computed before returning any object to the user. 2020-05-07 10:49:48 +00:00
Trisha Anand
c43218eea6 Merge branch 'release' into feature/acl-spring-object 2020-05-01 17:05:43 +05:30
Trisha Anand
1f25aac3a5 Untested mock get applications for home page. 2020-05-01 16:56:05 +05:30
Shrikant Kandula
f4b4c630fe Merge branch 'bug/json-body-non-object-types' into 'release'
Handle 500 when JSON body doesn't make up an object data type.

See merge request theappsmith/internal-tools-server!316
2020-04-30 13:32:24 +00:00
Shrikant Kandula
8ea8fb295e Handle 500 when JSON body doesn't make up an object data type. 2020-04-30 13:32:24 +00:00
Shrikant Kandula
ee18dc5685 Merge branch 'bug/invalid-content-type-throws-500' into 'release'
Check the value of `Content-Type` before trying to make an HTTP call.

See merge request theappsmith/internal-tools-server!315
2020-04-30 12:30:17 +00:00
Trisha Anand
bc99ce9244 Merge branch 'release' into feature/acl-spring-object 2020-04-30 17:50:32 +05:30
Shrikant Kandula
c8e8c9136d Check the value of Content-Type before trying to make an HTTP call. 2020-04-30 16:50:17 +05:30
Shrikant Kandula
50a8bad19e Merge branch 'bug/restapi-test-without-port' into 'release'
Fix testing of REST API datasources fails when no port is set.

See merge request theappsmith/internal-tools-server!307
2020-04-30 06:02:28 +00:00
Shrikant Kandula
be7f1c0a81 Fix testing of REST API datasources fails when no port is set. 2020-04-30 06:02:28 +00:00
Shrikant Kandula
68182f9b49 Merge branch 'feat/plugin-names' into 'release'
More readable plugin names.

See merge request theappsmith/internal-tools-server!303
2020-04-29 11:49:06 +00:00
Shrikant Kandula
fc1b73773e More readable plugin names. 2020-04-29 11:49:06 +00:00
Shrikant Kandula
86669fa7e4 Merge branch 'feat/updated-plugin-form-configs' into 'release'
Update form.json for datasource configurations.

See merge request theappsmith/internal-tools-server!314
2020-04-29 10:59:46 +00:00
Shrikant Kandula
06e85c308f Update form.json for datasource configurations. 2020-04-29 16:25:30 +05:30
Shrikant Kandula
a8c2377420 Merge branch 'bug/index-include-deleted-field' into 'release'
Add `deletedAt` field into the unique index of datasources and pages.

See merge request theappsmith/internal-tools-server!313
2020-04-29 10:50:26 +00:00
Shrikant Kandula
7dfa1bd8ca Add deletedAt field into the unique index of datasources and pages. 2020-04-29 16:16:09 +05:30
Trisha Anand
8db71d00a9 Merge branch 'release' into feature/acl-spring-object 2020-04-29 15:49:57 +05:30
Trisha Anand
90ac43a831 Merge branch 'bug/copy-3p-action' into 'release'
Create action with template id was leading to mock response. Removed this.

See merge request theappsmith/internal-tools-server!312
2020-04-29 10:19:01 +00:00
Trisha Anand
89f179397f Create action with template id was leading to mock response. Removing this to allow for copy of actions which have been created using 3p API 2020-04-29 10:19:01 +00:00
Trisha Anand
0b496e1ecc Untested add policies to an object code. 2020-04-29 15:03:56 +05:30
Shrikant Kandula
1cd3c94e9e Merge branch 'bug/hide-rapid-api-from-datasource-create-view' into 'release'
Add `allowUserDatasources` to plugins to hide from create datasource UI.

See merge request theappsmith/internal-tools-server!310
2020-04-28 12:44:56 +00:00
Shrikant Kandula
079e185ed2 Add allowUserDatasources to plugins to hide from create datasource UI. 2020-04-28 12:44:56 +00:00
Trisha Anand
2d1fe9d8b4 Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHPrivateKey.java
#	appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java
#	appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
#	appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
2020-04-28 18:13:06 +05:30
Shrikant Kandula
b161ff1403 Merge branch 'feat/no-ssl-option-for-plugins' into 'release'
Add NO_SSL option to SSL authType to turn off SSL explicitly.

See merge request theappsmith/internal-tools-server!311
2020-04-28 12:31:34 +00:00
Shrikant Kandula
23bd4e1722 Add NO_SSL option to SSL authType to turn off SSL explicitly. 2020-04-28 12:31:34 +00:00
Trisha Anand
790a329581 Merge branch 'bug/search-marketplace-URI-encoding' into 'release'
URL decoding the provider name before searching for it.

See merge request theappsmith/internal-tools-server!309
2020-04-28 11:06:27 +00:00
Trisha Anand
219a594a4c URL decoding the name before searching for it. 2020-04-28 16:31:19 +05:30
Trisha Anand
e99ede9d86 Minor comments added for TODOs 2020-04-28 16:18:28 +05:30
Shrikant Kandula
89d04f11e7 Merge branch 'bug/show-password-in-datasource-form' into 'release'
Show passwords in datasource forms.

See merge request theappsmith/internal-tools-server!308
2020-04-28 09:34:46 +00:00
Shrikant Kandula
b092692922 Merge branch 'bug/npe-if-opa-not-ready' into 'release'
Fix NPE when accessing services before OPA is ready.

See merge request theappsmith/internal-tools-server!300
2020-04-28 09:22:05 +00:00
Shrikant Kandula
6fd23f38b8 Merge branch 'bug/curl-parser' into 'release'
Fix cURL import bugs with new cURL command parser

See merge request theappsmith/internal-tools-server!306
2020-04-28 09:09:03 +00:00
Shrikant Kandula
1dbb98e1e8 Fix cURL import bugs with new cURL command parser 2020-04-28 09:09:03 +00:00
Shrikant Kandula
0a05036f9f Show passwords in datasource forms. 2020-04-28 11:12:03 +05:30
Trisha Anand
82eb02b88c Invite user to application as viewer or admin works now works in setting the correct permissions for the application. Next step is to set the correct permissions for the pages. 2020-04-27 18:19:28 +05:30
Shrikant Kandula
2adad6b3b5 Merge branch 'bug/spread-operator-in-mustache-templates' into 'release'
Fix page-load action not being picked up when using the spread operator.

See merge request theappsmith/internal-tools-server!299
2020-04-27 08:11:22 +00:00
Shrikant Kandula
ce930181cd Fix page-load action not being picked up when using the spread operator. 2020-04-27 08:11:21 +00:00
Shrikant Kandula
d0e47ea2ea Merge branch 'feat/delete-datasources-api' into 'release'
Add delete service operation for datasources.

See merge request theappsmith/internal-tools-server!305
2020-04-27 08:01:16 +00:00
Shrikant Kandula
090e00ee13 Add delete service operation for datasources. 2020-04-27 08:01:16 +00:00
Shrikant Kandula
16f2df38f1 Merge branch 'bug/npe-in-appsmith-exception' into 'release'
Fix potential NPE in AppsmithException. Also removed unused methods.

See merge request theappsmith/internal-tools-server!298
2020-04-27 07:51:18 +00:00
Shrikant Kandula
a96b1005ff Fix potential NPE in AppsmithException. Also removed unused methods. 2020-04-27 07:51:18 +00:00
Trisha Anand
2fa879fbd4 Minor code cleanup 2020-04-24 15:15:39 +05:30
Trisha Anand
2220fa529b Merge branch 'feature/endpoint-get-provider-by-id' into 'release'
Added endpoint in marketplace to fetch provider by id if required

See merge request theappsmith/internal-tools-server!304
2020-04-23 18:59:40 +00:00
Trisha Anand
6ee1a58a9a Added endpoint in marketplace to fetch provider by id if required 2020-04-23 19:02:14 +05:30
Shrikant Kandula
20f00870ca Merge branch 'feature/mongo-plugin-default-database' into 'release'
Support separate default database for MongoPlugin, besides authDatabase.

See merge request theappsmith/internal-tools-server!302
2020-04-23 11:09:02 +00:00