@@ -3,11 +3,11 @@ package providers
33import (
44 "errors"
55 "fmt"
6+ "github.com/bitly/go-simplejson"
67 "github.com/bitly/oauth2_proxy/api"
78 "log"
89 "net/http"
910 "net/url"
10− "github.com/bitly/go-simplejson"
1111)
1212
1313type AzureProvider struct {
@@ -67,26 +67,26 @@ func getAzureHeader(access_token string) http.Header {
6767}
6868
6969func getEmailFromJSON(json *simplejson.Json) (string, error) {
70− var email string
70+ var email string
7171 var err error
72−
72+
7373 email, err = json.Get("mail").String()
74−
74+
7575 if err != nil || email == "" {
7676 otherMails, otherMailsErr := json.Get("otherMails").Array()
77− if len(otherMails) > 0{
77+ if len(otherMails) > 0 {
7878 email = otherMails[0].(string)
7979 }
8080 err = otherMailsErr
8181 }
82−
82+
8383 return email, err
84− }
84+}
8585
8686func (p *AzureProvider) GetEmailAddress(s *SessionState) (string, error) {
8787 var email string
8888 var err error
89−
89+
9090 if s.AccessToken == "" {
9191 return "", errors.New("missing access token")
9292 }
@@ -109,16 +109,16 @@ func (p *AzureProvider) GetEmailAddress(s *SessionState) (string, error) {
109109 }
110110
111111 email, err = json.Get("userPrincipalName").String()
112−
112+
113113 if err != nil {
114114 log.Printf("failed making request %s", err)
115115 return "", err
116116 }
117−
117+
118118 if email == "" {
119119 log.Printf("failed to get email address")
120120 return "", err
121121 }
122−
122+
123123 return email, err
124124}