Fix gofmt for changed files
This commit is contained in:
		
							parent
							
								
									417fde190c
								
							
						
					
					
						commit
						6366690927
					
				| 
						 | 
					@ -14,9 +14,9 @@ import (
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/mbland/hmacauth"
 | 
						"github.com/mbland/hmacauth"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/encryption"
 | 
						"github.com/pusher/oauth2_proxy/pkg/encryption"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/providers"
 | 
						"github.com/pusher/oauth2_proxy/providers"
 | 
				
			||||||
	"github.com/yhat/wsutil"
 | 
						"github.com/yhat/wsutil"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,8 +15,8 @@ import (
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/mbland/hmacauth"
 | 
						"github.com/mbland/hmacauth"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/sessions/cookie"
 | 
						"github.com/pusher/oauth2_proxy/pkg/sessions/cookie"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/providers"
 | 
						"github.com/pusher/oauth2_proxy/providers"
 | 
				
			||||||
	"github.com/stretchr/testify/assert"
 | 
						"github.com/stretchr/testify/assert"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,10 +17,10 @@ import (
 | 
				
			||||||
	oidc "github.com/coreos/go-oidc"
 | 
						oidc "github.com/coreos/go-oidc"
 | 
				
			||||||
	"github.com/dgrijalva/jwt-go"
 | 
						"github.com/dgrijalva/jwt-go"
 | 
				
			||||||
	"github.com/mbland/hmacauth"
 | 
						"github.com/mbland/hmacauth"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/options"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/options"
 | 
				
			||||||
	sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/encryption"
 | 
						"github.com/pusher/oauth2_proxy/pkg/encryption"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/sessions"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/providers"
 | 
						"github.com/pusher/oauth2_proxy/providers"
 | 
				
			||||||
	"gopkg.in/natefinch/lumberjack.v2"
 | 
						"gopkg.in/natefinch/lumberjack.v2"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,8 +6,8 @@ import (
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/options"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/options"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// MakeCookie constructs a cookie from the given parameters,
 | 
					// MakeCookie constructs a cookie from the given parameters,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,8 +7,8 @@ import (
 | 
				
			||||||
	"net/url"
 | 
						"net/url"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/bitly/go-simplejson"
 | 
						"github.com/bitly/go-simplejson"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/requests"
 | 
						"github.com/pusher/oauth2_proxy/pkg/requests"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,8 +10,8 @@ import (
 | 
				
			||||||
	"strconv"
 | 
						"strconv"
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GitHubProvider represents an GitHub based Identity Provider
 | 
					// GitHubProvider represents an GitHub based Identity Provider
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,8 +4,8 @@ import (
 | 
				
			||||||
	"net/http"
 | 
						"net/http"
 | 
				
			||||||
	"net/url"
 | 
						"net/url"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/requests"
 | 
						"github.com/pusher/oauth2_proxy/pkg/requests"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,8 +13,8 @@ import (
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
					 | 
				
			||||||
	"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
						"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
 | 
				
			||||||
 | 
						"github.com/pusher/oauth2_proxy/pkg/logger"
 | 
				
			||||||
	"golang.org/x/oauth2"
 | 
						"golang.org/x/oauth2"
 | 
				
			||||||
	"golang.org/x/oauth2/google"
 | 
						"golang.org/x/oauth2/google"
 | 
				
			||||||
	admin "google.golang.org/api/admin/directory/v1"
 | 
						admin "google.golang.org/api/admin/directory/v1"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue