update with new router logic

Author: akerl

Gopkg.lock

@@ -26,20 +26,20 @@
 
 
 [[constraint]]
+  branch = "master"
   name = "github.com/akerl/go-lambda"
-  version = "0.2.0"
 
 [[constraint]]
   name = "github.com/aymerick/raymond"
   version = "2.0.2"
 
 [[constraint]]
   name = "github.com/google/go-github"
-  version = "15.0.0"
+  version = "18.2.0"
 
 [[constraint]]
   name = "github.com/google/uuid"
-  version = "0.2.0"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/gorilla/securecookie"

Gopkg.toml

@@ -5,7 +5,7 @@ import (
 
 	"github.com/akerl/github-auth-lambda/session"
 
-	"github.com/akerl/go-lambda/apigw/router"
+	"github.com/akerl/go-lambda/mux"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 )
@@ -47,15 +47,13 @@ func main() {
 		Scopes:       scopes,
 	}
 
-	r := router.Router{
-		Routes: []router.Route{
-			{Path: authRegex, Handler: authHandler},
-			{Path: logoutRegex, Handler: logoutHandler},
-			{Path: callbackRegex, Handler: callbackHandler},
-			{Path: indexRegex, Handler: indexHandler},
-			{Path: faviconRegex, Handler: faviconHandler},
-			{Path: defaultRegex, Handler: defaultHandler},
-		},
-	}
-	r.Start()
+	d := mux.NewDispatcher(
+		mux.NewRoute(authRegex, authHandler),
+		mux.NewRoute(logoutRegex, logoutHandler),
+		mux.NewRoute(callbackRegex, callbackHandler),
+		mux.NewRoute(indexRegex, indexHandler),
+		mux.NewRoute(faviconRegex, faviconHandler),
+		mux.NewRoute(defaultRegex, defaultHandler),
+	)
+	mux.Start(d)
 }

main.go

@@ -156,7 +156,7 @@ func callbackHandler(req events.Request) (events.Response, error) {
 	}
 	sess.Login = *user.Login
 
-	teams, _, err := client.Organizations.ListUserTeams(context.Background(), &github.ListOptions{})
+	teams, _, err := client.Teams.ListUserTeams(context.Background(), &github.ListOptions{})
 	if err != nil {
 		return fail(fmt.Sprintf("error getting teams: %s", err))
 	}