license status

Author: OutOfBedlam

api/do.go

@@ -79,13 +79,14 @@ type IndexInfo struct {
 }
 
 type LicenseInfo struct {
-	Id          string `json:"id"`
-	Type        string `json:"type"`
-	Customer    string `json:"customer"`
-	Project     string `json:"project"`
-	CountryCode string `json:"countryCode"`
-	InstallDate string `json:"installDate"`
-	IssueDate   string `json:"issueDate"`
+	Id            string `json:"id"`
+	Type          string `json:"type"`
+	Customer      string `json:"customer"`
+	Project       string `json:"project"`
+	CountryCode   string `json:"countryCode"`
+	InstallDate   string `json:"installDate"`
+	IssueDate     string `json:"issueDate"`
+	LicenseStatus string `json:"licenseStatus,omitempty"`
 }
 
 type TagInfo struct {

api/do_license.go

@@ -15,6 +15,8 @@ func GetLicenseInfo(ctx context.Context, conn Conn) (*LicenseInfo, error) {
 	if err := row.Scan(&ret.Id, &ret.Type, &ret.Customer, &ret.Project, &ret.CountryCode, &ret.InstallDate, &ret.IssueDate); err != nil {
 		return nil, err
 	}
+	// TODO: get license status
+	ret.LicenseStatus = "Valid"
 	return ret, nil
 }
 

mods/server/http.go

@@ -760,8 +760,8 @@ func (svr *httpd) handleCheck(ctx *gin.Context) {
 		svr.licenseStatusLastTime = time.Now()
 		svr.licenseStatus = "Unknown"
 		if conn, err := svr.getUserConnection(ctx); err == nil {
-			if _, err = api.GetLicenseInfo(ctx, conn); err == nil {
-				svr.licenseStatus = "Valid"
+			if nfo, err := api.GetLicenseInfo(ctx, conn); err == nil {
+				svr.licenseStatus = nfo.LicenseStatus
 			}
 			conn.Close()
 		}