webui: Get database owner and name from DB details data structure

The database owner and name were taken from their own data structure
even though most pages are providing a data structure with database
details including the database name. This commit adds the database owner
to that structure and removes the extra data structure for the name.

Author: MKleusberg

common/postgresql.go

@@ -652,9 +652,16 @@ func DBDetails(DB *SQLiteDBinfo, loggedInUser, dbOwner, dbFolder, dbName, commit
 		DB.Info.Licence = "Not specified"
 	}
 
+	// Retrieve correctly capitalised username for the database owner
+	usrOwner, err := User(dbOwner)
+	if err != nil {
+		return err
+	}
+
 	// Fill out the fields we already have data for
 	DB.Info.Database = dbName
 	DB.Info.Folder = dbFolder
+	DB.Info.Owner = usrOwner.Username
 
 	// The social stats are always updated because they could change without the cache being updated
 	DB.Info.Watchers, DB.Info.Stars, DB.Info.Forks, err = SocialStats(dbOwner, dbFolder, dbName)

common/types.go

@@ -163,6 +163,12 @@ type CommitEntry struct {
 	Tree           DBTree    `json:"tree"`
 }
 
+type DatabaseName struct {
+	Database string
+	Folder   string
+	Owner    string
+}
+
 type DataValue struct {
 	Name  string
 	Type  ValType
@@ -226,6 +232,7 @@ type DBInfo struct {
 	LicenceURL    string
 	MRs           int
 	OneLineDesc   string
+	Owner         string
 	Public        bool
 	RepoModified  time.Time
 	Releases      int
@@ -346,12 +353,6 @@ type MergeRequestEntry struct {
 	State        MergeRequestState `json:"state"`
 }
 
-type MetaInfo struct {
-	Database string
-	Folder   string
-	Owner    string
-}
-
 type ReleaseEntry struct {
 	Commit        string    `json:"commit"`
 	Date          time.Time `json:"date"`

webui/main.go

@@ -379,32 +379,6 @@ func checkLogin(r *http.Request) (loggedInUser string, validSession bool, err er
 	return
 }
 
-func collectDatabaseInfo(r *http.Request, meta *com.MetaInfo) (errCode int, err error) {
-	// TODO: Add folder and branch name support
-	dbOwner, dbName, err := com.GetOD(1, r) // 1 = Ignore "/xxx/" at the start of the URL
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	// Validate the supplied information
-	if dbOwner == "" || dbName == "" {
-		return http.StatusBadRequest, fmt.Errorf("Missing database owner or database name")
-	}
-
-	// Retrieve correctly capitalised username for the database owner
-	usr, err := com.User(dbOwner)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	// Store information
-	meta.Database = dbName
-	meta.Owner = usr.Username
-	meta.Folder = "/"
-
-	return
-}
-
 func collectPageMetaInfo(r *http.Request, pageMeta *PageMetaInfo) (errCode int, err error) {
 	// Auth0 info
 	pageMeta.Auth0.CallbackURL = "https://" + com.Conf.Web.ServerName + "/x/callback"
@@ -2977,6 +2951,31 @@ func generateCertHandler(w http.ResponseWriter, r *http.Request) {
 	return
 }
 
+func getDatabaseName(r *http.Request) (db com.DatabaseName, err error) {
+	// TODO: Add folder and branch name support
+	db.Owner, db.Database, err = com.GetOD(1, r) // 1 = Ignore "/xxx/" at the start of the URL
+	if err != nil {
+		return
+	}
+
+	// Validate the supplied information
+	if db.Owner == "" || db.Database == "" {
+		return db, fmt.Errorf("Missing database owner or database name")
+	}
+
+	// Retrieve correctly capitalised username for the database owner
+	usr, err := com.User(db.Owner)
+	if err != nil {
+		return db, err
+	}
+
+	// Store information
+	db.Owner = usr.Username
+	db.Folder = "/"
+
+	return
+}
+
 // Removes the logged in users session information.
 func logoutHandler(w http.ResponseWriter, r *http.Request) {
 	// Remove session info