aboutsummaryrefslogtreecommitdiffstats
path: root/auth/file_source.go
diff options
context:
space:
mode:
authorPetter Rasmussen2017-02-01 23:59:09 +0100
committerGitHub2017-02-01 23:59:09 +0100
commit9a97a02661da67824828193fd90d6eb4bda67811 (patch)
treeaec26d4e9e10bb0abcb405c84facf8217af68fc7 /auth/file_source.go
parent0e05cfb6f84a714f9bdafade6d3cddbb8c8273e9 (diff)
parentb33b3e96eb6443ae3dff61e0e7b38bb529e328ea (diff)
downloadgdrive-9a97a02661da67824828193fd90d6eb4bda67811.tar.bz2
Merge pull request #252 from fab-io/master
New feature, support authentication via service account.
Diffstat (limited to 'auth/file_source.go')
-rw-r--r--auth/file_source.go15
1 files changed, 13 insertions, 2 deletions
diff --git a/auth/file_source.go b/auth/file_source.go
index 5200203..11e7325 100644
--- a/auth/file_source.go
+++ b/auth/file_source.go
@@ -31,7 +31,7 @@ func (self *fileSource) Token() (*oauth2.Token, error) {
return token, nil
}
-func ReadToken(path string) (*oauth2.Token, bool, error) {
+func ReadFile(path string) ([]byte, bool, error) {
if !fileExists(path) {
return nil, false, nil
}
@@ -40,8 +40,19 @@ func ReadToken(path string) (*oauth2.Token, bool, error) {
if err != nil {
return nil, true, err
}
+ return content, true, nil
+}
+
+
+func ReadToken(path string) (*oauth2.Token, bool, error) {
+
+ content, exists, err := ReadFile(path)
+ if err != nil {
+ return nil, exists, err
+ }
+
token := &oauth2.Token{}
- return token, true, json.Unmarshal(content, token)
+ return token, exists, json.Unmarshal(content, token)
}
func SaveToken(path string, token *oauth2.Token) error {