git.iko.soy/typeable/oauth2-proxy
on master help sign in
Add ProviderName field; use in sign_in template
commit666e6ad436f4df42e2c627d083d2c1af8921e45f authorMike Bland <michael.bland@gsa.gov> dateTue 31 Mar 2015, 12:59 (12 years ago) parent0136ab0
5 files changed+16−9
compare with master
unifiedsplit
oauthproxy.go+2 providers/google.go+1 providers/google_test.go+7−4 providers/provider_data.go+5−4 templates.go+1−1
oauthproxy.go+2
@@ -279,11 +279,13 @@ func (p *OauthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
279279 rw.WriteHeader(code)
280280
281281 t := struct {
282+ ProviderName string
282283 SignInMessage string
283284 CustomLogin bool
284285 Redirect string
285286 Version string
286287 }{
288+ ProviderName: p.provider.Data().ProviderName,
287289 SignInMessage: p.SignInMessage,
288290 CustomLogin: p.displayCustomLoginForm(),
289291 Redirect: req.URL.RequestURI(),
providers/google.go+1
@@ -13,6 +13,7 @@ type GoogleProvider struct {
1313}
1414
1515func NewGoogleProvider(p *ProviderData) *GoogleProvider {
16+ p.ProviderName = "Google"
1617 if p.LoginUrl.String() == "" {
1718 p.LoginUrl = &url.URL{Scheme: "https",
1819 Host: "accounts.google.com",
providers/google_test.go+7−4
@@ -11,15 +11,17 @@ import (
1111func newGoogleProvider() *GoogleProvider {
1212 return NewGoogleProvider(
1313 &ProviderData{
14− LoginUrl: &url.URL{},
15− RedeemUrl: &url.URL{},
16− ProfileUrl: &url.URL{},
17− Scope: ""})
14+ ProviderName: "",
15+ LoginUrl: &url.URL{},
16+ RedeemUrl: &url.URL{},
17+ ProfileUrl: &url.URL{},
18+ Scope: ""})
1819}
1920
2021func TestGoogleProviderDefaults(t *testing.T) {
2122 p := newGoogleProvider()
2223 assert.NotEqual(t, nil, p)
24+ assert.Equal(t, "Google", p.Data().ProviderName)
2325 assert.Equal(t, "https://accounts.google.com/o/oauth2/auth",
2426 p.Data().LoginUrl.String())
2527 assert.Equal(t, "https://accounts.google.com/o/oauth2/token",
@@ -45,6 +47,7 @@ func TestGoogleProviderOverrides(t *testing.T) {
4547 Path: "/oauth/profile"},
4648 Scope: "profile"})
4749 assert.NotEqual(t, nil, p)
50+ assert.Equal(t, "Google", p.Data().ProviderName)
4851 assert.Equal(t, "https://example.com/oauth/auth",
4952 p.Data().LoginUrl.String())
5053 assert.Equal(t, "https://example.com/oauth/token",
providers/provider_data.go+5−4
@@ -5,10 +5,11 @@ import (
55)
66
77type ProviderData struct {
8− LoginUrl *url.URL
9− RedeemUrl *url.URL
10− ProfileUrl *url.URL
11− Scope string
8+ ProviderName string
9+ LoginUrl *url.URL
10+ RedeemUrl *url.URL
11+ ProfileUrl *url.URL
12+ Scope string
1213}
1314
1415func (p *ProviderData) Data() *ProviderData { return p }
templates.go+1−1
@@ -115,7 +115,7 @@ func getTemplates() *template.Template {
115115 {{ if .SignInMessage }}
116116 <p>{{.SignInMessage}}</p>
117117 {{ end}}
118− <button type="submit" class="btn">Sign in with a Google Account</button><br/>
118+ <button type="submit" class="btn">Sign in with a {{.ProviderName}} Account</button><br/>
119119 </form>
120120 </div>
121121