feat: callback will jump to blank page when from param start with "http" (#2778)

* fix: fix wechat media account can not bind

* fix: improve code format

controllers/application.go

@@ -177,7 +177,7 @@ func (c *ApiController) GetOrganizationApplications() {
 			return
 		}
 
-		applications, err = object.GetAllowedApplications(applications, userId)
+		applications, err = object.GetAllowedApplications(applications, userId, c.GetAcceptLanguage())
 		if err != nil {
 			c.ResponseError(err.Error())
 			return
@@ -194,13 +194,19 @@ func (c *ApiController) GetOrganizationApplications() {
 		}
 
 		paginator := pagination.SetPaginator(c.Ctx, limit, count)
-		application, err := object.GetPaginationOrganizationApplications(owner, organization, paginator.Offset(), limit, field, value, sortField, sortOrder)
+		applications, err := object.GetPaginationOrganizationApplications(owner, organization, paginator.Offset(), limit, field, value, sortField, sortOrder)
 		if err != nil {
 			c.ResponseError(err.Error())
 			return
 		}
 
-		applications := object.GetMaskedApplications(application, userId)
+		applications, err = object.GetAllowedApplications(applications, userId, c.GetAcceptLanguage())
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		applications = object.GetMaskedApplications(applications, userId)
 		c.ResponseOk(applications, paginator.Nums())
 	}
 }

deployment/deploy.go

@@ -27,7 +27,10 @@ import (
 )
 
 func deployStaticFiles(provider *object.Provider) {
-	storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint)
+	storageProvider, err := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint)
+	if err != nil {
+		panic(err)
+	}
 	if storageProvider == nil {
 		panic(fmt.Sprintf("the provider type: %s is not supported", provider.Type))
 	}

go.mod

@@ -9,10 +9,10 @@ require (
 	github.com/beego/beego v1.12.12
 	github.com/beevik/etree v1.1.0
 	github.com/casbin/casbin/v2 v2.77.2
-	github.com/casdoor/go-sms-sender v0.19.0
+	github.com/casdoor/go-sms-sender v0.20.0
 	github.com/casdoor/gomail/v2 v2.0.1
 	github.com/casdoor/notify v0.45.0
-	github.com/casdoor/oss v1.5.0
+	github.com/casdoor/oss v1.6.0
 	github.com/casdoor/xorm-adapter/v3 v3.1.0
 	github.com/casvisor/casvisor-go-sdk v1.0.3
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f

go.sum

@@ -1083,14 +1083,14 @@ github.com/casbin/casbin/v2 v2.77.2 h1:yQinn/w9x8AswiwqwtrXz93VU48R1aYTXdHEx4RI3
 github.com/casbin/casbin/v2 v2.77.2/go.mod h1:mzGx0hYW9/ksOSpw3wNjk3NRAroq5VMFYUQ6G43iGPk=
 github.com/casdoor/go-reddit/v2 v2.1.0 h1:kIbfdJ7AA7H0uTQ8s0q4GGZqSS5V9wVE74RrXyD9XPs=
 github.com/casdoor/go-reddit/v2 v2.1.0/go.mod h1:eagkvwlZ4Hcsuc/uQsLHYEulz5jN65SVSwV/AIE7zsc=
-github.com/casdoor/go-sms-sender v0.19.0 h1:qVz7RLXx8aGgfzLUGvhNe6pbhxDqP2/qNY+XPepfpyQ=
-github.com/casdoor/go-sms-sender v0.19.0/go.mod h1:cQs7qqohMJBgIVZebOCB8ko09naG1vzFJEH59VNIscs=
+github.com/casdoor/go-sms-sender v0.20.0 h1:yLbCakV04DzzehhgBklOrSeCFjMwpfKBeemz9b+Y8OM=
+github.com/casdoor/go-sms-sender v0.20.0/go.mod h1:cQs7qqohMJBgIVZebOCB8ko09naG1vzFJEH59VNIscs=
 github.com/casdoor/gomail/v2 v2.0.1 h1:J+FG6x80s9e5lBHUn8Sv0Y56mud34KiWih5YdmudR/w=
 github.com/casdoor/gomail/v2 v2.0.1/go.mod h1:VnGPslEAtpix5FjHisR/WKB1qvZDBaujbikxDe9d+2Q=
 github.com/casdoor/notify v0.45.0 h1:OlaFvcQFjGOgA4mRx07M8AH1gvb5xNo21mcqrVGlLgk=
 github.com/casdoor/notify v0.45.0/go.mod h1:wNHQu0tiDROMBIvz0j3Om3Lhd5yZ+AIfnFb8MYb8OLQ=
-github.com/casdoor/oss v1.5.0 h1:mi1htaXR5fynskDry1S3wk+Dd2nRY1z1pVcnGsqMqP4=
-github.com/casdoor/oss v1.5.0/go.mod h1:rJAWA0hLhtu94t6IRpotLUkXO1NWMASirywQYaGizJE=
+github.com/casdoor/oss v1.6.0 h1:IOWrGLJ+VO82qS796eaRnzFPPA1Sn3cotYTi7O/VIlQ=
+github.com/casdoor/oss v1.6.0/go.mod h1:rJAWA0hLhtu94t6IRpotLUkXO1NWMASirywQYaGizJE=
 github.com/casdoor/xorm-adapter/v3 v3.1.0 h1:NodWayRtSLVSeCvL9H3Hc61k0G17KhV9IymTCNfh3kk=
 github.com/casdoor/xorm-adapter/v3 v3.1.0/go.mod h1:4WTcUw+bTgBylGHeGHzTtBvuTXRS23dtwzFLl9tsgFM=
 github.com/casvisor/casvisor-go-sdk v1.0.3 h1:TKJQWKnhtznEBhzLPEdNsp7nJK2GgdD8JsB0lFPMW7U=

object/application.go

@@ -19,6 +19,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/casdoor/casdoor/i18n"
 	"github.com/casdoor/casdoor/util"
 	"github.com/xorm-io/core"
 )
@@ -222,7 +223,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Logo",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-logo-box {\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-logo-box {\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -230,7 +231,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Signin methods",
 			Visible:     true,
-			Label:       "\n<style>\n  .signin-methods {\n  }\n<style>\n",
+			Label:       "\n<style>\n  .signin-methods {\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -238,7 +239,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Username",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-username {\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-username {\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -246,7 +247,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Password",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-password {\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-password {\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -254,7 +255,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Agreement",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-agreement {\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-agreement {\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -262,7 +263,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Forgot password?",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-forget-password {\n    display: inline-flex;\n    justify-content: space-between;\n    width: 320px;\n    margin-bottom: 25px;\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-forget-password {\n    display: inline-flex;\n    justify-content: space-between;\n    width: 320px;\n    margin-bottom: 25px;\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -270,7 +271,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Login button",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-button-box {\n    margin-bottom: 5px;\n  }\n  .login-button {\n    width: 100%;\n  }\n<style>\n",
+			Label:       "\n<style>\n  .login-button-box {\n    margin-bottom: 5px;\n  }\n  .login-button {\n    width: 100%;\n  }\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -278,7 +279,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
 		signinItem = &SigninItem{
 			Name:        "Signup link",
 			Visible:     true,
-			Label:       "\n<style>\n  .login-signup-link {\n    margin-bottom: 24px;\n    display: flex;\n    justify-content: end;\n}\n<style>\n",
+			Label:       "\n<style>\n  .login-signup-link {\n    margin-bottom: 24px;\n    display: flex;\n    justify-content: end;\n}\n</style>\n",
 			Placeholder: "",
 			Rule:        "None",
 		}
@@ -468,36 +469,70 @@ func GetMaskedApplication(application *Application, userId string) *Application
 		application.FailedSigninFrozenTime = DefaultFailedSigninFrozenTime
 	}
 
+	isOrgUser := false
 	if userId != "" {
 		if isUserIdGlobalAdmin(userId) {
 			return application
 		}
 
-		user, _ := GetUser(userId)
-		if user != nil && user.IsApplicationAdmin(application) {
-			return application
+		user, err := GetUser(userId)
+		if err != nil {
+			panic(err)
+		}
+		if user != nil {
+			if user.IsApplicationAdmin(application) {
+				return application
+			}
+
+			if user.Owner == application.Organization {
+				isOrgUser = true
+			}
 		}
 	}
 
-	if application.ClientSecret != "" {
-		application.ClientSecret = "***"
+	application.ClientSecret = "***"
+	application.Cert = "***"
+	application.EnablePassword = false
+	application.EnableSigninSession = false
+	application.EnableCodeSignin = false
+	application.EnableSamlCompress = false
+	application.EnableSamlC14n10 = false
+	application.EnableSamlPostBinding = false
+	application.EnableWebAuthn = false
+	application.EnableLinkWithEmail = false
+	application.SamlReplyUrl = "***"
+
+	providerItems := []*ProviderItem{}
+	for _, providerItem := range application.Providers {
+		if providerItem.Provider != nil && (providerItem.Provider.Category == "OAuth" || providerItem.Provider.Category == "Web3") {
+			providerItems = append(providerItems, providerItem)
+		}
 	}
+	application.Providers = providerItems
+
+	application.GrantTypes = nil
+	application.Tags = nil
+	application.RedirectUris = nil
+	application.TokenFormat = "***"
+	application.TokenFields = nil
+	application.ExpireInHours = -1
+	application.RefreshExpireInHours = -1
+	application.FailedSigninLimit = -1
+	application.FailedSigninFrozenTime = -1
 
 	if application.OrganizationObj != nil {
-		if application.OrganizationObj.MasterPassword != "" {
-			application.OrganizationObj.MasterPassword = "***"
-		}
-		if application.OrganizationObj.DefaultPassword != "" {
-			application.OrganizationObj.DefaultPassword = "***"
-		}
-		if application.OrganizationObj.MasterVerificationCode != "" {
-			application.OrganizationObj.MasterVerificationCode = "***"
-		}
-		if application.OrganizationObj.PasswordType != "" {
-			application.OrganizationObj.PasswordType = "***"
-		}
-		if application.OrganizationObj.PasswordSalt != "" {
-			application.OrganizationObj.PasswordSalt = "***"
+		application.OrganizationObj.MasterPassword = "***"
+		application.OrganizationObj.DefaultPassword = "***"
+		application.OrganizationObj.MasterVerificationCode = "***"
+		application.OrganizationObj.PasswordType = "***"
+		application.OrganizationObj.PasswordSalt = "***"
+		application.OrganizationObj.InitScore = -1
+		application.OrganizationObj.EnableSoftDeletion = false
+		application.OrganizationObj.IsProfilePublic = false
+
+		if !isOrgUser {
+			application.OrganizationObj.MfaItems = nil
+			application.OrganizationObj.AccountItems = nil
 		}
 	}
 
@@ -515,8 +550,12 @@ func GetMaskedApplications(applications []*Application, userId string) []*Applic
 	return applications
 }
 
-func GetAllowedApplications(applications []*Application, userId string) ([]*Application, error) {
-	if userId == "" || isUserIdGlobalAdmin(userId) {
+func GetAllowedApplications(applications []*Application, userId string, lang string) ([]*Application, error) {
+	if userId == "" {
+		return nil, fmt.Errorf(i18n.Translate(lang, "auth:Unauthorized operation"))
+	}
+
+	if isUserIdGlobalAdmin(userId) {
 		return applications, nil
 	}
 
@@ -524,7 +563,11 @@ func GetAllowedApplications(applications []*Application, userId string) ([]*Appl
 	if err != nil {
 		return nil, err
 	}
-	if user != nil && user.IsAdmin {
+	if user == nil {
+		return nil, fmt.Errorf(i18n.Translate(lang, "auth:Unauthorized operation"))
+	}
+
+	if user.IsAdmin {
 		return applications, nil
 	}
 
@@ -639,7 +682,7 @@ func (application *Application) GetId() string {
 }
 
 func (application *Application) IsRedirectUriValid(redirectUri string) bool {
-	redirectUris := append([]string{"http://localhost:", "https://localhost:", "http://127.0.0.1:", "http://casdoor-app"}, application.RedirectUris...)
+	redirectUris := append([]string{"http://localhost:", "https://localhost:", "http://127.0.0.1:", "http://casdoor-app", ".chromiumapp.org"}, application.RedirectUris...)
 	for _, targetUri := range redirectUris {
 		targetUriRegex := regexp.MustCompile(targetUri)
 		if targetUriRegex.MatchString(redirectUri) || strings.Contains(redirectUri, targetUri) {

object/init_data.go

@@ -17,29 +17,35 @@ package object
 import (
 	"github.com/casdoor/casdoor/conf"
 	"github.com/casdoor/casdoor/util"
+	"github.com/casvisor/casvisor-go-sdk/casvisorsdk"
 )
 
 type InitData struct {
-	Organizations []*Organization `json:"organizations"`
-	Applications  []*Application  `json:"applications"`
-	Users         []*User         `json:"users"`
-	Certs         []*Cert         `json:"certs"`
-	Providers     []*Provider     `json:"providers"`
-	Ldaps         []*Ldap         `json:"ldaps"`
-	Models        []*Model        `json:"models"`
-	Permissions   []*Permission   `json:"permissions"`
-	Payments      []*Payment      `json:"payments"`
-	Products      []*Product      `json:"products"`
-	Resources     []*Resource     `json:"resources"`
-	Roles         []*Role         `json:"roles"`
-	Syncers       []*Syncer       `json:"syncers"`
-	Tokens        []*Token        `json:"tokens"`
-	Webhooks      []*Webhook      `json:"webhooks"`
-	Groups        []*Group        `json:"groups"`
-	Adapters      []*Adapter      `json:"adapters"`
-	Enforcers     []*Enforcer     `json:"enforcers"`
-	Plans         []*Plan         `json:"plans"`
-	Pricings      []*Pricing      `json:"pricings"`
+	Organizations []*Organization       `json:"organizations"`
+	Applications  []*Application        `json:"applications"`
+	Users         []*User               `json:"users"`
+	Certs         []*Cert               `json:"certs"`
+	Providers     []*Provider           `json:"providers"`
+	Ldaps         []*Ldap               `json:"ldaps"`
+	Models        []*Model              `json:"models"`
+	Permissions   []*Permission         `json:"permissions"`
+	Payments      []*Payment            `json:"payments"`
+	Products      []*Product            `json:"products"`
+	Resources     []*Resource           `json:"resources"`
+	Roles         []*Role               `json:"roles"`
+	Syncers       []*Syncer             `json:"syncers"`
+	Tokens        []*Token              `json:"tokens"`
+	Webhooks      []*Webhook            `json:"webhooks"`
+	Groups        []*Group              `json:"groups"`
+	Adapters      []*Adapter            `json:"adapters"`
+	Enforcers     []*Enforcer           `json:"enforcers"`
+	Plans         []*Plan               `json:"plans"`
+	Pricings      []*Pricing            `json:"pricings"`
+	Invitations   []*Invitation         `json:"invitations"`
+	Records       []*casvisorsdk.Record `json:"records"`
+	Sessions      []*Session            `json:"sessions"`
+	Subscriptions []*Subscription       `json:"subscriptions"`
+	Transactions  []*Transaction        `json:"transactions"`
 }
 
 func InitFromFile() {
@@ -114,6 +120,21 @@ func InitFromFile() {
 		for _, pricing := range initData.Pricings {
 			initDefinedPricing(pricing)
 		}
+		for _, invitation := range initData.Invitations {
+			initDefinedInvitation(invitation)
+		}
+		for _, record := range initData.Records {
+			initDefinedRecord(record)
+		}
+		for _, session := range initData.Sessions {
+			initDefinedSession(session)
+		}
+		for _, subscription := range initData.Subscriptions {
+			initDefinedSubscription(subscription)
+		}
+		for _, transaction := range initData.Transactions {
+			initDefinedTransaction(transaction)
+		}
 	}
 }
 
@@ -145,6 +166,11 @@ func readInitDataFromFile(filePath string) (*InitData, error) {
 		Enforcers:     []*Enforcer{},
 		Plans:         []*Plan{},
 		Pricings:      []*Pricing{},
+		Invitations:   []*Invitation{},
+		Records:       []*casvisorsdk.Record{},
+		Sessions:      []*Session{},
+		Subscriptions: []*Subscription{},
+		Transactions:  []*Transaction{},
 	}
 	err := util.JsonToStruct(s, data)
 	if err != nil {
@@ -225,6 +251,11 @@ func readInitDataFromFile(filePath string) (*InitData, error) {
 			pricing.Plans = []string{}
 		}
 	}
+	for _, session := range data.Sessions {
+		if session.SessionId == nil {
+			session.SessionId = []string{}
+		}
+	}
 	return data, nil
 }
 
@@ -543,3 +574,61 @@ func initDefinedPricing(pricing *Pricing) {
 		panic(err)
 	}
 }
+
+func initDefinedInvitation(invitation *Invitation) {
+	existed, err := getInvitation(invitation.Owner, invitation.Name)
+	if err != nil {
+		panic(err)
+	}
+	if existed != nil {
+		return
+	}
+	invitation.CreatedTime = util.GetCurrentTime()
+	_, err = AddInvitation(invitation, "en")
+	if err != nil {
+		panic(err)
+	}
+}
+
+func initDefinedRecord(record *casvisorsdk.Record) {
+	record.CreatedTime = util.GetCurrentTime()
+	_ = AddRecord(record)
+}
+
+func initDefinedSession(session *Session) {
+	session.CreatedTime = util.GetCurrentTime()
+	_, err := AddSession(session)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func initDefinedSubscription(subscription *Subscription) {
+	existed, err := getSubscription(subscription.Owner, subscription.Name)
+	if err != nil {
+		panic(err)
+	}
+	if existed != nil {
+		return
+	}
+	subscription.CreatedTime = util.GetCurrentTime()
+	_, err = AddSubscription(subscription)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func initDefinedTransaction(transaction *Transaction) {
+	existed, err := getTransaction(transaction.Owner, transaction.Name)
+	if err != nil {
+		panic(err)
+	}
+	if existed != nil {
+		return
+	}
+	transaction.CreatedTime = util.GetCurrentTime()
+	_, err = AddTransaction(transaction)
+	if err != nil {
+		panic(err)
+	}
+}

object/init_data_dump.go

@@ -121,6 +121,31 @@ func writeInitDataToFile(filePath string) error {
 		return err
 	}
 
+	invitations, err := GetInvitations("")
+	if err != nil {
+		return err
+	}
+
+	records, err := GetRecords()
+	if err != nil {
+		return err
+	}
+
+	sessions, err := GetSessions("")
+	if err != nil {
+		return err
+	}
+
+	subscriptions, err := GetSubscriptions("")
+	if err != nil {
+		return err
+	}
+
+	transactions, err := GetTransactions("")
+	if err != nil {
+		return err
+	}
+
 	data := &InitData{
 		Organizations: organizations,
 		Applications:  applications,
@@ -142,6 +167,11 @@ func writeInitDataToFile(filePath string) error {
 		Enforcers:     enforcers,
 		Plans:         plans,
 		Pricings:      pricings,
+		Invitations:   invitations,
+		Records:       records,
+		Sessions:      sessions,
+		Subscriptions: subscriptions,
+		Transactions:  transactions,
 	}
 
 	text := util.StructToJsonFormatted(data)

object/record.go

@@ -134,13 +134,19 @@ func GetRecordsByField(record *casvisorsdk.Record) ([]*casvisorsdk.Record, error
 	return records, nil
 }
 
-func getFilteredWebhooks(webhooks []*Webhook, action string) []*Webhook {
+func getFilteredWebhooks(webhooks []*Webhook, organization string, action string) []*Webhook {
 	res := []*Webhook{}
 	for _, webhook := range webhooks {
 		if !webhook.IsEnabled {
 			continue
 		}
 
+		if webhook.SingleOrgOnly {
+			if webhook.Organization != organization {
+				continue
+			}
+		}
+
 		matched := false
 		for _, event := range webhook.Events {
 			if action == event {
@@ -163,7 +169,7 @@ func SendWebhooks(record *casvisorsdk.Record) error {
 	}
 
 	errs := []error{}
-	webhooks = getFilteredWebhooks(webhooks, record.Action)
+	webhooks = getFilteredWebhooks(webhooks, record.Organization, record.Action)
 	for _, webhook := range webhooks {
 		var user *User
 		if webhook.IsUserExtended {

object/storage.go

@@ -109,14 +109,17 @@ func GetUploadFileUrl(provider *Provider, fullFilePath string, hasTimestamp bool
 
 func getStorageProvider(provider *Provider, lang string) (oss.StorageInterface, error) {
 	endpoint := getProviderEndpoint(provider)
-	storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, endpoint)
+	storageProvider, err := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, endpoint)
+	if err != nil {
+		return nil, err
+	}
 	if storageProvider == nil {
 		return nil, fmt.Errorf(i18n.Translate(lang, "storage:The provider type: %s is not supported"), provider.Type)
 	}
 
 	if provider.Domain == "" {
 		provider.Domain = storageProvider.GetEndpoint()
-		_, err := UpdateProvider(provider.GetId(), provider)
+		_, err = UpdateProvider(provider.GetId(), provider)
 		if err != nil {
 			return nil, err
 		}

object/webhook.go

@@ -39,6 +39,7 @@ type Webhook struct {
 	Headers        []*Header `xorm:"mediumtext" json:"headers"`
 	Events         []string  `xorm:"varchar(1000)" json:"events"`
 	IsUserExtended bool      `json:"isUserExtended"`
+	SingleOrgOnly  bool      `json:"singleOrgOnly"`
 	IsEnabled      bool      `json:"isEnabled"`
 }
 

routers/cors_filter.go

@@ -48,7 +48,7 @@ func CorsFilter(ctx *context.Context) {
 	originHostname := getHostname(origin)
 	host := removePort(ctx.Request.Host)
 
-	if strings.HasPrefix(origin, "http://localhost") || strings.HasPrefix(origin, "https://localhost") || strings.HasPrefix(origin, "http://127.0.0.1") || strings.HasPrefix(origin, "http://casdoor-app") {
+	if strings.HasPrefix(origin, "http://localhost") || strings.HasPrefix(origin, "https://localhost") || strings.HasPrefix(origin, "http://127.0.0.1") || strings.HasPrefix(origin, "http://casdoor-app") || strings.Contains(origin, ".chromiumapp.org") {
 		setCorsHeaders(ctx, origin)
 		return
 	}

storage/qiniu_cloud.go

@@ -19,8 +19,8 @@ import (
 	"github.com/casdoor/oss/qiniu"
 )
 
-func NewQiniuCloudKodoStorageProvider(clientId string, clientSecret string, region string, bucket string, endpoint string) oss.StorageInterface {
-	sp := qiniu.New(&qiniu.Config{
+func NewQiniuCloudKodoStorageProvider(clientId string, clientSecret string, region string, bucket string, endpoint string) (oss.StorageInterface, error) {
+	sp, err := qiniu.New(&qiniu.Config{
 		AccessID:  clientId,
 		AccessKey: clientSecret,
 		Region:    region,
@@ -28,5 +28,5 @@ func NewQiniuCloudKodoStorageProvider(clientId string, clientSecret string, regi
 		Endpoint:  endpoint,
 	})
 
-	return sp
+	return sp, err
 }

storage/storage.go

@@ -16,27 +16,27 @@ package storage
 
 import "github.com/casdoor/oss"
 
-func GetStorageProvider(providerType string, clientId string, clientSecret string, region string, bucket string, endpoint string) oss.StorageInterface {
+func GetStorageProvider(providerType string, clientId string, clientSecret string, region string, bucket string, endpoint string) (oss.StorageInterface, error) {
 	switch providerType {
 	case "Local File System":
-		return NewLocalFileSystemStorageProvider()
+		return NewLocalFileSystemStorageProvider(), nil
 	case "AWS S3":
-		return NewAwsS3StorageProvider(clientId, clientSecret, region, bucket, endpoint)
+		return NewAwsS3StorageProvider(clientId, clientSecret, region, bucket, endpoint), nil
 	case "MinIO":
-		return NewMinIOS3StorageProvider(clientId, clientSecret, "_", bucket, endpoint)
+		return NewMinIOS3StorageProvider(clientId, clientSecret, "_", bucket, endpoint), nil
 	case "Aliyun OSS":
-		return NewAliyunOssStorageProvider(clientId, clientSecret, region, bucket, endpoint)
+		return NewAliyunOssStorageProvider(clientId, clientSecret, region, bucket, endpoint), nil
 	case "Tencent Cloud COS":
-		return NewTencentCloudCosStorageProvider(clientId, clientSecret, region, bucket, endpoint)
+		return NewTencentCloudCosStorageProvider(clientId, clientSecret, region, bucket, endpoint), nil
 	case "Azure Blob":
-		return NewAzureBlobStorageProvider(clientId, clientSecret, region, bucket, endpoint)
+		return NewAzureBlobStorageProvider(clientId, clientSecret, region, bucket, endpoint), nil
 	case "Qiniu Cloud Kodo":
 		return NewQiniuCloudKodoStorageProvider(clientId, clientSecret, region, bucket, endpoint)
 	case "Google Cloud Storage":
-		return NewGoogleCloudStorageProvider(clientSecret, bucket, endpoint)
+		return NewGoogleCloudStorageProvider(clientSecret, bucket, endpoint), nil
 	case "Synology":
-		return NewSynologyNasStorageProvider(clientId, clientSecret, endpoint)
+		return NewSynologyNasStorageProvider(clientId, clientSecret, endpoint), nil
 	}
 
-	return nil
+	return nil, nil
 }

web/src/ApplicationEditPage.js

@@ -760,7 +760,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row>
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("application:Form CSS"), i18next.t("application:Form CSS - Tooltip"))} :
+            {Setting.getLabel(i18next.t("application:Custom CSS"), i18next.t("application:Custom CSS - Tooltip"))} :
           </Col>
           <Col span={22}>
             <Popover placement="right" content={
@@ -772,7 +772,7 @@ class ApplicationEditPage extends React.Component {
                   }}
                 />
               </div>
-            } title={i18next.t("application:Form CSS - Edit")} trigger="click">
+            } title={i18next.t("application:Custom CSS - Edit")} trigger="click">
               <Input value={this.state.application.formCss} style={{marginBottom: "10px"}} onChange={e => {
                 this.updateApplicationField("formCss", e.target.value);
               }} />
@@ -781,7 +781,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row>
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("application:Form CSS Mobile"), i18next.t("application:Form CSS Mobile - Tooltip"))} :
+            {Setting.getLabel(i18next.t("application:Custom CSS Mobile"), i18next.t("application:Custom CSS Mobile - Tooltip"))} :
           </Col>
           <Col span={22}>
             <Popover placement="right" content={
@@ -793,7 +793,7 @@ class ApplicationEditPage extends React.Component {
                   }}
                 />
               </div>
-            } title={i18next.t("application:Form CSS Mobile - Edit")} trigger="click">
+            } title={i18next.t("application:Custom CSS Mobile - Edit")} trigger="click">
               <Input value={this.state.application.formCssMobile} style={{marginBottom: "10px"}} onChange={e => {
                 this.updateApplicationField("formCssMobile", e.target.value);
               }} />

web/src/ProviderEditPage.js

@@ -191,7 +191,7 @@ class ProviderEditPage extends React.Component {
         return Setting.getLabel(i18next.t("provider:App key"), i18next.t("provider:App key - Tooltip"));
       } else if (provider.type === "UCloud SMS") {
         return Setting.getLabel(i18next.t("provider:Public key"), i18next.t("provider:Public key - Tooltip"));
-      } else if (provider.type === "Msg91 SMS" || provider.type === "Infobip SMS") {
+      } else if (provider.type === "Msg91 SMS" || provider.type === "Infobip SMS" || provider.type === "OSON SMS") {
         return Setting.getLabel(i18next.t("provider:Sender Id"), i18next.t("provider:Sender Id - Tooltip"));
       } else {
         return Setting.getLabel(i18next.t("provider:Client ID"), i18next.t("provider:Client ID - Tooltip"));
@@ -234,7 +234,7 @@ class ProviderEditPage extends React.Component {
         return Setting.getLabel(i18next.t("general:Password"), i18next.t("general:Password - Tooltip"));
       }
     case "SMS":
-      if (provider.type === "Volc Engine SMS" || provider.type === "Amazon SNS" || provider.type === "Baidu Cloud SMS") {
+      if (provider.type === "Volc Engine SMS" || provider.type === "Amazon SNS" || provider.type === "Baidu Cloud SMS" || provider.type === "OSON SMS") {
         return Setting.getLabel(i18next.t("provider:Secret access key"), i18next.t("provider:Secret access key - Tooltip"));
       } else if (provider.type === "Huawei Cloud SMS") {
         return Setting.getLabel(i18next.t("provider:App secret"), i18next.t("provider:AppSecret - Tooltip"));

web/src/Setting.js

@@ -143,6 +143,10 @@ export const OtherProviderInfo = {
       logo: `${StaticBaseUrl}/img/social_msg91.ico`,
       url: "https://control.msg91.com/app/",
     },
+    "OSON SMS": {
+      logo: "https://osonsms.com/images/osonsms-logo.svg",
+      url: "https://osonsms.com/",
+    },
     "Custom HTTP SMS": {
       logo: `${StaticBaseUrl}/img/social_default.png`,
       url: "https://casdoor.org/docs/provider/sms/overview",
@@ -703,6 +707,15 @@ export function goToLinkSoft(ths, link) {
   ths.props.history.push(link);
 }
 
+export function goToLinkSoftOrJumpSelf(ths, link) {
+  if (link.startsWith("http")) {
+    goToLink(link);
+    return;
+  }
+
+  ths.props.history.push(link);
+}
+
 export function showMessage(type, text) {
   if (type === "success") {
     message.success(text);
@@ -1005,6 +1018,7 @@ export function getProviderTypeOptions(category) {
         {id: "Azure ACS", name: "Azure ACS"},
         {id: "Custom HTTP SMS", name: "Custom HTTP SMS"},
         {id: "Mock SMS", name: "Mock SMS"},
+        {id: "OSON SMS", name: "OSON SMS"},
         {id: "Infobip SMS", name: "Infobip SMS"},
         {id: "Tencent Cloud SMS", name: "Tencent Cloud SMS"},
         {id: "Baidu Cloud SMS", name: "Baidu Cloud SMS"},

web/src/UserEditPage.js

@@ -64,7 +64,9 @@ class UserEditPage extends React.Component {
 
   UNSAFE_componentWillMount() {
     this.getUser();
-    this.getOrganizations();
+    if (Setting.isLocalAdminUser(this.props.account)) {
+      this.getOrganizations();
+    }
     this.getApplicationsByOrganization(this.state.organizationName);
     this.getUserApplication();
     this.setReturnUrl();
@@ -1001,7 +1003,7 @@ class UserEditPage extends React.Component {
               <div style={{verticalAlign: "middle", marginBottom: 10}}>{`(${i18next.t("general:empty")})`}</div>
             </Col>
         }
-        <CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.state.organizations.find(organization => organization.name === this.state.organizationName)} />
+        <CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.getUserOrganization()} />
       </Col>
     );
   }

web/src/WebhookEditPage.js

@@ -309,6 +309,16 @@ class WebhookEditPage extends React.Component {
             </div>
           </Col>
         </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
+            {Setting.getLabel(i18next.t("webhook:Single org only"), i18next.t("webhook:Single org only - Tooltip"))} :
+          </Col>
+          <Col span={1} >
+            <Switch checked={this.state.webhook.singleOrgOnly} onChange={checked => {
+              this.updateWebhookField("singleOrgOnly", checked);
+            }} />
+          </Col>
+        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
             {Setting.getLabel(i18next.t("general:Is enabled"), i18next.t("general:Is enabled - Tooltip"))} :

web/src/WebhookListPage.js

@@ -111,7 +111,7 @@ class WebhookListPage extends BaseListPage {
         title: i18next.t("general:Created time"),
         dataIndex: "createdTime",
         key: "createdTime",
-        width: "180px",
+        width: "150px",
         sorter: true,
         render: (text, record, index) => {
           return Setting.getFormattedDate(text);
@@ -121,7 +121,7 @@ class WebhookListPage extends BaseListPage {
         title: i18next.t("general:URL"),
         dataIndex: "url",
         key: "url",
-        width: "300px",
+        width: "200px",
         sorter: true,
         ...this.getColumnSearchProps("url"),
         render: (text, record, index) => {
@@ -138,7 +138,7 @@ class WebhookListPage extends BaseListPage {
         title: i18next.t("general:Method"),
         dataIndex: "method",
         key: "method",
-        width: "120px",
+        width: "100px",
         sorter: true,
         ...this.getColumnSearchProps("method"),
       },
@@ -146,7 +146,7 @@ class WebhookListPage extends BaseListPage {
         title: i18next.t("webhook:Content type"),
         dataIndex: "contentType",
         key: "contentType",
-        width: "200px",
+        width: "140px",
         sorter: true,
         filterMultiple: false,
         filters: [
@@ -169,7 +169,19 @@ class WebhookListPage extends BaseListPage {
         title: i18next.t("webhook:Is user extended"),
         dataIndex: "isUserExtended",
         key: "isUserExtended",
-        width: "160px",
+        width: "140px",
+        sorter: true,
+        render: (text, record, index) => {
+          return (
+            <Switch disabled checkedChildren="ON" unCheckedChildren="OFF" checked={text} />
+          );
+        },
+      },
+      {
+        title: i18next.t("webhook:Single org only"),
+        dataIndex: "singleOrgOnly",
+        key: "singleOrgOnly",
+        width: "140px",
         sorter: true,
         render: (text, record, index) => {
           return (
@@ -183,6 +195,7 @@ class WebhookListPage extends BaseListPage {
         key: "isEnabled",
         width: "120px",
         sorter: true,
+        fixed: (Setting.isMobile()) ? "false" : "right",
         render: (text, record, index) => {
           return (
             <Switch disabled checkedChildren="ON" unCheckedChildren="OFF" checked={text} />

web/src/auth/AuthCallback.js

@@ -172,7 +172,7 @@ class AuthCallback extends React.Component {
             Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}${responseType}=${token}&state=${oAuthParams.state}&token_type=bearer`);
           } else if (responseType === "link") {
             const from = innerParams.get("from");
-            Setting.goToLinkSoft(this, from);
+            Setting.goToLinkSoftOrJumpSelf(this, from);
           } else if (responseType === "saml") {
             if (res.data2.method === "POST") {
               this.setState({

web/src/auth/ProviderButton.js

@@ -42,9 +42,7 @@ import OktaLoginButton from "./OktaLoginButton";
 import DouyinLoginButton from "./DouyinLoginButton";
 import LoginButton from "./LoginButton";
 import * as AuthBackend from "./AuthBackend";
-import * as Setting from "../Setting";
-import {getEvent} from "./Util";
-import {Modal} from "antd";
+import {WechatOfficialAccountModal} from "./Util";
 
 function getSigninButton(provider) {
   const text = i18next.t("login:Sign in with {type}").replace("{type}", provider.displayName !== "" ? provider.displayName : provider.type);
@@ -141,32 +139,11 @@ export function renderProviderLogo(provider, application, width, margin, size, l
   if (size === "small") {
     if (provider.category === "OAuth") {
       if (provider.type === "WeChat" && provider.clientId2 !== "" && provider.clientSecret2 !== "" && provider.disableSsl === true && !navigator.userAgent.includes("MicroMessenger")) {
-        const info = async() => {
-          AuthBackend.getWechatQRCode(`${provider.owner}/${provider.name}`).then(
-            async res => {
-              if (res.status !== "ok") {
-                Setting.showMessage("error", res?.msg);
-                return;
-              }
-
-              const t1 = setInterval(await getEvent, 1000, application, provider, res.data2);
-              {Modal.info({
-                title: i18next.t("provider:Please use WeChat to scan the QR code and follow the official account for sign in"),
-                content: (
-                  <div style={{marginRight: "34px"}}>
-                    <img src = {"data:image/png;base64," + res.data} alt="Wechat QR code" style={{width: "100%"}} />
-                  </div>
-                ),
-                onOk() {
-                  window.clearInterval(t1);
-                },
-              });}
-            }
-          );
-        };
         return (
           <a key={provider.displayName} >
-            <img width={width} height={width} src={getProviderLogoURL(provider)} alt={provider.displayName} className="provider-img" style={{margin: margin}} onClick={info} />
+            <img width={width} height={width} src={getProviderLogoURL(provider)} alt={provider.displayName} className="provider-img" style={{margin: margin}} onClick={() => {
+              WechatOfficialAccountModal(application, provider, "signup");
+            }} />
           </a>
         );
       } else {

web/src/auth/Util.js

@@ -13,11 +13,12 @@
 // limitations under the License.
 
 import React from "react";
-import {Alert, Button, Result} from "antd";
+import {Alert, Button, Modal, Result} from "antd";
 import i18next from "i18next";
 import {getWechatMessageEvent} from "./AuthBackend";
 import * as Setting from "../Setting";
 import * as Provider from "./Provider";
+import * as AuthBackend from "./AuthBackend";
 
 export function renderMessage(msg) {
   if (msg !== null) {
@@ -188,12 +189,36 @@ export function getQueryParamsFromState(state) {
   }
 }
 
-export function getEvent(application, provider, ticket) {
+export function getEvent(application, provider, ticket, method) {
   getWechatMessageEvent(ticket)
     .then(res => {
       if (res.data === "SCAN" || res.data === "subscribe") {
         const code = res?.data2;
-        Setting.goToLink(Provider.getAuthUrl(application, provider, "signup", code));
+        Setting.goToLink(Provider.getAuthUrl(application, provider, method ?? "signup", code));
       }
     });
 }
+
+export async function WechatOfficialAccountModal(application, provider, method) {
+  AuthBackend.getWechatQRCode(`${provider.owner}/${provider.name}`).then(
+    async res => {
+      if (res.status !== "ok") {
+        Setting.showMessage("error", res?.msg);
+        return;
+      }
+
+      const t1 = setInterval(await getEvent, 1000, application, provider, res.data2, method);
+      {Modal.info({
+        title: i18next.t("provider:Please use WeChat to scan the QR code and follow the official account for sign in"),
+        content: (
+          <div style={{marginRight: "34px"}}>
+            <img src = {"data:image/png;base64," + res.data} alt="Wechat QR code" style={{width: "100%"}} />
+          </div>
+        ),
+        onOk() {
+          window.clearInterval(t1);
+        },
+      });}
+    }
+  );
+}

web/src/basic/CustomHead.js

@@ -14,39 +14,36 @@
 
 import {useEffect} from "react";
 
+let customHeadLoaded = false;
+
 function CustomHead(props) {
   useEffect(() => {
-    const suffix = new Date().getTime().toString();
+    if (!customHeadLoaded) {
+      const suffix = new Date().getTime().toString();
 
-    if (!props.headerHtml) {return;}
-    const node = document.createElement("div");
-    node.innerHTML = props.headerHtml;
+      if (!props.headerHtml) {return;}
+      const node = document.createElement("div");
+      node.innerHTML = props.headerHtml;
 
-    node.childNodes.forEach(el => {
-      if (el.nodeName === "#text") {
-        return;
-      }
-      let innerNode = el;
-      innerNode.setAttribute("app-custom-head" + suffix, "");
-
-      if (innerNode.localName === "script") {
-        const scriptNode = document.createElement("script");
-        Array.from(innerNode.attributes).forEach(attr => {
-          scriptNode.setAttribute(attr.name, attr.value);
-        });
-        scriptNode.text = innerNode.textContent;
-        innerNode = scriptNode;
-      }
-      document.head.appendChild(innerNode);
-    });
-
-    return () => {
-      for (const el of document.head.children) {
-        if (el.getAttribute("app-custom-head" + suffix) !== null) {
-          document.head.removeChild(el);
+      node.childNodes.forEach(el => {
+        if (el.nodeName === "#text") {
+          return;
         }
-      }
-    };
+        let innerNode = el;
+        innerNode.setAttribute("app-custom-head" + suffix, "");
+
+        if (innerNode.localName === "script") {
+          const scriptNode = document.createElement("script");
+          Array.from(innerNode.attributes).forEach(attr => {
+            scriptNode.setAttribute(attr.name, attr.value);
+          });
+          scriptNode.text = innerNode.textContent;
+          innerNode = scriptNode;
+        }
+        document.head.appendChild(innerNode);
+      });
+      customHeadLoaded = true;
+    }
   });
 }
 

web/src/common/OAuthWidget.js

@@ -21,6 +21,7 @@ import * as Provider from "../auth/Provider";
 import * as AuthBackend from "../auth/AuthBackend";
 import {goToWeb3Url} from "../auth/ProviderButton";
 import AccountAvatar from "../account/AccountAvatar";
+import {WechatOfficialAccountModal} from "../auth/Util";
 
 class OAuthWidget extends React.Component {
   constructor(props) {
@@ -197,9 +198,19 @@ class OAuthWidget extends React.Component {
               provider.category === "Web3" ? (
                 <Button style={{marginLeft: "20px", width: linkButtonWidth}} type="primary" disabled={user.id !== account.id} onClick={() => goToWeb3Url(application, provider, "link")}>{i18next.t("user:Link")}</Button>
               ) : (
-                <a key={provider.displayName} href={user.id !== account.id ? null : Provider.getAuthUrl(application, provider, "link")}>
-                  <Button style={{marginLeft: "20px", width: linkButtonWidth}} type="primary" disabled={user.id !== account.id}>{i18next.t("user:Link")}</Button>
-                </a>
+                provider.type === "WeChat" && provider.clientId2 !== "" && provider.clientSecret2 !== "" && provider.disableSsl === true && !navigator.userAgent.includes("MicroMessenger") ? (
+                  <a key={provider.displayName}>
+                    <Button style={{marginLeft: "20px", width: linkButtonWidth}} type="primary" disabled={user.id !== account.id} onClick={
+                      () => {
+                        WechatOfficialAccountModal(application, provider, "link");
+                      }
+                    }>{i18next.t("user:Link")}</Button>
+                  </a>
+                ) : (
+                  <a key={provider.displayName} href={user.id !== account.id ? null : Provider.getAuthUrl(application, provider, "link")}>
+                    <Button style={{marginLeft: "20px", width: linkButtonWidth}} type="primary" disabled={user.id !== account.id}>{i18next.t("user:Link")}</Button>
+                  </a>
+                )
               )
             ) : (
               <Button disabled={!providerItem.canUnlink && !Setting.isAdminUser(account)} style={{marginLeft: "20px", width: linkButtonWidth}} onClick={() => this.unlinkUser(provider.type, linkedValue)}>{i18next.t("user:Unlink")}</Button>

web/src/locales/ar/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/de/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "URL der Prompt-Seite kopieren",
     "Copy signin page URL": "Kopieren Sie die URL der Anmeldeseite",
     "Copy signup page URL": "URL der Anmeldeseite kopieren",
+    "Custom CSS": "Formular CSS",
+    "Custom CSS - Edit": "Custom CSS - Bearbeiten",
+    "Custom CSS - Tooltip": "CSS-Styling der Anmelde-, Registrierungs- und Passwort-vergessen-Seite (z. B. Hinzufügen von Rahmen und Schatten)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Bearbeitungsanwendung",
     "Enable Email linking": "E-Mail-Verknüpfung aktivieren",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Datei erfolgreich hochgeladen",
     "First, last": "First, last",
     "Follow organization theme": "Folge dem Theme der Organisation",
-    "Form CSS": "Formular CSS",
-    "Form CSS - Edit": "Form CSS - Bearbeiten",
-    "Form CSS - Tooltip": "CSS-Styling der Anmelde-, Registrierungs- und Passwort-vergessen-Seite (z. B. Hinzufügen von Rahmen und Schatten)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Formposition",
     "Form position - Tooltip": "Position der Anmelde-, Registrierungs- und Passwort-vergessen-Formulare",
     "Grant types": "Grant-Typen",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Sollten die erweiterten Felder des Benutzers in das JSON inkludiert werden?",
     "Method - Tooltip": "HTTP Methode",
     "New Webhook": "Neue Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Wert"
   }
 }

web/src/locales/en/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/es/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copiar URL de la página del prompt",
     "Copy signin page URL": "Copiar la URL de la página de inicio de sesión",
     "Copy signup page URL": "Copiar URL de la página de registro",
+    "Custom CSS": "Formulario CSS",
+    "Custom CSS - Edit": "Formulario CSS - Editar",
+    "Custom CSS - Tooltip": "Estilo CSS de los formularios de registro, inicio de sesión y olvido de contraseña (por ejemplo, agregar bordes y sombras)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Editar solicitud",
     "Enable Email linking": "Habilitar enlace de correo electrónico",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Archivo subido exitosamente",
     "First, last": "First, last",
     "Follow organization theme": "Seguir el tema de la organización",
-    "Form CSS": "Formulario CSS",
-    "Form CSS - Edit": "Formulario CSS - Editar",
-    "Form CSS - Tooltip": "Estilo CSS de los formularios de registro, inicio de sesión y olvido de contraseña (por ejemplo, agregar bordes y sombras)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Posición de la Forma",
     "Form position - Tooltip": "Ubicación de los formularios de registro, inicio de sesión y olvido de contraseña",
     "Grant types": "Tipos de subvenciones",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "¿Incluir los campos extendidos del usuario en el JSON?",
     "Method - Tooltip": "Método HTTP",
     "New Webhook": "Nuevo Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Valor"
   }
 }

web/src/locales/fa/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/fi/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/fr/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copier l'URL de la page de l'invite",
     "Copy signin page URL": "Copier l'URL de la page de connexion",
     "Copy signup page URL": "Copiez l'URL de la page d'inscription",
+    "Custom CSS": "CSS du formulaire",
+    "Custom CSS - Edit": "CSS du formulaire - Modifier",
+    "Custom CSS - Tooltip": "Mise en forme CSS des formulaires d'inscription, de connexion et de récupération de mot de passe (par exemple, en ajoutant des bordures et des ombres)",
+    "Custom CSS Mobile": "CSS du formulaire sur téléphone",
+    "Custom CSS Mobile - Edit": "CSS du formulaire sur téléphone - Modifier",
+    "Custom CSS Mobile - Tooltip": "CSS du formulaire sur téléphone - Info-bulle",
     "Dynamic": "Dynamique",
     "Edit Application": "Modifier l'application",
     "Enable Email linking": "Autoriser à lier l'e-mail",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Fichier téléchargé avec succès",
     "First, last": "Prénom, nom",
     "Follow organization theme": "Suivre le thème de l'organisation",
-    "Form CSS": "CSS du formulaire",
-    "Form CSS - Edit": "CSS du formulaire - Modifier",
-    "Form CSS - Tooltip": "Mise en forme CSS des formulaires d'inscription, de connexion et de récupération de mot de passe (par exemple, en ajoutant des bordures et des ombres)",
-    "Form CSS Mobile": "CSS du formulaire sur téléphone",
-    "Form CSS Mobile - Edit": "CSS du formulaire sur téléphone - Modifier",
-    "Form CSS Mobile - Tooltip": "CSS du formulaire sur téléphone - Info-bulle",
     "Form position": "Position du formulaire",
     "Form position - Tooltip": "Emplacement des formulaires d'inscription, de connexion et de récupération de mot de passe",
     "Grant types": "Types d'autorisation",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Inclure les champs étendus du compte dans l'objet JSON",
     "Method - Tooltip": "Méthode HTTP",
     "New Webhook": "Nouveau webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Valeur"
   }
 }

web/src/locales/he/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/id/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Salin URL halaman prompt",
     "Copy signin page URL": "Salin URL halaman masuk",
     "Copy signup page URL": "Salin URL halaman pendaftaran",
+    "Custom CSS": "Formulir CSS",
+    "Custom CSS - Edit": "Formulir CSS - Edit",
+    "Custom CSS - Tooltip": "Pengaturan CSS dari formulir pendaftaran, masuk, dan lupa kata sandi (misalnya menambahkan batas dan bayangan)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Mengedit aplikasi",
     "Enable Email linking": "Aktifkan pengaitan email",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Berkas telah diunggah dengan sukses",
     "First, last": "First, last",
     "Follow organization theme": "Ikuti tema organisasi",
-    "Form CSS": "Formulir CSS",
-    "Form CSS - Edit": "Formulir CSS - Edit",
-    "Form CSS - Tooltip": "Pengaturan CSS dari formulir pendaftaran, masuk, dan lupa kata sandi (misalnya menambahkan batas dan bayangan)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Posisi formulir",
     "Form position - Tooltip": "Tempat pendaftaran, masuk, dan lupa kata sandi",
     "Grant types": "Jenis-jenis hibah",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Apakah akan menyertakan bidang-bidang tambahan pengguna dalam JSON?",
     "Method - Tooltip": "Metode HTTP",
     "New Webhook": "Webhook Baru",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Nilai"
   }
 }

web/src/locales/it/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/ja/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "プロンプトページのURLをコピーしてください",
     "Copy signin page URL": "サインインページのURLをコピーしてください",
     "Copy signup page URL": "サインアップページのURLをコピーしてください",
+    "Custom CSS": "フォームCSS",
+    "Custom CSS - Edit": "フォームのCSS - 編集",
+    "Custom CSS - Tooltip": "サインアップ、サインイン、パスワード忘れのフォームのCSSスタイリング（例：境界線や影の追加）",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "アプリケーションを編集する",
     "Enable Email linking": "イーメールリンクの有効化",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "ファイルが正常にアップロードされました",
     "First, last": "First, last",
     "Follow organization theme": "組織のテーマに従ってください",
-    "Form CSS": "フォームCSS",
-    "Form CSS - Edit": "フォームのCSS - 編集",
-    "Form CSS - Tooltip": "サインアップ、サインイン、パスワード忘れのフォームのCSSスタイリング（例：境界線や影の追加）",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "フォームのポジション",
     "Form position - Tooltip": "登録、ログイン、パスワード忘れフォームの位置",
     "Grant types": "グラント種類",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "ユーザーの拡張フィールドをJSONに含めるかどうか",
     "Method - Tooltip": "HTTPメソッド",
     "New Webhook": "新しいWebhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "値"
   }
 }

web/src/locales/kk/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/ko/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "프롬프트 페이지 URL을 복사하세요",
     "Copy signin page URL": "사인인 페이지 URL 복사",
     "Copy signup page URL": "가입 페이지 URL을 복사하세요",
+    "Custom CSS": "CSS 양식",
+    "Custom CSS - Edit": "폼 CSS - 편집",
+    "Custom CSS - Tooltip": "가입, 로그인 및 비밀번호를 잊어버린 양식의 CSS 스타일링 (예 : 테두리와 그림자 추가)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "앱 편집하기",
     "Enable Email linking": "이메일 링크 사용 가능하도록 설정하기",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "파일이 성공적으로 업로드되었습니다",
     "First, last": "First, last",
     "Follow organization theme": "조직의 주제를 따르세요",
-    "Form CSS": "CSS 양식",
-    "Form CSS - Edit": "폼 CSS - 편집",
-    "Form CSS - Tooltip": "가입, 로그인 및 비밀번호를 잊어버린 양식의 CSS 스타일링 (예 : 테두리와 그림자 추가)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "양식 위치",
     "Form position - Tooltip": "가입, 로그인 및 비밀번호 재설정 양식의 위치",
     "Grant types": "Grant types: 부여 유형",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "사용자의 확장 필드를 JSON에 포함할지 여부",
     "Method - Tooltip": "HTTP 방법",
     "New Webhook": "새로운 웹훅",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "가치"
   }
 }

web/src/locales/ms/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/nl/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/pl/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/pt/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copiar URL da página de prompt",
     "Copy signin page URL": "Copiar URL da página de login",
     "Copy signup page URL": "Copiar URL da página de registro",
+    "Custom CSS": "CSS do formulário",
+    "Custom CSS - Edit": "Editar CSS do formulário",
+    "Custom CSS - Tooltip": "Estilização CSS dos formulários de registro, login e recuperação de senha (por exemplo, adicionando bordas e sombras)",
+    "Custom CSS Mobile": "CSS do formulário em dispositivos móveis",
+    "Custom CSS Mobile - Edit": "Editar CSS do formulário em dispositivos móveis",
+    "Custom CSS Mobile - Tooltip": "CSS do formulário em dispositivos móveis - Dica",
     "Dynamic": "Dinâmico",
     "Edit Application": "Editar Aplicação",
     "Enable Email linking": "Ativar vinculação de e-mail",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Arquivo enviado com sucesso",
     "First, last": "Primeiro, último",
     "Follow organization theme": "Seguir tema da organização",
-    "Form CSS": "CSS do formulário",
-    "Form CSS - Edit": "Editar CSS do formulário",
-    "Form CSS - Tooltip": "Estilização CSS dos formulários de registro, login e recuperação de senha (por exemplo, adicionando bordas e sombras)",
-    "Form CSS Mobile": "CSS do formulário em dispositivos móveis",
-    "Form CSS Mobile - Edit": "Editar CSS do formulário em dispositivos móveis",
-    "Form CSS Mobile - Tooltip": "CSS do formulário em dispositivos móveis - Dica",
     "Form position": "Posição do formulário",
     "Form position - Tooltip": "Localização dos formulários de registro, login e recuperação de senha",
     "Grant types": "Tipos de concessão",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Se incluir os campos estendidos do usuário no JSON",
     "Method - Tooltip": "Método HTTP",
     "New Webhook": "Novo Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Valor"
   }
 }

web/src/locales/ru/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Скопируйте URL страницы предложения",
     "Copy signin page URL": "Скопируйте URL-адрес страницы входа",
     "Copy signup page URL": "Скопируйте URL страницы регистрации",
+    "Custom CSS": "Форма CSS",
+    "Custom CSS - Edit": "Форма CSS - Редактирование",
+    "Custom CSS - Tooltip": "CSS-оформление форм регистрации, входа и восстановления пароля (например, добавление границ и теней)",
+    "Custom CSS Mobile": "CSS формы для мобильных",
+    "Custom CSS Mobile - Edit": "CSS формы для мобильный - редактировать",
+    "Custom CSS Mobile - Tooltip": "Редактирование CSS кода для мобильных устройств",
     "Dynamic": "Динамическое",
     "Edit Application": "Изменить приложение",
     "Enable Email linking": "Включить связывание электронной почты",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Файл успешно загружен",
     "First, last": "Имя, Фамилия",
     "Follow organization theme": "Cледуйте теме организации",
-    "Form CSS": "Форма CSS",
-    "Form CSS - Edit": "Форма CSS - Редактирование",
-    "Form CSS - Tooltip": "CSS-оформление форм регистрации, входа и восстановления пароля (например, добавление границ и теней)",
-    "Form CSS Mobile": "CSS формы для мобильных",
-    "Form CSS Mobile - Edit": "CSS формы для мобильный - редактировать",
-    "Form CSS Mobile - Tooltip": "Редактирование CSS кода для мобильных устройств",
     "Form position": "Позиция формы",
     "Form position - Tooltip": "Местоположение форм регистрации, входа и восстановления пароля",
     "Grant types": "Типы грантов",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Нужно ли включать расширенные поля пользователя в формате JSON?",
     "Method - Tooltip": "Метод HTTP",
     "New Webhook": "Новый вебхук",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Значение"
   }
 }

web/src/locales/sv/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/tr/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Prompt Page URL 'ini kopyala",
     "Copy signin page URL": "Giriş sayfası URL 'ini kopyala",
     "Copy signup page URL": "Kayıt sayfası URL 'ini kopyala",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dinamik",
     "Edit Application": "Uygulamayı düzenle",
     "Enable Email linking": "Eposta bağlantısı aktif",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "Adı, Soyadı",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/uk/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
+    "Custom CSS": "Custom CSS",
+    "Custom CSS - Edit": "Custom CSS - Edit",
+    "Custom CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Edit Application",
     "Enable Email linking": "Enable Email linking",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "File uploaded successfully",
     "First, last": "First, last",
     "Follow organization theme": "Follow organization theme",
-    "Form CSS": "Form CSS",
-    "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Form position",
     "Form position - Tooltip": "Location of the signup, signin and forget password forms",
     "Grant types": "Grant types",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
     "Method - Tooltip": "HTTP method",
     "New Webhook": "New Webhook",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Value"
   }
 }

web/src/locales/vi/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "Sao chép URL của trang nhắc nhở",
     "Copy signin page URL": "Sao chép URL trang đăng nhập",
     "Copy signup page URL": "Sao chép URL trang đăng ký",
+    "Custom CSS": "Mẫu CSS",
+    "Custom CSS - Edit": "Biểu mẫu CSS - Sửa",
+    "Custom CSS - Tooltip": "Phong cách CSS của các biểu mẫu đăng ký, đăng nhập và quên mật khẩu (ví dụ: thêm đường viền và bóng)",
+    "Custom CSS Mobile": "Custom CSS Mobile",
+    "Custom CSS Mobile - Edit": "Custom CSS Mobile - Edit",
+    "Custom CSS Mobile - Tooltip": "Custom CSS Mobile - Tooltip",
     "Dynamic": "Dynamic",
     "Edit Application": "Sửa ứng dụng",
     "Enable Email linking": "Cho phép liên kết Email",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "Tệp được tải lên thành công",
     "First, last": "Tên, Họ",
     "Follow organization theme": "Theo giao diện tổ chức",
-    "Form CSS": "Mẫu CSS",
-    "Form CSS - Edit": "Biểu mẫu CSS - Sửa",
-    "Form CSS - Tooltip": "Phong cách CSS của các biểu mẫu đăng ký, đăng nhập và quên mật khẩu (ví dụ: thêm đường viền và bóng)",
-    "Form CSS Mobile": "Form CSS Mobile",
-    "Form CSS Mobile - Edit": "Form CSS Mobile - Edit",
-    "Form CSS Mobile - Tooltip": "Form CSS Mobile - Tooltip",
     "Form position": "Vị trí của hình thức",
     "Form position - Tooltip": "Vị trí của các biểu mẫu đăng ký, đăng nhập và quên mật khẩu",
     "Grant types": "Loại hỗ trợ",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "Có nên bao gồm các trường mở rộng của người dùng trong định dạng JSON không?",
     "Method - Tooltip": "Phương thức HTTP",
     "New Webhook": "Webhook mới",
+    "Single org only": "Single org only",
+    "Single org only - Tooltip": "Triggered only in the organization that the webhook belongs to",
     "Value": "Giá trị"
   }
 }

web/src/locales/zh/data.json

@@ -30,6 +30,12 @@
     "Copy prompt page URL": "复制提醒页面URL",
     "Copy signin page URL": "复制登录页面URL",
     "Copy signup page URL": "复制注册页面URL",
+    "Custom CSS": "表单CSS",
+    "Custom CSS - Edit": "编辑表单CSS",
+    "Custom CSS - Tooltip": "注册、登录、忘记密码等表单的CSS样式（如增加边框和阴影）",
+    "Custom CSS Mobile": "表单CSS（移动端）",
+    "Custom CSS Mobile - Edit": "编辑表单CSS（移动端）",
+    "Custom CSS Mobile - Tooltip": "注册、登录、忘记密码等表单的CSS样式（如增加边框和阴影）（移动端）",
     "Dynamic": "动态开启",
     "Edit Application": "编辑应用",
     "Enable Email linking": "自动关联邮箱相同的账号",
@@ -52,12 +58,6 @@
     "File uploaded successfully": "文件上传成功",
     "First, last": "名字, 姓氏",
     "Follow organization theme": "使用组织主题",
-    "Form CSS": "表单CSS",
-    "Form CSS - Edit": "编辑表单CSS",
-    "Form CSS - Tooltip": "注册、登录、忘记密码等表单的CSS样式（如增加边框和阴影）",
-    "Form CSS Mobile": "表单CSS（移动端）",
-    "Form CSS Mobile - Edit": "编辑表单CSS（移动端）",
-    "Form CSS Mobile - Tooltip": "注册、登录、忘记密码等表单的CSS样式（如增加边框和阴影）（移动端）",
     "Form position": "表单位置",
     "Form position - Tooltip": "注册、登录、忘记密码等表单的位置",
     "Grant types": "OAuth授权类型",
@@ -1150,6 +1150,8 @@
     "Is user extended - Tooltip": "是否在JSON里加入用户的扩展字段",
     "Method - Tooltip": "HTTP方法",
     "New Webhook": "添加Webhook",
+    "Single org only": "仅本组织",
+    "Single org only - Tooltip": "仅在Webhook所在组织触发",
     "Value": "值"
   }
 }

web/src/table/SigninTable.js

@@ -178,7 +178,7 @@ class SigninTable extends React.Component {
         },
       },
       {
-        title: i18next.t("application:Form CSS"),
+        title: i18next.t("application:Custom CSS"),
         dataIndex: "label",
         key: "label",
         width: "200px",