fix(NET-1540): add expiry time to rac connection data

models/structs.go

@@ -43,6 +43,7 @@ type UserRemoteGws struct {
 	Metadata          string    `json:"metadata"`
 	AllowedEndpoints  []string  `json:"allowed_endpoints"`
 	NetworkAddresses  []string  `json:"network_addresses"`
+	ExpiryTime        time.Time `json:"expiry_time"`
 }
 
 // UserRemoteGwsReq - struct to hold user remote acccess gws req

pro/controllers/users.go

@@ -880,6 +880,7 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
 				Metadata:          node.Metadata,
 				AllowedEndpoints:  getAllowedRagEndpoints(&node, host),
 				NetworkAddresses:  []string{network.AddressRange, network.AddressRange6},
+				ExpiryTime:        proLogic.GetExtClientExpiryTime(user),
 			})
 			userGws[node.Network] = gws
 			delete(userGwNodes, node.ID.String())
@@ -918,6 +919,7 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
 			Metadata:          node.Metadata,
 			AllowedEndpoints:  getAllowedRagEndpoints(&node, host),
 			NetworkAddresses:  []string{network.AddressRange, network.AddressRange6},
+			ExpiryTime:        proLogic.GetExtClientExpiryTime(user),
 		})
 		userGws[node.Network] = gws
 	}

pro/logic/extclients.go

@@ -0,0 +1,20 @@
+package logic
+
+import (
+	"time"
+
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+// GetExtClientExpiryTime - returns the expiry time for the external client
+func GetExtClientExpiryTime(owner *models.User) time.Time {
+	if servercfg.GetServerConfig().RacAutoDisable {
+		if owner.PlatformRoleID == models.SuperAdminRole || owner.PlatformRoleID == models.AdminRole {
+			return time.Time{}
+		}
+		validityDuration := servercfg.GetJwtValidityDuration()
+		return owner.LastLoginTime.Add(validityDuration)
+	}
+	return time.Time{}
+}