More robust local dev experience

gimlet-io · Nov 12, 2024 · 11ee5a8 · 11ee5a8
1 parent 422eafc
commit 11ee5a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/dashboard/server/auth.go b/pkg/dashboard/server/auth.go
@@ -185,14 +185,18 @@ func getOrCreateUser(store *store.Store, scmUser *scm.User, token *login.Token)
 }
 
 func setSessionCookie(w http.ResponseWriter, r *http.Request, user *model.User) error {
-	fortyEightHours, _ := time.ParseDuration("48h")
-	exp := time.Now().Add(fortyEightHours).Unix()
-	t := token.New(token.SessToken, user.Login, "")
-	tokenStr, err := t.SignExpires(user.Secret, exp)
+	tokenStr, err := generateSessionCookie(user.Login, user.Secret)
 	if err != nil {
 		return err
 	}
 
 	httputil.SetCookie(w, r, "user_sess", tokenStr)
 	return nil
 }
+
+func generateSessionCookie(user, secret string) (string, error) {
+	fortyEightHours, _ := time.ParseDuration("48h")
+	exp := time.Now().Add(fortyEightHours).Unix()
+	t := token.New(token.SessToken, user, "")
+	return t.SignExpires(secret, exp)
+}
diff --git a/web/src/views/envConfig/databasesTab.jsx b/web/src/views/envConfig/databasesTab.jsx
@@ -60,6 +60,10 @@ export function DatabasesTab(props) {
         const dependency = dependencies[id]
         const module = dependencyCatalog.find(m => m.reference.chart.repository === dependency.chart.repository)
 
+        if (!module) {
+          return null
+        }
+
         return (
           <div key={id} className='relative'>
             <button onClick={() => deleteDependency(id)} className="destructiveButtonSecondary absolute top-6 right-6">Delete</button>