Inicio Explorar Axuda
Iniciar sesión
golang
/
netmaker
réplica de https://github.com/gravitl/netmaker
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

improve oauth message prompts

abhishek9686 hai 1 ano
pai
bee2a6523b
achega
f9fc0aaa40
Modificáronse 5 ficheiros con 38 adicións e 13 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 2 2
      auth/azure-ad.go
  2. 30 5
      auth/error.go
  3. 2 2
      auth/github.go
  4. 2 2
      auth/google.go
  5. 2 2
      auth/oidc.go

+ 2 - 2
auth/azure-ad.go
Ver ficheiro 

@@ -67,7 +67,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 
 	}
 
 	// check if user approval is already pending
 
 	if logic.IsPendingUser(content.UserPrincipalName) {
 
-		handleOauthUserNotAllowed(w)
 
+		handleOauthUserSignUpApprovalPending(w)
 
 		return
 
 	}
 
 	_, err = logic.GetUser(content.UserPrincipalName)
 
@@ -80,7 +80,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 
 				handleSomethingWentWrong(w)
 
 				return
 
 			}
 
-			handleOauthUserNotAllowed(w)
 
+			handleFirstTimeOauthUserSignUp(w)
 
 			return
 
 		} else {
 
 			handleSomethingWentWrong(w)

+ 30 - 5
auth/error.go
Ver ficheiro 

@@ -12,12 +12,26 @@ const oauthNotConfigured = `<!DOCTYPE html><html>
 
 
 const userNotAllowed = `<!DOCTYPE html><html>
 
 <body>
 
-<h3>Only Admins are allowed to access Dashboard.</h3>
 
-<h3>Furthermore, Admin has to approve your identity to have access to netmaker networks</h3>
 
-<p>Once your identity is approved, Non-Admins can access the netmaker networks using <a href="https://docs.netmaker.io/pro/rac.html" target="_blank" rel="noopener">RemoteAccessClient.</a></p>
 
+<h3>Only administrators can access the Dashboard. Please contact your administrator to elevate your account.</h3>
 
+<p>Non-Admins can access the netmaker networks using <a href="https://docs.netmaker.io/pro/rac.html" target="_blank" rel="noopener">RemoteAccessClient.</a></p>
 
 </body>
 
 </html>
 
 `
 
+
 
+const userFirstTimeSignUp = `<!DOCTYPE html><html>
 
+<body>
 
+<h3>Thank you for signing up. Please contact your administrator for access.</h3>
 
+</body>
 
+</html>
 
+`
 
+
 
+const userSignUpApprovalPending = `<!DOCTYPE html><html>
 
+<body>
 
+<h3>Your account is yet to be approved. Please contact your administrator for access.</h3>
 
+</body>
 
+</html>
 
+`
 
+
 
 const userNotFound = `<!DOCTYPE html><html>
 
 <body>
 
 <h3>User Not Found.</h3>
 
@@ -26,13 +40,13 @@ const userNotFound = `<!DOCTYPE html><html>
 
 
 const somethingwentwrong = `<!DOCTYPE html><html>
 
 <body>
 
-<h3>Something went wrong. Contact Admin</h3>
 
+<h3>Something went wrong. Contact Admin.</h3>
 
 </body>
 
 </html>`
 
 
 const notallowedtosignup = `<!DOCTYPE html><html>
 
 <body>
 
-<h3>You are not allowed to SignUp.</h3>
 
+<h3>Your email is not allowed. Please contact your administrator.</h3>
 
 </body>
 
 </html>`
 
 
@@ -47,6 +61,17 @@ func handleOauthUserNotAllowed(response http.ResponseWriter) {
 
 	response.WriteHeader(http.StatusForbidden)
 
 	response.Write([]byte(userNotAllowed))
 
 }
 
+func handleFirstTimeOauthUserSignUp(response http.ResponseWriter) {
 
+	response.Header().Set("Content-Type", "text/html; charset=utf-8")
 
+	response.WriteHeader(http.StatusForbidden)
 
+	response.Write([]byte(userFirstTimeSignUp))
 
+}
 
+
 
+func handleOauthUserSignUpApprovalPending(response http.ResponseWriter) {
 
+	response.Header().Set("Content-Type", "text/html; charset=utf-8")
 
+	response.WriteHeader(http.StatusForbidden)
 
+	response.Write([]byte(userSignUpApprovalPending))
 
+}
 
 
 func handleOauthUserNotAllowedToSignUp(response http.ResponseWriter) {
 
 	response.Header().Set("Content-Type", "text/html; charset=utf-8")

+ 2 - 2
auth/github.go
Ver ficheiro 

@@ -67,7 +67,7 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 
 	}
 
 	// check if user approval is already pending
 
 	if logic.IsPendingUser(content.Login) {
 
-		handleOauthUserNotAllowed(w)
 
+		handleOauthUserSignUpApprovalPending(w)
 
 		return
 
 	}
 
 	_, err = logic.GetUser(content.Login)
 
@@ -80,7 +80,7 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 
 				handleSomethingWentWrong(w)
 
 				return
 
 			}
 
-			handleOauthUserNotAllowed(w)
 
+			handleFirstTimeOauthUserSignUp(w)
 
 			return
 
 		} else {
 
 			handleSomethingWentWrong(w)

+ 2 - 2
auth/google.go
Ver ficheiro 

@@ -69,7 +69,7 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 
 	}
 
 	// check if user approval is already pending
 
 	if logic.IsPendingUser(content.Email) {
 
-		handleOauthUserNotAllowed(w)
 
+		handleOauthUserSignUpApprovalPending(w)
 
 		return
 
 	}
 
 	_, err = logic.GetUser(content.Email)
 
@@ -82,7 +82,7 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 
 				handleSomethingWentWrong(w)
 
 				return
 
 			}
 
-			handleOauthUserNotAllowed(w)
 
+			handleFirstTimeOauthUserSignUp(w)
 
 			return
 
 		} else {
 
 			handleSomethingWentWrong(w)

+ 2 - 2
auth/oidc.go
Ver ficheiro 

@@ -80,7 +80,7 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 
 	}
 
 	// check if user approval is already pending
 
 	if logic.IsPendingUser(content.Email) {
 
-		handleOauthUserNotAllowed(w)
 
+		handleOauthUserSignUpApprovalPending(w)
 
 		return
 
 	}
 
 	_, err = logic.GetUser(content.Email)
 
@@ -93,7 +93,7 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 
 				handleSomethingWentWrong(w)
 
 				return
 
 			}
 
-			handleOauthUserNotAllowed(w)
 
+			handleFirstTimeOauthUserSignUp(w)
 
 			return
 
 		} else {
 
 			handleSomethingWentWrong(w)