Commit Graph

865 Commits

Author SHA1 Message Date
Trisha Anand
930e577f98 Bug Fix : When page name is updated, the policies should not get overwrritten. Changed the base service function to reset the empty policies to null in case the update is not used to update the policies. 2020-06-27 19:45:24 +00:00
Trisha Anand
23a08a66fe Merge branch 'bug/oauth2-signup' into 'release'
Bug fix : Google SSO for sign up led to the organization id for personal organization not getting set up.

See merge request theappsmith/internal-tools-server!411
2020-06-26 11:59:34 +00:00
Trisha Anand
76e3db497c Bug fix : Google SSO for sign up led to the organization id for personal organization not getting set up. 2020-06-26 11:59:33 +00:00
Arpit Mohan
bbf0aef450 Merge branch 'bug/embedded-datasource-without-organization-id' into 'release'
When organizationId is null in a datasource, fail with the right error message

The organization id is subsequently used to find a matching plugin (checking for installation essentially), but when organization id is missing, this query never returns. But the error message reads as if the plugin is not installed, whereas it should've been that organization id is missing.

See merge request theappsmith/internal-tools-server!406
2020-06-26 11:43:16 +00:00
Shrikant Kandula
d5921ea52d When organizationId is null in a datasource, fail with the right error message 2020-06-26 11:43:16 +00:00
Trisha Anand
779c79476d Merge branch 'bug/acl-update-role-race-condition' into 'release'
Race condition bug caught in remove user from organization flow where multiple applicaitons/pages/actions exist for an organization.

See merge request theappsmith/internal-tools-server!407
2020-06-25 10:15:07 +00:00
Trisha Anand
57f4f734dd Race condition bug caught in remove user from organization flow where multiple applicaitons/pages/actions exist for an organization. 2020-06-25 15:39:32 +05:30
Shrikant Kandula
3fb7425739 Merge branch 'bug/mustache-replacements' into 'release'
Fix Mustache rendering to work on object fields directly

See merge request theappsmith/internal-tools-server!401
2020-06-25 09:58:20 +00:00
Shrikant Kandula
3217daab14 Fix Mustache rendering to work on object fields directly 2020-06-25 09:58:20 +00:00
Trisha Anand
66ce07e2b4 Merge branch 'bug/duplicate-permission-new-object' into 'release'
Bug : Duplicate policies are getting created for the same permission

See merge request theappsmith/internal-tools-server!404
2020-06-25 08:09:59 +00:00
Trisha Anand
6d103b4939 Untested changes for fixing the bug where duplicate policies are getting created for the same permission. 2020-06-25 08:09:59 +00:00
Trisha Anand
a73d182d73 Merge branch 'bug/org-creation' into 'release'
Bug fix : Create Organization is failing because the user is read from the session and not from the repository. Now reading the user at appropriate places.

See merge request theappsmith/internal-tools-server!405
2020-06-24 12:14:25 +00:00
Trisha Anand
aebb50d216 Bug fix : Create Organization is failing because the user is read from the session and not from the repository. Now reading the user at appropriate places. 2020-06-24 17:30:24 +05:30
Arpit Mohan
b63ca6726d Merge branch 'feat/plugin-templates' into 'release'
Add server-side templates support for plugins

Two main themes in this MR:

1. Add support for saving query templates as resource files inside a plugin. This has been done for both Postgres and MongoDB plugins, based on current template contents.
2. Loading of form JSON is now reactive. The blocking call has been moved inside a `Mono.fromSupplier`.
3. The loading of from JSON as well as the templates is cached and are loaded on-demand. This means that the templates are loaded once for a plugin through the lifetime of the server process, and that they are loaded only at the first time they are needed.
4. If loading of these resources fails, we try again when they are needed the next time.

See merge request theappsmith/internal-tools-server!385
2020-06-24 11:08:25 +00:00
Shrikant Kandula
eee2cfcaff Add server-side templates support for plugins 2020-06-24 11:08:25 +00:00
Arpit Mohan
4727c9540a Merge branch 'bug/mongo-findAndModify-result-body' into 'release'
Fill response body with `value` when running findAndModify Mongo query

See merge request theappsmith/internal-tools-server!403
2020-06-24 11:05:19 +00:00
Shrikant Kandula
40b5466bd8 Fill response body with value when running findAndModify Mongo query 2020-06-24 11:05:19 +00:00
Arpit Mohan
5c078b5a0a Merge branch 'feat/additional-plugin-details' into 'release'
Add image location and documentation link fields to plugins

See merge request theappsmith/internal-tools-server!384
2020-06-24 08:28:54 +00:00
Shrikant Kandula
d7655ebb3c Add image location and documentation link fields to plugins 2020-06-24 08:28:54 +00:00
Arpit Mohan
5526168725 Merge branch 'bug/mongo-ssl-default-option' into 'release'
Make NO_SSL the default for Mongo datasources

Currently, the default option for SSL for Mongo datasources is self signed certificate. This is unintuitive and so this MR changes it to No SSL, as well as moving the "No SSL" option to the top in the dropdown.

Requested by Nikhil.

See merge request theappsmith/internal-tools-server!402
2020-06-24 06:00:19 +00:00
Shrikant Kandula
522e6221f7 Make NO_SSL the default for Mongo datasources 2020-06-24 11:02:34 +05:30
Arpit Mohan
2b8656b266 Merge branch 'bug/google-auth-security-context' into 'release'
Fixing SSO authentication for new ACL flows

This MR fixes the following: 
1. The `User` class implements OidcUser interface that is required by Spring security for OAuth2 login
2. Simplifying the SessionUserService to not query from the MongoDB for each request
3. Modifying the AnalyticsService to log the username instead of the id in Segment.
4. Adding custom user token response classes `CustomOidcUserServiceImpl`, `CustomOAuth2UserServiceImpl` and `CustomFormLoginServiceImpl`. These classes convert the OAuth2 response tokens into User objects before persisting them in SecurityContext.

See merge request theappsmith/internal-tools-server!400
2020-06-23 13:19:22 +00:00
Arpit Mohan
0be492e8e9 Fixing OAuth2 SSO login for new ACL flow 2020-06-23 13:19:22 +00:00
Trisha Anand
56b0b6a93e Merge branch 'bug/hack-action-request-usertest' into 'release'
Hacky solve for setting the action execution request in case of failures in URL/HTTP Method/etc.

See merge request theappsmith/internal-tools-server!399
2020-06-19 18:19:23 +00:00
Trisha Anand
cd30e36eaa Hacky solve for setting the action execution request in case of failures in URL/HTTP Method/etc. 2020-06-19 23:43:32 +05:30
Satbir Singh
0966d7f90a Merge branch 'feature/user-test-request-action' into 'release'
User test - Add request URL and http method to the execution result

See merge request theappsmith/internal-tools-server!398
2020-06-19 16:24:59 +00:00
Trisha Anand
0603da29ee User test - Add request URL and http method to the execution result 2020-06-19 16:24:58 +00:00
Shrikant Kandula
5ce19962a3 Merge branch 'chore/sending-email-should-be-nonblocking' into 'release'
Sending emails is now done in a non-blocking way

See merge request theappsmith/internal-tools-server!396
2020-06-19 07:14:43 +00:00
Shrikant Kandula
5f0a3034b8 Sending emails is now done in a non-blocking way 2020-06-18 17:29:36 +05:30
Shrikant Kandula
70c312ca40 Merge branch 'bug/disallow-delete-datasource-with-actions' into 'release'
Fail deleting datasource if there's actions against it

See merge request theappsmith/internal-tools-server!388
2020-06-18 10:41:49 +00:00
Shrikant Kandula
9f6a4f6ea5 Fail deleting datasource if there's actions against it 2020-06-18 10:41:48 +00:00
Shrikant Kandula
45961ddcde Merge branch 'bug/fail-on-invalid-page-id-when-creating-action' into 'release'
Fail with an error if can't find page when creating an action

See merge request theappsmith/internal-tools-server!394
2020-06-18 10:25:13 +00:00
Trisha Anand
63852041de Merge branch 'bug/delete-application-app-viewer' into 'release'
Bug Fix : Application and page can only be deleted if you have manage application/page permissions respectively.

See merge request theappsmith/internal-tools-server!395
2020-06-18 10:20:50 +00:00
Shrikant Kandula
f19764ab99 Merge branch 'bug/space-not-needed-in-header-in-curl' into 'release'
Fix parse error when there's a space in header in curl command

See merge request theappsmith/internal-tools-server!390
2020-06-18 10:11:39 +00:00
Trisha Anand
4337e88934 Application and page can only be deleted if you have manage application/page permissions respectively. 2020-06-18 15:35:30 +05:30
Shrikant Kandula
1d5fa960db Fail with an error if can't find page when creating an action 2020-06-18 15:05:55 +05:30
Arpit Mohan
69dd082cf6 Merge branch 'bug/acl-invite-not-null-assertion' into 'release'
Invite User to Organisation : Throw a bad request error in case all the invite dto fields are not set.

See merge request theappsmith/internal-tools-server!393
2020-06-18 08:45:51 +00:00
Trisha Anand
ec8c63bfee For invitation, throw a bad request error in case all the invite dto fields are not set. 2020-06-18 14:05:48 +05:30
Arpit Mohan
f44c979e49 Merge branch 'bug/page-edit-without-perm' into 'release'
In case a page is opened in edit mode, it should open with permission of MANAGE_PAGE. In case the user is a viewer, the page must not open.

See merge request theappsmith/internal-tools-server!392
2020-06-17 12:11:32 +00:00
Trisha Anand
e5282dac11 In case a page is opened in edit mode, it should open with permission of MANAGE_PAGE. In case the user is a viewer, the page must not open. 2020-06-17 17:34:26 +05:30
Trisha Anand
e9086c15b5 Merge branch 'feature/acl-spring-object' into 'release'
ACL

See merge request theappsmith/internal-tools-server!383
2020-06-17 09:51:57 +00:00
Trisha Anand
893698f09e Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
2020-06-17 15:10:23 +05:30
Arpit Mohan
decdde179c Merge branch 'bug/acl-invite-admin-admin' into 'feature/acl-spring-object'
In case a user is invited to an organization as developer, correct top...

See merge request theappsmith/internal-tools-server!391
2020-06-17 09:33:01 +00:00
Trisha Anand
8fc99cf0bd In case a user is invited to an organization as developer, correct top permissions are being assigned via Appsmith role. 2020-06-17 09:33:00 +00:00
Shrikant Kandula
8e40240f25 Fix parse error when there's a space in header in curl command 2020-06-17 12:32:08 +05:30
Arpit Mohan
c6af229a97 Merge branch 'bug/default-page-action-refactor' into 'release'
Adding the widget names set to the default layout for a page

During action name refactor, we require the widget names to exist in the layout. Hence all default layouts must have the widgetName set.

See merge request theappsmith/internal-tools-server!387
2020-06-16 05:25:54 +00:00
Arpit Mohan
e27af0f525 Merge branch 'bug/curl-import-with-url-argument' into 'release'
Fix cURL import when using `--url` argument

See merge request theappsmith/internal-tools-server!386
2020-06-16 05:21:43 +00:00
Arpit Mohan
a4132d5845 Adding the widget names set to the default layout for a page 2020-06-16 10:50:07 +05:30
Shrikant Kandula
dd0ba857c2 Fix cURL import when using --url argument
Also fixes cases where there's a space between `-X` and `POST` and
similar cases.
2020-06-16 09:59:43 +05:30
Trisha Anand
9dfb72720e Fixed the broken test cases. 2020-06-12 19:35:01 +05:30