Remove uneeded ports from tunnel domain url when they are default

NHAS · Nov 29, 2024 · 0469808 · 0469808
1 parent e6f3728
commit 0469808
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/adminui/frontend/src/api/types.ts b/adminui/frontend/src/api/types.ts
@@ -48,7 +48,7 @@ export interface UsersGetAllResponseDTO {
 export enum UserEditActions {
   Lock = 'lock',
   Unlock = 'unlock',
-  RestMFA = 'resetMFA'
+  ResetMFA = 'resetMFA'
 }
 
 export interface EditUsersDTO {

diff --git a/adminui/frontend/src/pages/Users.vue b/adminui/frontend/src/pages/Users.vue
@@ -173,7 +173,7 @@ const selectedUsersHasLocked = computed(() => {
                 </button>
               </div>
               <div class="tooltip" :data-tip="'Reset ' + selectedUsers.length + ' users MFA'">
-                <button @click="updateUser(selectedUsers, UserEditActions.RestMFA)" class="btn btn-ghost btn-primary">
+                <button @click="updateUser(selectedUsers, UserEditActions.ResetMFA)" class="btn btn-ghost btn-primary">
                   Reset MFA <font-awesome-icon :icon="Icons.Refresh" />
                 </button>
               </div>

diff --git a/internal/data/config.go b/internal/data/config.go
@@ -374,7 +374,7 @@ func GetTunnelDomainUrl() (string, error) {
 
 	url := scheme + details.Domain
 	_, port, err := net.SplitHostPort(details.ListenAddress)
-	if err == nil {
+	if err == nil && ((scheme == "http://" && port != "80") || (scheme == "https://" && port != "443")) {
 		url = url + ":" + port
 	}
 

diff --git a/internal/router/session_manager.go b/internal/router/session_manager.go
@@ -153,7 +153,7 @@ func (c *Challenger) WS(w http.ResponseWriter, r *http.Request) {
 	// Upgrade HTTP connection to WebSocket connection
 	_c, err := c.upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Println(user.Username, remoteAddress, "failed to create websocket challenger:", err)
+		log.Println(user.Username, remoteAddress, "failed to create websocket:", err)
 		http.Error(w, "Server Error", http.StatusInternalServerError)
 		return
 	}