Make OAuth URLs more consistent

Author: theandrew168

backend/web/api/handler.go

@@ -34,7 +34,7 @@ func Handler(
 
 	mux := http.NewServeMux()
 	mux.Handle("GET /articles", HandleArticleList(qry))
-	mux.Handle("GET /github/signin", HandleOAuthSignin(&githubConf))
-	mux.Handle("GET /google/signin", HandleOAuthSignin(&googleConf))
+	mux.Handle("GET /signin/github", HandleOAuthSignin(&githubConf))
+	mux.Handle("GET /signin/google", HandleOAuthSignin(&googleConf))
 	return mux
 }

backend/web/handler.go

@@ -100,15 +100,15 @@ func Handler(
 	// Check if the debug auth method should be enabled.
 	enableDebugAuth := os.Getenv("ENABLE_DEBUG_AUTH") != ""
 	if enableDebugAuth {
-		mux.Handle("POST /debug/signin", HandleDebugSignIn(conf.SecretKey, cmd))
+		mux.Handle("POST /signin/debug", HandleDebugSignIn(conf.SecretKey, cmd))
 	}
 
 	// Authenication routes.
 	mux.Handle("GET /signin", HandleSignIn(enableDebugAuth))
-	mux.Handle("GET /github/signin", HandleOAuthSignIn(&githubConf))
-	mux.Handle("GET /github/callback", HandleOAuthCallback(conf.SecretKey, cmd, &githubConf, FetchGithubUserID))
-	mux.Handle("GET /google/signin", HandleOAuthSignIn(&googleConf))
-	mux.Handle("GET /google/callback", HandleOAuthCallback(conf.SecretKey, cmd, &googleConf, FetchGoogleUserID))
+	mux.Handle("GET /signin/github", HandleOAuthSignIn(&githubConf))
+	mux.Handle("GET /signin/github/callback", HandleOAuthCallback(conf.SecretKey, cmd, &githubConf, FetchGithubUserID))
+	mux.Handle("GET /signin/google", HandleOAuthSignIn(&googleConf))
+	mux.Handle("GET /signin/google/callback", HandleOAuthCallback(conf.SecretKey, cmd, &googleConf, FetchGoogleUserID))
 	mux.Handle("POST /signout", HandleSignOutForm(cmd))
 
 	// Public blog routes.

backend/web/page/signin.html

@@ -7,7 +7,7 @@ <h2 class="signin__heading">Welcome!</h2>
 		<hr />
 
 		{{if .EnableDebugAuth}}
-		<form method="POST" action="/debug/signin">
+		<form method="POST" action="/signin/debug">
 			<input type="hidden" name="csrf_token" value="{{$.CSRFToken}}" />
 			<button class="signin__button" type="submit">
 				<img class="signin__icon" src="/img/bloggulus.png" />
@@ -16,12 +16,12 @@ <h2 class="signin__heading">Welcome!</h2>
 		</form>
 		{{end}}
 
-		<a class="signin__button" href="/github/signin">
+		<a class="signin__button" href="/signin/github">
 			<img class="signin__icon" src="/img/github.png" />
 			Sign in with GitHub
 		</a>
 
-		<a class="signin__button" href="/google/signin">
+		<a class="signin__button" href="/signin/google">
 			<img class="signin__icon" src="/img/google.png" />
 			Sign in with Google
 		</a>