Commit graph

867 commits

Author SHA1 Message Date
PeterG
3676188083
fix: google calendar sync times (system tz) (#18458)
* fix: google calendar sync times (system tz)

* added line breaks to excessively long bit

* (chore) linter appeasement

* chore: linting

[skip ci]
2022-10-19 10:39:43 +05:30
Anoop
c44e278fed
feat: add video conferencing option (Google Meet) to Google Calendar integration (#17851)
* feat: add video conferencing (via google meet) for events syncing with google calendar

* fix: unset add_video_conferencing if sync_with_google_calendar not enabled

* fix: remove conference data if add_video_conferencing disabled during update

* fix: restrict add conferencing if event_category in Event, Meeting and Other

* fix: save meet link while pulling from calendar
updated response API Response comment with conference details
show google calendar section if pulled from google calendar

* feat: show link to join video conference with google meet

* fix(style): linter errors

* fix(style): linter errors

* fix: set conferenceDataVersion 1 only if google meet conferencing enabled
remove google meet link from event needs both conferenceData as null and conferenceDataVersion 1

* Update frappe/desk/doctype/event/event.py

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* Update frappe/desk/doctype/event/event.json

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: handle empty ends_on, use starts_on

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: do not update Event modified time on db set meet link

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: add email field event participants table
set email from linked contact
google calendar event to use event participant email as attendees

* fix: attendees not cleared from google calendar event

* fix(style): linter suggestions

* fix: make email field non-read only, called set_participants_email from before_save hook

* test: update new no of fields in event doctype in test_fetch_to_customize

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
2022-10-18 19:07:48 +05:30
PeterG
77ae997b14
fix: google calendar sync times (#18384) 2022-10-12 15:23:04 +05:30
Kitti U. @ Ecosoft
a35880a089
docs: misleading docstring #18051
Wrong instruction for Redirect URL
2022-09-07 18:03:19 +05:30
Aradhya Tripathi
caf171b363
Merge branch 'develop' into get-all-mod 2022-08-22 14:53:35 +05:30
Ankush Menat
2eec621e95 chore: db.get_all -> get_all
Reduces 1 pointless function call.
Function calls are also not "super cheap" in python.
2022-08-22 11:35:14 +05:30
Aradhya Tripathi
e73ae6f039
Merge branch 'develop' into get-all-mod 2022-08-19 15:42:35 +05:30
Ankush Menat
b2b0b64d8c
refactor: add default to pop
[skip ci]

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-08-18 18:34:52 +05:30
Ankush Menat
f2b6c937c9 fix: pop pwd from form dict, disable auth loggin
- This prevents accidental logging of this info somewhere down the line.
- Disable exception logging for auth failures
2022-08-18 15:32:42 +05:30
Ankush Menat
3e2d2a703a test: Use FrappeTestCase everywhere 2022-08-17 16:39:42 +05:30
Aradhya Tripathi
0656ea9b07
Merge branch 'develop' into get-all-mod 2022-08-14 11:39:30 +05:30
Gavin D'souza
65273ee828 Merge branch 'develop' of github.com:frappe/frappe into refactor-oauth-tests 2022-08-05 11:38:55 +05:30
Ankush Menat
40f27f908a style: format JS files with prettier 2022-08-04 14:51:01 +05:30
Gavin D'souza
2933a06e80 Merge branch 'develop' of github.com:frappe/frappe into refactor-oauth-tests 2022-08-03 16:37:38 +05:30
Gavin D'souza
85e3ee9403 chore: Minified DocType JSON notation from old verbose notation 2022-08-03 12:22:03 +05:30
Gavin D'souza
2ae50f911a chore: Minimize OAuth Client DocType 2022-08-03 12:01:36 +05:30
Gavin D'souza
f7d5cb504a test(oauth-client): Generate new client for each test 2022-08-03 12:00:09 +05:30
Aradhya Tripathi
5ccaebca34
Merge branch 'develop' into get-all-mod 2022-07-29 14:27:37 +05:30
phot0n
090d0321a8 chore: fix linter 2022-07-26 23:17:04 +05:30
phot0n
f71562fd49 chore: add integration request doctype back (with utils) 2022-07-26 23:17:04 +05:30
phot0n
83fe747f75 chore: remove payment utils and hooks 2022-07-26 15:11:56 +05:30
phot0n
f3473b059e chore: remove payment gateway and integration request doctype 2022-07-26 15:11:56 +05:30
phot0n
725b8fb13a chore: remove payments card from integration workspace 2022-07-26 15:11:56 +05:30
phot0n
310b8327c7 chore: remove payment doctypes 2022-07-26 15:11:56 +05:30
Aradhya Tripathi
62786c7316
Merge branch 'develop' into get-all-mod 2022-07-24 14:28:30 +05:30
Aradhya
9348e1cd98 fix: removed eccess "`" 2022-07-24 01:30:44 +05:30
Ankush Menat
066d5a4245
Merge pull request #17528 from phot0n/mis-fixes-goauth
fix: misc fixes (google oauth)
2022-07-19 15:55:24 +05:30
Gavin D'souza
c55bb98482 test: LDAP test for website user creation 2022-07-19 15:01:16 +05:30
Gavin D'souza
c7726d6394 fix: Pick default_role for Sytem User type only 2022-07-19 15:00:23 +05:30
Gavin D'souza
26f4654b31 test: Check user role & type updated via LDAP 2022-07-18 18:22:12 +05:30
phot0n
943334a90c chore: fix docstrings 2022-07-18 17:47:57 +05:30
Gavin D'souza
a588879094 refactor(minor): LDAP Settings Test Suite
* Re-write blocks for better readability
* De-indent everything
* Add typing, etc
2022-07-18 17:30:04 +05:30
gavin
155a7c2343
Merge branch 'develop' into ldap-user_type 2022-07-18 15:41:10 +05:30
Ankush Menat
29c855b028
fix: db.get_value -> db.get_single_value (#17531)
db.get_value for singles returns string type always, this is confusing
behaviour, db.get_single_value should be used instead.

semgrep rule: https://github.com/frappe/semgrep-rules/pull/16
2022-07-18 15:10:49 +05:30
phot0n
f679dc3fdd fix(security): restrict the god google callback
the common google callback can be used to trigger any method in the whole codebase
restrict it by only allowing domain specific callback method and raise
an error if the domain is not found
2022-07-17 21:37:21 +05:30
phot0n
7d5262f5e0 chore: translate authorization message and add nosemgrep 2022-07-13 12:50:04 +05:30
phot0n
31c5f260d7 chore: use f-strings 2022-07-13 12:29:25 +05:30
phot0n
01a1860491 fix(ux): better ux for successful oauthorization 2022-07-13 12:05:46 +05:30
phot0n
5b7d37477e chore: add link for google settings when throwing error 2022-07-13 12:05:46 +05:30
phot0n
8b38fcb438 chore: move getting site address to GoogleOAuth 2022-07-13 12:05:46 +05:30
phot0n
484758d6e0 chore: remove additional/unnecessary set_value calls 2022-07-13 12:05:46 +05:30
phot0n
6848c93770 chore: remove GET method whitelisting from google integrations 2022-07-13 12:05:46 +05:30
phot0n
ab9a577474 minor: better oauth flow 2022-07-13 12:05:46 +05:30
phot0n
221423c718 chore: added docstrings 2022-07-13 12:05:46 +05:30
phot0n
07a577af86 feat: google oauth for google emails
* used unique constraint on email_id in Email Account Doctype
2022-07-13 12:05:46 +05:30
phot0n
26dd606831 refactor: GoogleOAuth
* refactor: single callback method for google oauth
2022-07-13 12:05:46 +05:30
Ankush Menat
d5820213f0 feat: preview Webhook request data 2022-07-11 18:26:57 +05:30
Ankush Menat
1531e36004 fix: allow JSON array as request body 2022-07-11 18:26:54 +05:30
Ankush Menat
d4fe142674 fix(UX): correctly validate python condition 2022-07-11 18:26:54 +05:30
Gavin D'souza
ee97038c71 chore: Add typing + reduce import paths 2022-07-08 13:24:26 +05:30