Skip to content

Commit

Permalink
Applied patch for multiple account support
Browse files Browse the repository at this point in the history 
Applied the patch from myuhe#72 to
enable support for multiple Google accounts.
  • Loading branch information
Tobias Macey committed Sep 12, 2017
1 parent bdc7048 commit 34b2ec6
Showing 1 changed file with 59 additions and 47 deletions.
106 changes: 59 additions & 47 deletions org-gcal.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
:group 'org-gcal
:type 'list)

(defvar org-gcal-token-plist nil
"token plist.")
(defvar org-gcal-tokens-plist '()
"token plists.")

(defvar org-gcal-icon-list '("org.png" "emacs.png")
"icon file name list.")
Expand All @@ -125,21 +125,21 @@

(defun org-gcal-sync (&optional a-token skip-export silent)
(interactive)
(org-gcal--ensure-token)
(when org-gcal-auto-archive
(dolist (i org-gcal-file-alist)
(with-current-buffer
(find-file-noselect (cdr i))
(org-gcal--archive-old-event))))
(cl-loop for x in org-gcal-file-alist
do
(let ((x x)
(let* ((x x)
(calendar-url (car x))
(a-token (if a-token
a-token
(org-gcal--get-access-token)))

(org-gcal--get-access-token calendar-url)))
(skip-export skip-export)
(silent silent))
(org-gcal--ensure-token calendar-url)
(deferred:$
(request-deferred
(format org-gcal-events-url (car x))
Expand Down Expand Up @@ -204,7 +204,7 @@
(with-current-buffer (find-file-noselect (cdr x))
(unless skip-export
(save-excursion
(cl-loop with buf = (find-file-noselect org-gcal-token-file)
(cl-loop with buf = (find-file-noselect (concat org-gcal-token-file calendar-url))
for local-event in (org-gcal--parse-id (cdr x))
for pos in (org-gcal--headline-list (cdr x))
when (or
Expand All @@ -215,7 +215,7 @@
(plist-get (read (buffer-string)) (intern (concat ":" (car x))))))))))
do
(goto-char pos)
(org-gcal-post-at-point t)
(org-gcal-post-at-point t calendar-url)
finally
(kill-buffer buf))
(sit-for 2)
Expand All @@ -227,9 +227,9 @@
(mapcar (lambda (lst)
(org-gcal--cons-list lst))
items) ""))
(let ((plst (with-temp-buffer (insert-file-contents org-gcal-token-file)
(let ((plst (with-temp-buffer (insert-file-contents (concat org-gcal-token-file calendar-url))
(read (buffer-string)))))
(with-temp-file org-gcal-token-file (pp (plist-put plst (intern (concat ":" (car x))) (mapcar (lambda (lst)
(with-temp-file (concat org-gcal-token-file calendar-url) (pp (plist-put plst (intern (concat ":" (car x))) (mapcar (lambda (lst)
(cons (plist-get lst :id) (org-gcal--cons-list lst)))
items)) (current-buffer)))))
(org-set-startup-visibility)
Expand Down Expand Up @@ -279,9 +279,16 @@
(car (org-element-map (org-element-at-point) 'headline
(lambda (hl) (org-element-property :end hl)))))))))))

(defun org-gcal-post-at-point (&optional skip-import)
(defun org-gcal-post-at-point (&optional skip-import calendar-url)
(interactive)
(org-gcal--ensure-token)
(message (buffer-file-name))
(let ((calendar-url (if calendar-url
calendar-url
(car (rassoc (buffer-file-name) org-gcal-file-alist))
)))
(message (concat "post-at-point " calendar-url))
)
(org-gcal--ensure-token calendar-url)
(save-excursion
(end-of-line)
(org-back-to-heading)
Expand Down Expand Up @@ -334,7 +341,7 @@
(y-or-n-p (format "Do you really want to delete event?\n\n%s\n\n" smry)))
(org-gcal--delete-event id nil skip-import)))))

(defun org-gcal-request-authorization ()
(defun org-gcal-request-authorization (calendar-url)
"Request OAuth authorization at AUTH-URL by launching `browse-url'.
CLIENT-ID is the client id provided by the provider.
It returns the code provided by the service."
Expand All @@ -343,38 +350,43 @@ It returns the code provided by the service."
"&response_type=code"
"&redirect_uri=" (url-hexify-string "urn:ietf:wg:oauth:2.0:oob")
"&scope=" (url-hexify-string org-gcal-resource-url)))
(read-string "Enter the code your browser displayed: "))
(read-string (concat "(" calendar-url ") Enter the code your browser displayed: ")))

(defun org-gcal-request-token ()
(defun org-gcal-request-token (calendar-url)
"Request OAuth access at TOKEN-URL."
(request
org-gcal-token-url
:type "POST"
:data `(("client_id" . ,org-gcal-client-id)
("client_secret" . ,org-gcal-client-secret)
("code" . ,(org-gcal-request-authorization))
("code" . ,(org-gcal-request-authorization calendar-url))
("redirect_uri" . "urn:ietf:wg:oauth:2.0:oob")
("grant_type" . "authorization_code"))
:parser 'org-gcal--json-read
:success (cl-function
(lambda (&key data &allow-other-keys)
(when data
(setq org-gcal-token-plist data)
(org-gcal--save-sexp data org-gcal-token-file))))
(setq org-gcal-tokens-plist (plist-put org-gcal-tokens-plist calendar-url data))
(org-gcal--save-sexp data (concat org-gcal-token-file calendar-url)))))
:error
(cl-function (lambda (&key error-thrown &allow-other-keys)
(message "Got error: %S" error-thrown)))))

(defun org-gcal-refresh-token (&optional fun skip-export start end smry loc desc id)
"Refresh OAuth access at TOKEN-URL."
(interactive)
(cl-loop for x in org-gcal-file-alist
do
(let* ((x x)
(calendar-url (car x))
(plist (plist-get org-gcal-tokens-plist calendar-url )))
(deferred:$
(request-deferred
org-gcal-token-url
:type "POST"
:data `(("client_id" . ,org-gcal-client-id)
("client_secret" . ,org-gcal-client-secret)
("refresh_token" . ,(org-gcal--get-refresh-token))
("refresh_token" . ,(org-gcal--get-refresh-token calendar-url))
("grant_type" . "refresh_token"))
:parser 'org-gcal--json-read
:error
Expand All @@ -383,19 +395,19 @@ It returns the code provided by the service."
(deferred:nextc it
(lambda (response)
(let ((temp (request-response-data response)))
(plist-put org-gcal-token-plist
(plist-put plist
:access_token
(plist-get temp :access_token))
(org-gcal--save-sexp org-gcal-token-plist org-gcal-token-file)
org-gcal-token-plist)))
(org-gcal--save-sexp plist (concat org-gcal-token-file calendar-url))
(setq org-gcal-tokens-plist (plist-put org-gcal-tokens-plist calendar-url plist)))))
(deferred:nextc it
(lambda (token)
(cond ((eq fun 'org-gcal-sync)
(org-gcal-sync (plist-get token :access_token) skip-export))
((eq fun 'org-gcal--post-event)
(org-gcal--post-event start end smry loc desc id (plist-get token :access_token)))
(org-gcal--post-event start end smry loc desc calendar-url id (plist-get token :access_token)))
((eq fun 'org-gcal--delete-event)
(org-gcal--delete-event id (plist-get token :access_token))))))))
(org-gcal--delete-event id (plist-get token :access_token))))))))))

;; Internal
(defun org-gcal--archive-old-event ()
Expand Down Expand Up @@ -444,29 +456,29 @@ It returns the code provided by the service."
(decode-coding-string
(buffer-substring-no-properties (point-min) (point-max)) 'utf-8))))

(defun org-gcal--get-refresh-token ()
(if org-gcal-token-plist
(plist-get org-gcal-token-plist :refresh_token)
(defun org-gcal--get-refresh-token (calendar-url)
(if (plist-get org-gcal-tokens-plist calendar-url)
(plist-get (plist-get org-gcal-tokens-plist calendar-url) :refresh_token)
(progn
(if (file-exists-p org-gcal-token-file)
(if (file-exists-p (concat org-gcal-token-file calendar-url))
(progn
(with-temp-buffer (insert-file-contents org-gcal-token-file)
(with-temp-buffer (insert-file-contents (concat org-gcal-token-file calendar-url))
(plist-get (plist-get (read (buffer-string)) :token) :refresh_token)))
(org-gcal--notify
(concat org-gcal-token-file " is not exists" )
(concat "Make" org-gcal-token-file))))))
(concat (concat org-gcal-token-file calendar-url) " is not exists" )
(concat "Make" (concat org-gcal-token-file calendar-url)))))))

(defun org-gcal--get-access-token ()
(if org-gcal-token-plist
(plist-get org-gcal-token-plist :access_token)
(defun org-gcal--get-access-token (calendar-url)
(if (plist-get org-gcal-tokens-plist calendar-url)
(plist-get (plist-get org-gcal-tokens-plist calendar-url) :access_token)
(progn
(if (file-exists-p org-gcal-token-file)
(if (file-exists-p (concat org-gcal-token-file calendar-url))
(progn
(with-temp-buffer (insert-file-contents org-gcal-token-file)
(with-temp-buffer (insert-file-contents (concat org-gcal-token-file calendar-url))
(plist-get (plist-get (read (buffer-string)) :token) :access_token)))
(org-gcal--notify
(concat org-gcal-token-file " is not exists" )
(concat "Make " org-gcal-token-file))))))
(concat (concat org-gcal-token-file calendar-url) " is not exists" )
(concat "Make " (concat org-gcal-token-file calendar-url)))))))

(defun org-gcal--safe-substring (string from &optional to)
"Calls the `substring' function safely.
Expand Down Expand Up @@ -625,14 +637,14 @@ TO. Instead an empty string is returned."
(defun org-gcal--param-date-alt (str)
(if (< 11 (length str)) "date" "dateTime"))

(defun org-gcal--post-event (start end smry loc desc &optional id a-token skip-import skip-export)
(defun org-gcal--post-event (start end smry loc desc calendar-url &optional id a-token skip-import skip-export)
(let ((stime (org-gcal--param-date start))
(etime (org-gcal--param-date end))
(stime-alt (org-gcal--param-date-alt start))
(etime-alt (org-gcal--param-date-alt end))
(a-token (if a-token
a-token
(org-gcal--get-access-token))))
(org-gcal--get-access-token calendar-url))))
(request
(concat
(format org-gcal-events-url (car (car org-gcal-file-alist)))
Expand Down Expand Up @@ -718,16 +730,16 @@ TO. Instead an empty string is returned."

(add-hook 'org-capture-before-finalize-hook 'org-gcal--capture-post)

(defun org-gcal--ensure-token ()
(defun org-gcal--ensure-token (calendar-url)
(cond
(org-gcal-token-plist t)
((and (file-exists-p org-gcal-token-file)
((plist-get org-gcal-tokens-plist calendar-url) t)
((and (file-exists-p (concat org-gcal-token-file calendar-url))
(ignore-errors
(setq org-gcal-token-plist
(setq org-gcal-tokens-plist (plist-put org-gcal-tokens-plist calendar-url
(with-temp-buffer
(insert-file-contents org-gcal-token-file)
(plist-get (read (current-buffer)) :token))))) t)
(t (org-gcal-request-token))))
(insert-file-contents (concat org-gcal-token-file calendar-url))
(plist-get (read (current-buffer)) :token)))))) t)
(t (org-gcal-request-token calendar-url))))

(defun org-gcal--timestamp-successor ()
"Search for the next timestamp object.
Expand Down

0 comments on commit 34b2ec6

Please sign in to comment.