e2e: Use the existing logged_in context for page

The api.MarkupOptions{} struct will have a RelativePath which depicts
the relative path to the repository root + BranchPath which contains the
current branch. The RenderMarkup function utilizes a struct since there
are too many variables passed as arguments and that is not a good sign
for readability.

models/user/email_address.go

@@ -139,38 +139,6 @@ func GetPrimaryEmailAddressOfUser(ctx context.Context, uid int64) (*EmailAddress
 	return ea, nil
 }
 
-// Deletes the primary email address of the user
-// This is only allowed if the user is a organization
-func DeletePrimaryEmailAddressOfUser(ctx context.Context, uid int64) error {
-	user, err := GetUserByID(ctx, uid)
-	if err != nil {
-		return err
-	}
-
-	if user.Type != UserTypeOrganization {
-		return fmt.Errorf("%s is not a organization", user.Name)
-	}
-
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-
-	_, err = db.GetEngine(ctx).Exec("DELETE FROM email_address WHERE uid = ? AND is_primary = true", uid)
-	if err != nil {
-		return err
-	}
-
-	user.Email = ""
-	err = UpdateUserCols(ctx, user, "email")
-	if err != nil {
-		return err
-	}
-
-	return committer.Commit()
-}
-
 // GetEmailAddresses returns all email addresses belongs to given user.
 func GetEmailAddresses(ctx context.Context, uid int64) ([]*EmailAddress, error) {
 	emails := make([]*EmailAddress, 0, 5)

models/user/email_address_test.go

@@ -163,21 +163,3 @@ func TestGetActivatedEmailAddresses(t *testing.T) {
 		})
 	}
 }
-
-func TestDeletePrimaryEmailAddressOfUser(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-
-	user, err := user_model.GetUserByName(db.DefaultContext, "org3")
-	require.NoError(t, err)
-	assert.Equal(t, "org3@example.com", user.Email)
-
-	require.NoError(t, user_model.DeletePrimaryEmailAddressOfUser(db.DefaultContext, user.ID))
-
-	user, err = user_model.GetUserByName(db.DefaultContext, "org3")
-	require.NoError(t, err)
-	assert.Empty(t, user.Email)
-
-	email, err := user_model.GetPrimaryEmailAddressOfUser(db.DefaultContext, user.ID)
-	assert.True(t, user_model.IsErrEmailAddressNotExist(err))
-	assert.Nil(t, email)
-}

modules/structs/org.go

@@ -47,11 +47,11 @@ type CreateOrgOption struct {
 
 // EditOrgOption options for editing an organization
 type EditOrgOption struct {
-	FullName    string  `json:"full_name" binding:"MaxSize(100)"`
-	Email       *string `json:"email" binding:"MaxSize(255)"`
-	Description string  `json:"description" binding:"MaxSize(255)"`
-	Website     string  `json:"website" binding:"ValidUrl;MaxSize(255)"`
-	Location    string  `json:"location" binding:"MaxSize(50)"`
+	FullName    string `json:"full_name" binding:"MaxSize(100)"`
+	Email       string `json:"email" binding:"MaxSize(255)"`
+	Description string `json:"description" binding:"MaxSize(255)"`
+	Website     string `json:"website" binding:"ValidUrl;MaxSize(255)"`
+	Location    string `json:"location" binding:"MaxSize(50)"`
 	// possible values are `public`, `limited` or `private`
 	// enum: ["public", "limited", "private"]
 	Visibility                string `json:"visibility" binding:"In(,public,limited,private)"`

routers/api/v1/org/org.go

@@ -15,7 +15,6 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/optional"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/validation"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/api/v1/user"
 	"code.gitea.io/gitea/routers/api/v1/utils"
@@ -341,28 +340,13 @@ func Edit(ctx *context.APIContext) {
 	//     "$ref": "#/responses/Organization"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
-	//   "422":
-	//     "$ref": "#/responses/error"
 
 	form := web.GetForm(ctx).(*api.EditOrgOption)
 
-	if form.Email != nil {
-		if *form.Email == "" {
-			err := user_model.DeletePrimaryEmailAddressOfUser(ctx, ctx.Org.Organization.ID)
-			if err != nil {
-				ctx.Error(http.StatusInternalServerError, "DeletePrimaryEmailAddressOfUser", err)
-				return
-			}
-			ctx.Org.Organization.Email = ""
-		} else {
-			if err := user_service.ReplacePrimaryEmailAddress(ctx, ctx.Org.Organization.AsUser(), *form.Email); err != nil {
-				if validation.IsErrEmailInvalid(err) || validation.IsErrEmailCharIsNotSupported(err) {
-					ctx.Error(http.StatusUnprocessableEntity, "ReplacePrimaryEmailAddress", err)
-				} else {
-					ctx.Error(http.StatusInternalServerError, "ReplacePrimaryEmailAddress", err)
-				}
-				return
-			}
+	if form.Email != "" {
+		if err := user_service.ReplacePrimaryEmailAddress(ctx, ctx.Org.Organization.AsUser(), form.Email); err != nil {
+			ctx.Error(http.StatusInternalServerError, "ReplacePrimaryEmailAddress", err)
+			return
 		}
 	}
 

routers/web/org/setting.go

@@ -93,13 +93,7 @@ func SettingsPost(ctx *context.Context) {
 		ctx.Org.OrgLink = setting.AppSubURL + "/org/" + url.PathEscape(org.Name)
 	}
 
-	if form.Email == "" {
-		err := user_model.DeletePrimaryEmailAddressOfUser(ctx, org.ID)
-		if err != nil {
-			ctx.ServerError("DeletePrimaryEmailAddressOfUser", err)
-			return
-		}
-	} else {
+	if form.Email != "" {
 		if err := user_service.ReplacePrimaryEmailAddress(ctx, org.AsUser(), form.Email); err != nil {
 			ctx.Data["Err_Email"] = true
 			ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSettingsOptions, &form)

templates/repo/commit_page.tmpl

@@ -278,9 +278,9 @@
 					<strong>{{.NoteCommit.Author.Name}}</strong>
 				{{end}}
 				<span class="text grey" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span>
-				{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
+				{{if or ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
 					<div class="ui right">
-						<button id="commit-notes-edit-button" class="ui tiny primary button">{{ctx.Locale.Tr "edit"}}</button>
+						<button id="commit-notes-edit-button" class="ui tiny primary button" data-modal="#delete-note-modal">{{ctx.Locale.Tr "edit"}}</button>
 						<button class="ui tiny button red show-modal" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button>
 					</div>
 					<div class="ui small modal" id="delete-note-modal">

templates/swagger/v1_json.tmpl

@@ -2263,9 +2263,6 @@
           },
           "404": {
             "$ref": "#/responses/notFound"
-          },
-          "422": {
-            "$ref": "#/responses/error"
           }
         }
       }

tests/e2e/markdown-editor.test.e2e.ts

@@ -14,29 +14,28 @@ test.beforeAll(async ({browser}, workerInfo) => {
 test('Markdown image preview behaviour', async ({browser}, workerInfo) => {
   const context = await load_logged_in_context(browser, workerInfo, 'user2');
 
-  // Editing the root README.md file for image preview
+  // editing the root README.md file for image preview
   const editPath = '/user2/repo1/src/branch/master/README.md';
 
   const page = await context.newPage();
   const response = await page.goto(editPath, {waitUntil: 'domcontentloaded'});
   expect(response?.status()).toBe(200);
 
-  // Click 'Edit file' tab
+  // click 'Edit file' tab
   await page.locator('[data-tooltip-content="Edit file"]').click();
 
-  // This yields the monaco editor
+  // this yields the monaco editor
   const editor = page.getByRole('presentation').nth(0);
-  await expect(editor).toBeVisible();
   await editor.click();
-  // Clear all the content
+  // clear all the content
   await page.keyboard.press('ControlOrMeta+KeyA');
-  // Add the image
+  // add the image
   await page.keyboard.type('![Logo of Forgejo](./assets/logo.svg "Logo of Forgejo")');
 
-  // Click 'Preview' tab
+  // click 'Preview' tab
   await page.locator('a[data-tab="preview"]').click();
 
-  // Check for the image preview via the expected attribute
+  // check for the image preview via the expected attribute
   const preview = page.locator('div[data-tab="preview"] p[dir="auto"] a');
   await expect(preview).toHaveAttribute('href', 'http://localhost:3003/user2/repo1/media/branch/master/assets/logo.svg');
 });

tests/integration/api_org_test.go

@@ -218,57 +218,3 @@ func TestAPIOrgSearchEmptyTeam(t *testing.T) {
 		assert.EqualValues(t, "Empty", data.Data[0].Name)
 	}
 }
-
-func TestAPIOrgChangeEmail(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	session := loginUser(t, "user1")
-	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
-
-	t.Run("Invalid", func(t *testing.T) {
-		newMail := "invalid"
-		settings := api.EditOrgOption{Email: &newMail}
-
-		resp := MakeRequest(t, NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &settings).AddTokenAuth(token), http.StatusUnprocessableEntity)
-
-		var org *api.Organization
-		DecodeJSON(t, resp, &org)
-
-		assert.Empty(t, org.Email)
-	})
-
-	t.Run("Valid", func(t *testing.T) {
-		newMail := "example@example.com"
-		settings := api.EditOrgOption{Email: &newMail}
-
-		resp := MakeRequest(t, NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &settings).AddTokenAuth(token), http.StatusOK)
-
-		var org *api.Organization
-		DecodeJSON(t, resp, &org)
-
-		assert.Equal(t, "example@example.com", org.Email)
-	})
-
-	t.Run("NoChange", func(t *testing.T) {
-		settings := api.EditOrgOption{}
-
-		resp := MakeRequest(t, NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &settings).AddTokenAuth(token), http.StatusOK)
-
-		var org *api.Organization
-		DecodeJSON(t, resp, &org)
-
-		assert.Equal(t, "example@example.com", org.Email)
-	})
-
-	t.Run("Empty", func(t *testing.T) {
-		newMail := ""
-		settings := api.EditOrgOption{Email: &newMail}
-
-		resp := MakeRequest(t, NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &settings).AddTokenAuth(token), http.StatusOK)
-
-		var org *api.Organization
-		DecodeJSON(t, resp, &org)
-
-		assert.Empty(t, org.Email)
-	})
-}

tests/integration/org_settings_test.go

@@ -1,89 +0,0 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package integration
-
-import (
-	"fmt"
-	"net/http"
-	"testing"
-
-	auth_model "code.gitea.io/gitea/models/auth"
-	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/tests"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func getOrgSettingsFormData(t *testing.T, session *TestSession, orgName string) map[string]string {
-	return map[string]string{
-		"_csrf":                         GetCSRF(t, session, fmt.Sprintf("/org/%s/settings", orgName)),
-		"name":                          orgName,
-		"full_name":                     "",
-		"email":                         "",
-		"description":                   "",
-		"website":                       "",
-		"location":                      "",
-		"visibility":                    "0",
-		"repo_admin_change_team_access": "on",
-		"max_repo_creation":             "-1",
-	}
-}
-
-func getOrgSettings(t *testing.T, token, orgName string) *api.Organization {
-	t.Helper()
-
-	req := NewRequestf(t, "GET", "/api/v1/orgs/%s", orgName).AddTokenAuth(token)
-	resp := MakeRequest(t, req, http.StatusOK)
-
-	var org *api.Organization
-	DecodeJSON(t, resp, &org)
-
-	return org
-}
-
-func TestOrgSettingsChangeEmail(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	const orgName = "org3"
-	settingsURL := fmt.Sprintf("/org/%s/settings", orgName)
-
-	session := loginUser(t, "user1")
-	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization)
-
-	t.Run("Invalid", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
-
-		settings := getOrgSettingsFormData(t, session, orgName)
-
-		settings["email"] = "invalid"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK)
-
-		org := getOrgSettings(t, token, orgName)
-		assert.Equal(t, "org3@example.com", org.Email)
-	})
-
-	t.Run("Valid", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
-
-		settings := getOrgSettingsFormData(t, session, orgName)
-
-		settings["email"] = "example@example.com"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
-
-		org := getOrgSettings(t, token, orgName)
-		assert.Equal(t, "example@example.com", org.Email)
-	})
-
-	t.Run("Empty", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
-
-		settings := getOrgSettingsFormData(t, session, orgName)
-
-		settings["email"] = ""
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
-
-		org := getOrgSettings(t, token, orgName)
-		assert.Empty(t, org.Email)
-	})
-}

tests/integration/repo_git_note_test.go

@@ -5,8 +5,6 @@ import (
 	"net/url"
 	"testing"
 
-	"code.gitea.io/gitea/tests"
-
 	"github.com/stretchr/testify/assert"
 )
 
@@ -44,29 +42,3 @@ func TestRepoModifyGitNotes(t *testing.T) {
 		})
 	})
 }
-
-func TestRepoGitNotesButtonsVisible(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		t.Run("With Permission", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-
-			session := loginUser(t, "user2")
-
-			req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d")
-			resp := session.MakeRequest(t, req, http.StatusOK)
-
-			assert.Contains(t, resp.Body.String(), "id=\"commit-notes-edit-button\"")
-			assert.Contains(t, resp.Body.String(), "data-modal=\"#delete-note-modal\"")
-		})
-
-		t.Run("Without Permission", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-
-			req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d")
-			resp := MakeRequest(t, req, http.StatusOK)
-
-			assert.NotContains(t, resp.Body.String(), "id=\"commit-notes-edit-button\"")
-			assert.NotContains(t, resp.Body.String(), "data-modal=\"#delete-note-modal\"")
-		})
-	})
-}