fix!: switch google drive picker to gis #23096
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TMF42
requested review from
a team and
shariquerik
and removed request for
a team
barredterra
reviewed
Nov 5, 2023
barredterra
reviewed
Nov 5, 2023
barredterra
reviewed
Nov 5, 2023
barredterra
requested changes
Nov 5, 2023
barredterra
added
backport version-14-hotfix
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
@TMF42 sorry for the delay, I'm pretty busy at the moment. If anybody else can review this, please do! |
|
@TMF42 will this fix the authentication error currently facing in the google drive picker? reference: https://discuss.frappe.io/t/google-drive-picker/102950 |
@fadilsiddique yes. that's the fix for the problem you referenced. |
Thanks. Facing the issue currently. I have asked in the TG group to check this PR. |
barredterra
approved these changes
Nov 24, 2023
There was a problem hiding this comment.
I'm not very happy with the code. Could definitely use a refactor. But it works fine, so I'm inclined to get this merged for the time being.
Todo:
- Remove unused properties (
this.pickerInited,this.gisInited) -
ReplaceNo need to store this at all.this.accessTokenwithfrappe.boot.user.google_drive_token. No need to store this in two places. - Currently, the auth popup shows every time. Can we avoid this, if we already have an active token?
It's one-time use anyway.
barredterra
changed the title
|
@shariquerik this PR is ready. I have tested the functionality. If the code looks okay, kindly merge. |
mergify bot
pushed a commit
that referenced
this pull request
Nov 29, 2023
* fix: switch google drive picker to gis * fix: switch google drive picker to gis (linting) * fix: switch google drive picker to gis (prettier) * fix: remove restrictions on file types Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: show navigator Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: no multiselect for files Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * refactor: get rid of jquery * fix: don't add script twice * refactor: remove unused properties * refactor: store access token in one place only * refactor: make tokenClient a local constant * fix: set locale * refactor: async calls * fix: don't store access token It's one-time use anyway. * fix: scope for allowing file upload * reafctor: rename libsLoaded() to autthenticate() --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit 043c004)
mergify bot
pushed a commit
that referenced
this pull request
Nov 29, 2023
* fix: switch google drive picker to gis * fix: switch google drive picker to gis (linting) * fix: switch google drive picker to gis (prettier) * fix: remove restrictions on file types Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: show navigator Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: no multiselect for files Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * refactor: get rid of jquery * fix: don't add script twice * refactor: remove unused properties * refactor: store access token in one place only * refactor: make tokenClient a local constant * fix: set locale * refactor: async calls * fix: don't store access token It's one-time use anyway. * fix: scope for allowing file upload * reafctor: rename libsLoaded() to autthenticate() --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit 043c004)
ankush
pushed a commit
that referenced
this pull request
Nov 29, 2023
* fix: switch google drive picker to gis * fix: switch google drive picker to gis (linting) * fix: switch google drive picker to gis (prettier) * fix: remove restrictions on file types Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: show navigator Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: no multiselect for files Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * refactor: get rid of jquery * fix: don't add script twice * refactor: remove unused properties * refactor: store access token in one place only * refactor: make tokenClient a local constant * fix: set locale * refactor: async calls * fix: don't store access token It's one-time use anyway. * fix: scope for allowing file upload * reafctor: rename libsLoaded() to autthenticate() --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit 043c004) Co-authored-by: Thomas Fojan <thomas@tmf.one>
ankush
pushed a commit
that referenced
this pull request
Nov 29, 2023
* fix: switch google drive picker to gis * fix: switch google drive picker to gis (linting) * fix: switch google drive picker to gis (prettier) * fix: remove restrictions on file types Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: show navigator Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: no multiselect for files Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * refactor: get rid of jquery * fix: don't add script twice * refactor: remove unused properties * refactor: store access token in one place only * refactor: make tokenClient a local constant * fix: set locale * refactor: async calls * fix: don't store access token It's one-time use anyway. * fix: scope for allowing file upload * reafctor: rename libsLoaded() to autthenticate() --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit 043c004) Co-authored-by: Thomas Fojan <thomas@tmf.one>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR to integrate Google Drive Picker in file uploader -> #12715
Created by @barredterra
Meanwhile, Google deprecated the Google Sign-In library and new client IDs will be blocked -> see here
This PR deals with migrating the authentication part to Google Identity Services based on Google's suggestions -> see here
and based on the latest example for using the Google Picker API -> see here
Additional Notes: