mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-14 08:03:23 +08:00
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e2cd0604c2 | |||
| 78c3065fbb | |||
| af2a9f0374 | |||
| bfcfb56336 | |||
| c48306d117 | |||
| 6efec6b4b5 | |||
| 2daf26aa88 | |||
| 21c151bcf8 | |||
| b6b0b7d318 | |||
| 0ecc1d599f | |||
| 3456fc6695 | |||
| c302dc7b8e | |||
| d24ddd4f1c | |||
| 572616d390 | |||
| 2187310dbc | |||
| 26345bb21b | |||
| e0455df504 | |||
| 1dfbbf0e90 | |||
| d43d58dee2 | |||
| 9eb4b12041 | |||
| 3a45a4ee77 | |||
| 43393f034b | |||
| bafa80513b | |||
| 8d08140421 | |||
| 3d29e27d54 | |||
| 199f1d4d10 |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -194,7 +194,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
target: STANDARD
|
||||
platforms: linux/amd64
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: casbin/casdoor:${{steps.get-current-tag.outputs.tag }},casbin/casdoor:latest
|
||||
|
||||
@ -204,7 +204,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
target: ALLINONE
|
||||
platforms: linux/amd64
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: casbin/casdoor-all-in-one:${{steps.get-current-tag.outputs.tag }},casbin/casdoor-all-in-one:latest
|
||||
|
||||
|
||||
14
Dockerfile
14
Dockerfile
@ -1,10 +1,10 @@
|
||||
FROM node:18.19.0 AS FRONT
|
||||
FROM --platform=$BUILDPLATFORM node:18.19.0 AS FRONT
|
||||
WORKDIR /web
|
||||
COPY ./web .
|
||||
RUN yarn install --frozen-lockfile --network-timeout 1000000 && yarn run build
|
||||
|
||||
|
||||
FROM golang:1.20.12 AS BACK
|
||||
FROM --platform=$BUILDPLATFORM golang:1.20.12 AS BACK
|
||||
WORKDIR /go/src/casdoor
|
||||
COPY . .
|
||||
RUN ./build.sh
|
||||
@ -13,6 +13,9 @@ RUN go test -v -run TestGetVersionInfo ./util/system_test.go ./util/system.go >
|
||||
FROM alpine:latest AS STANDARD
|
||||
LABEL MAINTAINER="https://casdoor.org/"
|
||||
ARG USER=casdoor
|
||||
ARG TARGETOS
|
||||
ARG TARGETARCH
|
||||
ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}"
|
||||
|
||||
RUN sed -i 's/https/http/' /etc/apk/repositories
|
||||
RUN apk add --update sudo
|
||||
@ -28,7 +31,7 @@ RUN adduser -D $USER -u 1000 \
|
||||
|
||||
USER 1000
|
||||
WORKDIR /
|
||||
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server ./server
|
||||
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server_${BUILDX_ARCH} ./server
|
||||
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/swagger ./swagger
|
||||
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/conf/app.conf ./conf/app.conf
|
||||
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/version_info.txt ./go/src/casdoor/version_info.txt
|
||||
@ -47,12 +50,15 @@ RUN apt update \
|
||||
|
||||
FROM db AS ALLINONE
|
||||
LABEL MAINTAINER="https://casdoor.org/"
|
||||
ARG TARGETOS
|
||||
ARG TARGETARCH
|
||||
ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}"
|
||||
|
||||
RUN apt update
|
||||
RUN apt install -y ca-certificates && update-ca-certificates
|
||||
|
||||
WORKDIR /
|
||||
COPY --from=BACK /go/src/casdoor/server ./server
|
||||
COPY --from=BACK /go/src/casdoor/server_${BUILDX_ARCH} ./server
|
||||
COPY --from=BACK /go/src/casdoor/swagger ./swagger
|
||||
COPY --from=BACK /go/src/casdoor/docker-entrypoint.sh /docker-entrypoint.sh
|
||||
COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf
|
||||
|
||||
4
build.sh
4
build.sh
@ -8,4 +8,6 @@ else
|
||||
echo "Google is blocked, Go proxy is enabled: GOPROXY=https://goproxy.cn,direct"
|
||||
export GOPROXY="https://goproxy.cn,direct"
|
||||
fi
|
||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server .
|
||||
|
||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server_linux_amd64 .
|
||||
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-w -s" -o server_linux_arm64 .
|
||||
|
||||
@ -20,6 +20,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/beego/beego/utils/pagination"
|
||||
"github.com/casdoor/casdoor/conf"
|
||||
"github.com/casdoor/casdoor/object"
|
||||
"github.com/casdoor/casdoor/util"
|
||||
)
|
||||
@ -293,6 +294,11 @@ func (c *ApiController) UpdateUser() {
|
||||
return
|
||||
}
|
||||
|
||||
isUsernameLowered := conf.GetConfigBool("isUsernameLowered")
|
||||
if isUsernameLowered {
|
||||
user.Name = strings.ToLower(user.Name)
|
||||
}
|
||||
|
||||
isAdmin := c.IsAdmin()
|
||||
if pass, err := object.CheckPermissionForUpdateUser(oldUser, &user, isAdmin, c.GetAcceptLanguage()); !pass {
|
||||
c.ResponseError(err)
|
||||
|
||||
@ -295,7 +295,7 @@ func (c *ApiController) SendVerificationCode() {
|
||||
vform.CountryCode = mfaProps.CountryCode
|
||||
}
|
||||
|
||||
provider, err = application.GetSmsProvider(vform.Method)
|
||||
provider, err = application.GetSmsProvider(vform.Method, vform.CountryCode)
|
||||
if err != nil {
|
||||
c.ResponseError(err.Error())
|
||||
return
|
||||
|
||||
6
go.mod
6
go.mod
@ -9,12 +9,12 @@ 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.20.0
|
||||
github.com/casdoor/go-sms-sender v0.23.0
|
||||
github.com/casdoor/gomail/v2 v2.0.1
|
||||
github.com/casdoor/notify v0.45.0
|
||||
github.com/casdoor/oss v1.6.0
|
||||
github.com/casdoor/xorm-adapter/v3 v3.1.0
|
||||
github.com/casvisor/casvisor-go-sdk v1.3.0
|
||||
github.com/casvisor/casvisor-go-sdk v1.4.0
|
||||
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
|
||||
github.com/denisenkom/go-mssqldb v0.9.0
|
||||
github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
|
||||
@ -45,7 +45,7 @@ require (
|
||||
github.com/robfig/cron/v3 v3.0.1
|
||||
github.com/russellhaering/gosaml2 v0.9.0
|
||||
github.com/russellhaering/goxmldsig v1.2.0
|
||||
github.com/sendgrid/sendgrid-go v3.14.0+incompatible // indirect
|
||||
github.com/sendgrid/sendgrid-go v3.14.0+incompatible
|
||||
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
|
||||
github.com/shirou/gopsutil v3.21.11+incompatible
|
||||
github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed
|
||||
|
||||
10
go.sum
10
go.sum
@ -1003,6 +1003,8 @@ github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0I
|
||||
github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
|
||||
github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg=
|
||||
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
|
||||
github.com/apistd/uni-go-sdk v0.0.2 h1:7kqETCOz/rz8AQU55XGzxDFGoFeMgeZL5fGwvxKBZrc=
|
||||
github.com/apistd/uni-go-sdk v0.0.2/go.mod h1:eIqYos4IbHgE/rB75r05ypNLahooEMJCrbjXq322b74=
|
||||
github.com/appleboy/go-fcm v0.1.5/go.mod h1:MSxZ4LqGRsnywOjnlXJXMqbjZrG4vf+0oHitfC9HRH0=
|
||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
|
||||
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
|
||||
@ -1083,8 +1085,8 @@ 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.20.0 h1:yLbCakV04DzzehhgBklOrSeCFjMwpfKBeemz9b+Y8OM=
|
||||
github.com/casdoor/go-sms-sender v0.20.0/go.mod h1:cQs7qqohMJBgIVZebOCB8ko09naG1vzFJEH59VNIscs=
|
||||
github.com/casdoor/go-sms-sender v0.23.0 h1:N8+By4JNwyilEcx7cp0QGOepafefM88VwV+o3UEFZio=
|
||||
github.com/casdoor/go-sms-sender v0.23.0/go.mod h1:bOm4H8/YfJmEHjBatEVQFOnAf0OOn1B0Wi5B7zDhws0=
|
||||
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=
|
||||
@ -1093,8 +1095,8 @@ 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.3.0 h1:HVgm2g3lWpNX2wBNidzR743QY4O5kAjLUJ9tS2juO8g=
|
||||
github.com/casvisor/casvisor-go-sdk v1.3.0/go.mod h1:frnNtH5GA0wxzAQLyZxxfL0RSsSub9GQPi2Ybe86ocE=
|
||||
github.com/casvisor/casvisor-go-sdk v1.4.0 h1:hbZEGGJ1cwdHFAxeXrMoNw6yha6Oyg2F0qQhBNCN/dg=
|
||||
github.com/casvisor/casvisor-go-sdk v1.4.0/go.mod h1:frnNtH5GA0wxzAQLyZxxfL0RSsSub9GQPi2Ybe86ocE=
|
||||
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
|
||||
github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
|
||||
github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
|
||||
|
||||
@ -25,6 +25,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/casdoor/casdoor/util"
|
||||
"github.com/nyaruka/phonenumbers"
|
||||
"golang.org/x/oauth2"
|
||||
)
|
||||
|
||||
@ -130,6 +131,23 @@ type GoogleUserInfo struct {
|
||||
Locale string `json:"locale"`
|
||||
}
|
||||
|
||||
type GooglePeopleApiPhoneNumberMetaData struct {
|
||||
Primary bool `json:"primary"`
|
||||
}
|
||||
|
||||
type GooglePeopleApiPhoneNumber struct {
|
||||
CanonicalForm string `json:"canonicalForm"`
|
||||
MetaData GooglePeopleApiPhoneNumberMetaData `json:"metadata"`
|
||||
Value string `json:"value"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
type GooglePeopleApiResult struct {
|
||||
PhoneNumbers []GooglePeopleApiPhoneNumber `json:"phoneNumbers"`
|
||||
Etag string `json:"etag"`
|
||||
ResourceName string `json:"resourceName"`
|
||||
}
|
||||
|
||||
func (idp *GoogleIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
|
||||
if strings.HasPrefix(token.AccessToken, GoogleIdTokenKey) {
|
||||
googleIdToken, ok := token.Extra(GoogleIdTokenKey).(GoogleIdToken)
|
||||
@ -167,12 +185,49 @@ func (idp *GoogleIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
|
||||
return nil, errors.New("google email is empty")
|
||||
}
|
||||
|
||||
url = fmt.Sprintf("https://people.googleapis.com/v1/people/me?personFields=phoneNumbers&access_token=%s", token.AccessToken)
|
||||
resp, err = idp.Client.Get(url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
defer resp.Body.Close()
|
||||
body, err = io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var googlePeopleResult GooglePeopleApiResult
|
||||
err = json.Unmarshal(body, &googlePeopleResult)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var phoneNumber string
|
||||
var countryCode string
|
||||
if len(googlePeopleResult.PhoneNumbers) != 0 {
|
||||
for _, phoneData := range googlePeopleResult.PhoneNumbers {
|
||||
if phoneData.MetaData.Primary {
|
||||
phoneNumber = phoneData.CanonicalForm
|
||||
break
|
||||
}
|
||||
}
|
||||
phoneNumberParsed, err := phonenumbers.Parse(phoneNumber, "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
countryCode = phonenumbers.GetRegionCodeForNumber(phoneNumberParsed)
|
||||
phoneNumber = fmt.Sprintf("%d", phoneNumberParsed.GetNationalNumber())
|
||||
}
|
||||
|
||||
userInfo := UserInfo{
|
||||
Id: googleUserInfo.Id,
|
||||
Username: googleUserInfo.Email,
|
||||
DisplayName: googleUserInfo.Name,
|
||||
Email: googleUserInfo.Email,
|
||||
AvatarUrl: googleUserInfo.Picture,
|
||||
Phone: phoneNumber,
|
||||
CountryCode: countryCode,
|
||||
}
|
||||
return &userInfo, nil
|
||||
}
|
||||
|
||||
@ -46,6 +46,7 @@ type SigninItem struct {
|
||||
Name string `json:"name"`
|
||||
Visible bool `json:"visible"`
|
||||
Label string `json:"label"`
|
||||
CustomCss string `json:"customCss"`
|
||||
Placeholder string `json:"placeholder"`
|
||||
Rule string `json:"rule"`
|
||||
IsCustom bool `json:"isCustom"`
|
||||
@ -209,7 +210,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem := &SigninItem{
|
||||
Name: "Back button",
|
||||
Visible: true,
|
||||
Label: ".back-button {\n top: 65px;\n left: 15px;\n position: absolute;\n}\n.back-inner-button{}",
|
||||
CustomCss: ".back-button {\n top: 65px;\n left: 15px;\n position: absolute;\n}\n.back-inner-button{}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -217,7 +218,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Languages",
|
||||
Visible: true,
|
||||
Label: ".login-languages {\n top: 55px;\n right: 5px;\n position: absolute;\n}",
|
||||
CustomCss: ".login-languages {\n top: 55px;\n right: 5px;\n position: absolute;\n}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -225,7 +226,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Logo",
|
||||
Visible: true,
|
||||
Label: ".login-logo-box {}",
|
||||
CustomCss: ".login-logo-box {}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -233,7 +234,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Signin methods",
|
||||
Visible: true,
|
||||
Label: ".signin-methods {}",
|
||||
CustomCss: ".signin-methods {}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -241,7 +242,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Username",
|
||||
Visible: true,
|
||||
Label: ".login-username {}\n.login-username-input{}",
|
||||
CustomCss: ".login-username {}\n.login-username-input{}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -249,7 +250,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Password",
|
||||
Visible: true,
|
||||
Label: ".login-password {}\n.login-password-input{}",
|
||||
CustomCss: ".login-password {}\n.login-password-input{}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -257,7 +258,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Agreement",
|
||||
Visible: true,
|
||||
Label: ".login-agreement {}",
|
||||
CustomCss: ".login-agreement {}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -265,7 +266,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Forgot password?",
|
||||
Visible: true,
|
||||
Label: ".login-forget-password {\n display: inline-flex;\n justify-content: space-between;\n width: 320px;\n margin-bottom: 25px;\n}",
|
||||
CustomCss: ".login-forget-password {\n display: inline-flex;\n justify-content: space-between;\n width: 320px;\n margin-bottom: 25px;\n}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -273,7 +274,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Login button",
|
||||
Visible: true,
|
||||
Label: ".login-button-box {\n margin-bottom: 5px;\n}\n.login-button {\n width: 100%;\n}",
|
||||
CustomCss: ".login-button-box {\n margin-bottom: 5px;\n}\n.login-button {\n width: 100%;\n}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -281,7 +282,7 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Signup link",
|
||||
Visible: true,
|
||||
Label: ".login-signup-link {\n margin-bottom: 24px;\n display: flex;\n justify-content: end;\n}",
|
||||
CustomCss: ".login-signup-link {\n margin-bottom: 24px;\n display: flex;\n justify-content: end;\n}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
@ -289,12 +290,18 @@ func extendApplicationWithSigninItems(application *Application) (err error) {
|
||||
signinItem = &SigninItem{
|
||||
Name: "Providers",
|
||||
Visible: true,
|
||||
Label: ".provider-img {\n width: 30px;\n margin: 5px;\n}\n.provider-big-img {\n margin-bottom: 10px;\n}",
|
||||
CustomCss: ".provider-img {\n width: 30px;\n margin: 5px;\n}\n.provider-big-img {\n margin-bottom: 10px;\n}",
|
||||
Placeholder: "",
|
||||
Rule: "None",
|
||||
}
|
||||
application.SigninItems = append(application.SigninItems, signinItem)
|
||||
}
|
||||
for idx, item := range application.SigninItems {
|
||||
if item.Label != "" && item.CustomCss == "" {
|
||||
application.SigninItems[idx].CustomCss = item.Label
|
||||
application.SigninItems[idx].Label = ""
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -670,11 +677,7 @@ func AddApplication(application *Application) (bool, error) {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteApplication(application *Application) (bool, error) {
|
||||
if application.Name == "app-built-in" {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func deleteApplication(application *Application) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{application.Owner, application.Name}).Delete(&Application{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
@ -683,6 +686,14 @@ func DeleteApplication(application *Application) (bool, error) {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteApplication(application *Application) (bool, error) {
|
||||
if application.Name == "app-built-in" {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
return deleteApplication(application)
|
||||
}
|
||||
|
||||
func (application *Application) GetId() string {
|
||||
return fmt.Sprintf("%s/%s", application.Owner, application.Name)
|
||||
}
|
||||
|
||||
@ -38,7 +38,20 @@ func (application *Application) GetProviderByCategory(category string) (*Provide
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (application *Application) GetProviderByCategoryAndRule(category string, method string) (*Provider, error) {
|
||||
func isProviderItemCountryCodeMatched(providerItem *ProviderItem, countryCode string) bool {
|
||||
if len(providerItem.CountryCodes) == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
for _, countryCode2 := range providerItem.CountryCodes {
|
||||
if countryCode2 == "" || countryCode2 == "All" || countryCode2 == "all" || countryCode2 == countryCode {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (application *Application) GetProviderByCategoryAndRule(category string, method string, countryCode string) (*Provider, error) {
|
||||
providers, err := GetProviders(application.Organization)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -54,7 +67,13 @@ func (application *Application) GetProviderByCategoryAndRule(category string, me
|
||||
}
|
||||
|
||||
for _, providerItem := range application.Providers {
|
||||
if providerItem.Rule == method || (providerItem.Rule == "all" || providerItem.Rule == "" || providerItem.Rule == "None") {
|
||||
if providerItem.Provider != nil && providerItem.Provider.Category == "SMS" {
|
||||
if !isProviderItemCountryCodeMatched(providerItem, countryCode) {
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if providerItem.Rule == method || providerItem.Rule == "" || providerItem.Rule == "All" || providerItem.Rule == "all" || providerItem.Rule == "None" {
|
||||
if provider, ok := m[providerItem.Name]; ok {
|
||||
return provider, nil
|
||||
}
|
||||
@ -65,11 +84,11 @@ func (application *Application) GetProviderByCategoryAndRule(category string, me
|
||||
}
|
||||
|
||||
func (application *Application) GetEmailProvider(method string) (*Provider, error) {
|
||||
return application.GetProviderByCategoryAndRule("Email", method)
|
||||
return application.GetProviderByCategoryAndRule("Email", method, "All")
|
||||
}
|
||||
|
||||
func (application *Application) GetSmsProvider(method string) (*Provider, error) {
|
||||
return application.GetProviderByCategoryAndRule("SMS", method)
|
||||
func (application *Application) GetSmsProvider(method string, countryCode string) (*Provider, error) {
|
||||
return application.GetProviderByCategoryAndRule("SMS", method, countryCode)
|
||||
}
|
||||
|
||||
func (application *Application) GetStorageProvider() (*Provider, error) {
|
||||
|
||||
@ -154,6 +154,15 @@ func AddGroups(groups []*Group) (bool, error) {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func deleteGroup(group *Group) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{group.Owner, group.Name}).Delete(&Group{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteGroup(group *Group) (bool, error) {
|
||||
_, err := ormer.Engine.Get(group)
|
||||
if err != nil {
|
||||
@ -172,12 +181,7 @@ func DeleteGroup(group *Group) (bool, error) {
|
||||
return false, errors.New("group has users")
|
||||
}
|
||||
|
||||
affected, err := ormer.Engine.ID(core.PK{group.Owner, group.Name}).Delete(&Group{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
return deleteGroup(group)
|
||||
}
|
||||
|
||||
func checkGroupName(name string) error {
|
||||
|
||||
@ -409,7 +409,7 @@ func initBuiltInPermission() {
|
||||
Groups: []string{},
|
||||
Roles: []string{},
|
||||
Domains: []string{},
|
||||
Model: "model-built-in",
|
||||
Model: "user-model-built-in",
|
||||
Adapter: "",
|
||||
ResourceType: "Application",
|
||||
Resources: []string{"app-built-in"},
|
||||
|
||||
@ -266,7 +266,13 @@ func initDefinedOrganization(organization *Organization) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deleteOrganization(organization)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete organization")
|
||||
}
|
||||
}
|
||||
organization.CreatedTime = util.GetCurrentTime()
|
||||
organization.AccountItems = getBuiltInAccountItems()
|
||||
@ -284,7 +290,13 @@ func initDefinedApplication(application *Application) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deleteApplication(application)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete application")
|
||||
}
|
||||
}
|
||||
application.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddApplication(application)
|
||||
@ -299,7 +311,13 @@ func initDefinedUser(user *User) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deleteUser(user)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete user")
|
||||
}
|
||||
}
|
||||
user.CreatedTime = util.GetCurrentTime()
|
||||
user.Id = util.GenerateId()
|
||||
@ -319,7 +337,13 @@ func initDefinedCert(cert *Cert) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteCert(cert)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete cert")
|
||||
}
|
||||
}
|
||||
cert.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddCert(cert)
|
||||
@ -335,7 +359,13 @@ func initDefinedLdap(ldap *Ldap) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteLdap(ldap)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete ldap")
|
||||
}
|
||||
}
|
||||
_, err = AddLdap(ldap)
|
||||
if err != nil {
|
||||
@ -350,7 +380,13 @@ func initDefinedProvider(provider *Provider) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteProvider(provider)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete provider")
|
||||
}
|
||||
}
|
||||
_, err = AddProvider(provider)
|
||||
if err != nil {
|
||||
@ -365,7 +401,13 @@ func initDefinedModel(model *Model) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteModel(model)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete provider")
|
||||
}
|
||||
}
|
||||
model.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddModel(model)
|
||||
@ -381,7 +423,13 @@ func initDefinedPermission(permission *Permission) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deletePermission(permission)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete permission")
|
||||
}
|
||||
}
|
||||
permission.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddPermission(permission)
|
||||
@ -397,7 +445,13 @@ func initDefinedPayment(payment *Payment) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeletePayment(payment)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete payment")
|
||||
}
|
||||
}
|
||||
payment.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddPayment(payment)
|
||||
@ -413,7 +467,13 @@ func initDefinedProduct(product *Product) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteProduct(product)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete product")
|
||||
}
|
||||
}
|
||||
product.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddProduct(product)
|
||||
@ -429,7 +489,13 @@ func initDefinedResource(resource *Resource) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteResource(resource)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete resource")
|
||||
}
|
||||
}
|
||||
resource.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddResource(resource)
|
||||
@ -445,7 +511,13 @@ func initDefinedRole(role *Role) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deleteRole(role)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete role")
|
||||
}
|
||||
}
|
||||
role.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddRole(role)
|
||||
@ -461,7 +533,13 @@ func initDefinedSyncer(syncer *Syncer) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteSyncer(syncer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete role")
|
||||
}
|
||||
}
|
||||
syncer.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddSyncer(syncer)
|
||||
@ -477,7 +555,13 @@ func initDefinedToken(token *Token) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteToken(token)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete token")
|
||||
}
|
||||
}
|
||||
token.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddToken(token)
|
||||
@ -493,7 +577,13 @@ func initDefinedWebhook(webhook *Webhook) {
|
||||
}
|
||||
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteWebhook(webhook)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete webhook")
|
||||
}
|
||||
}
|
||||
webhook.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddWebhook(webhook)
|
||||
@ -508,7 +598,13 @@ func initDefinedGroup(group *Group) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := deleteGroup(group)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete group")
|
||||
}
|
||||
}
|
||||
group.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddGroup(group)
|
||||
@ -523,7 +619,13 @@ func initDefinedAdapter(adapter *Adapter) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteAdapter(adapter)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete adapter")
|
||||
}
|
||||
}
|
||||
adapter.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddAdapter(adapter)
|
||||
@ -538,7 +640,13 @@ func initDefinedEnforcer(enforcer *Enforcer) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteEnforcer(enforcer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete enforcer")
|
||||
}
|
||||
}
|
||||
enforcer.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddEnforcer(enforcer)
|
||||
@ -553,7 +661,13 @@ func initDefinedPlan(plan *Plan) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeletePlan(plan)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete plan")
|
||||
}
|
||||
}
|
||||
plan.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddPlan(plan)
|
||||
@ -563,12 +677,18 @@ func initDefinedPlan(plan *Plan) {
|
||||
}
|
||||
|
||||
func initDefinedPricing(pricing *Pricing) {
|
||||
existed, err := getPlan(pricing.Owner, pricing.Name)
|
||||
existed, err := getPricing(pricing.Owner, pricing.Name)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeletePricing(pricing)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete pricing")
|
||||
}
|
||||
}
|
||||
pricing.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddPricing(pricing)
|
||||
@ -583,7 +703,13 @@ func initDefinedInvitation(invitation *Invitation) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteInvitation(invitation)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete invitation")
|
||||
}
|
||||
}
|
||||
invitation.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddInvitation(invitation, "en")
|
||||
@ -593,6 +719,7 @@ func initDefinedInvitation(invitation *Invitation) {
|
||||
}
|
||||
|
||||
func initDefinedRecord(record *casvisorsdk.Record) {
|
||||
record.Id = 0
|
||||
record.CreatedTime = util.GetCurrentTime()
|
||||
_ = AddRecord(record)
|
||||
}
|
||||
@ -611,7 +738,13 @@ func initDefinedSubscription(subscription *Subscription) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteSubscription(subscription)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete subscription")
|
||||
}
|
||||
}
|
||||
subscription.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddSubscription(subscription)
|
||||
@ -626,7 +759,13 @@ func initDefinedTransaction(transaction *Transaction) {
|
||||
panic(err)
|
||||
}
|
||||
if existed != nil {
|
||||
return
|
||||
affected, err := DeleteTransaction(transaction)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !affected {
|
||||
panic("Fail to delete transaction")
|
||||
}
|
||||
}
|
||||
transaction.CreatedTime = util.GetCurrentTime()
|
||||
_, err = AddTransaction(transaction)
|
||||
|
||||
@ -241,11 +241,7 @@ func AddOrganization(organization *Organization) (bool, error) {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteOrganization(organization *Organization) (bool, error) {
|
||||
if organization.Name == "built-in" {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func deleteOrganization(organization *Organization) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{organization.Owner, organization.Name}).Delete(&Organization{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
@ -254,6 +250,14 @@ func DeleteOrganization(organization *Organization) (bool, error) {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteOrganization(organization *Organization) (bool, error) {
|
||||
if organization.Name == "built-in" {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
return deleteOrganization(organization)
|
||||
}
|
||||
|
||||
func GetOrganizationByUser(user *User) (*Organization, error) {
|
||||
if user == nil {
|
||||
return nil, nil
|
||||
|
||||
@ -286,13 +286,22 @@ func AddPermissionsInBatch(permissions []*Permission) (bool, error) {
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
func DeletePermission(permission *Permission) (bool, error) {
|
||||
func deletePermission(permission *Permission) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{permission.Owner, permission.Name}).Delete(&Permission{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if affected != 0 {
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeletePermission(permission *Permission) (bool, error) {
|
||||
affected, err := deletePermission(permission)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if affected {
|
||||
err = removeGroupingPolicies(permission)
|
||||
if err != nil {
|
||||
return false, err
|
||||
@ -314,7 +323,7 @@ func DeletePermission(permission *Permission) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
func getPermissionsByUser(userId string) ([]*Permission, error) {
|
||||
|
||||
@ -133,7 +133,7 @@ func AddPlan(plan *Plan) (bool, error) {
|
||||
}
|
||||
|
||||
func DeletePlan(plan *Plan) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{plan.Owner, plan.Name}).Delete(plan)
|
||||
affected, err := ormer.Engine.ID(core.PK{plan.Owner, plan.Name}).Delete(Plan{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
@ -140,7 +140,7 @@ func AddPricing(pricing *Pricing) (bool, error) {
|
||||
}
|
||||
|
||||
func DeletePricing(pricing *Pricing) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{pricing.Owner, pricing.Name}).Delete(pricing)
|
||||
affected, err := ormer.Engine.ID(core.PK{pricing.Owner, pricing.Name}).Delete(Pricing{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ type Provider struct {
|
||||
|
||||
Host string `xorm:"varchar(100)" json:"host"`
|
||||
Port int `json:"port"`
|
||||
DisableSsl bool `json:"disableSsl"` // If the provider type is WeChat, DisableSsl means EnableQRCode
|
||||
DisableSsl bool `json:"disableSsl"` // If the provider type is WeChat, DisableSsl means EnableQRCode, if type is Google, it means sync phone number
|
||||
Title string `xorm:"varchar(100)" json:"title"`
|
||||
Content string `xorm:"varchar(2000)" json:"content"` // If provider type is WeChat, Content means QRCode string by Base64 encoding
|
||||
Receiver string `xorm:"varchar(100)" json:"receiver"`
|
||||
|
||||
@ -21,6 +21,7 @@ type ProviderItem struct {
|
||||
CanSignUp bool `json:"canSignUp"`
|
||||
CanSignIn bool `json:"canSignIn"`
|
||||
CanUnlink bool `json:"canUnlink"`
|
||||
CountryCodes []string `json:"countryCodes"`
|
||||
Prompted bool `json:"prompted"`
|
||||
SignupGroup string `json:"signupGroup"`
|
||||
Rule string `json:"rule"`
|
||||
|
||||
@ -17,6 +17,7 @@ package object
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/beego/context"
|
||||
@ -25,10 +26,14 @@ import (
|
||||
"github.com/casvisor/casvisor-go-sdk/casvisorsdk"
|
||||
)
|
||||
|
||||
var logPostOnly bool
|
||||
var (
|
||||
logPostOnly bool
|
||||
passwordRegex *regexp.Regexp
|
||||
)
|
||||
|
||||
func init() {
|
||||
logPostOnly = conf.GetConfigBool("logPostOnly")
|
||||
passwordRegex = regexp.MustCompile("\"password\":\".+\"")
|
||||
}
|
||||
|
||||
type Record struct {
|
||||
@ -40,6 +45,10 @@ type Response struct {
|
||||
Msg string `json:"msg"`
|
||||
}
|
||||
|
||||
func maskPassword(recordString string) string {
|
||||
return passwordRegex.ReplaceAllString(recordString, "\"password\":\"***\"")
|
||||
}
|
||||
|
||||
func NewRecord(ctx *context.Context) (*casvisorsdk.Record, error) {
|
||||
ip := strings.Replace(util.GetIPFromRequest(ctx.Request), ": ", "", -1)
|
||||
action := strings.Replace(ctx.Request.URL.Path, "/api/", "", -1)
|
||||
@ -51,6 +60,7 @@ func NewRecord(ctx *context.Context) (*casvisorsdk.Record, error) {
|
||||
object := ""
|
||||
if ctx.Input.RequestBody != nil && len(ctx.Input.RequestBody) != 0 {
|
||||
object = string(ctx.Input.RequestBody)
|
||||
object = maskPassword(object)
|
||||
}
|
||||
|
||||
respBytes, err := json.Marshal(ctx.Input.Data()["json"])
|
||||
@ -80,12 +90,18 @@ func NewRecord(ctx *context.Context) (*casvisorsdk.Record, error) {
|
||||
Action: action,
|
||||
Language: languageCode,
|
||||
Object: object,
|
||||
StatusCode: 200,
|
||||
Response: fmt.Sprintf("{status:\"%s\", msg:\"%s\"}", resp.Status, resp.Msg),
|
||||
IsTriggered: false,
|
||||
}
|
||||
return &record, nil
|
||||
}
|
||||
|
||||
func addRecord(record *casvisorsdk.Record) (int64, error) {
|
||||
affected, err := ormer.Engine.Insert(record)
|
||||
return affected, err
|
||||
}
|
||||
|
||||
func AddRecord(record *casvisorsdk.Record) bool {
|
||||
if logPostOnly {
|
||||
if record.Method == "GET" {
|
||||
@ -98,6 +114,7 @@ func AddRecord(record *casvisorsdk.Record) bool {
|
||||
}
|
||||
|
||||
record.Owner = record.Organization
|
||||
record.Object = maskPassword(record.Object)
|
||||
|
||||
errWebhook := SendWebhooks(record)
|
||||
if errWebhook == nil {
|
||||
@ -107,7 +124,7 @@ func AddRecord(record *casvisorsdk.Record) bool {
|
||||
}
|
||||
|
||||
if casvisorsdk.GetClient() == nil {
|
||||
affected, err := ormer.Engine.Insert(record)
|
||||
affected, err := addRecord(record)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@ -212,6 +229,40 @@ func getFilteredWebhooks(webhooks []*Webhook, organization string, action string
|
||||
return res
|
||||
}
|
||||
|
||||
func addWebhookRecord(webhook *Webhook, record *casvisorsdk.Record, statusCode int, respBody string, sendError error) error {
|
||||
if statusCode == 200 {
|
||||
return nil
|
||||
}
|
||||
|
||||
if len(respBody) > 300 {
|
||||
respBody = respBody[0:300]
|
||||
}
|
||||
|
||||
webhookRecord := &casvisorsdk.Record{
|
||||
Owner: record.Owner,
|
||||
Name: util.GenerateId(),
|
||||
CreatedTime: util.GetCurrentTime(),
|
||||
Organization: record.Organization,
|
||||
User: record.User,
|
||||
|
||||
Method: webhook.Method,
|
||||
Action: "send-webhook",
|
||||
RequestUri: webhook.Url,
|
||||
StatusCode: statusCode,
|
||||
Response: respBody,
|
||||
Language: record.Language,
|
||||
IsTriggered: false,
|
||||
}
|
||||
|
||||
if sendError != nil {
|
||||
webhookRecord.Response = sendError.Error()
|
||||
}
|
||||
|
||||
_, err := addRecord(webhookRecord)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func SendWebhooks(record *casvisorsdk.Record) error {
|
||||
webhooks, err := getWebhooksByOrganization("")
|
||||
if err != nil {
|
||||
@ -236,11 +287,16 @@ func SendWebhooks(record *casvisorsdk.Record) error {
|
||||
}
|
||||
}
|
||||
|
||||
err = sendWebhook(webhook, record, user)
|
||||
statusCode, respBody, err := sendWebhook(webhook, record, user)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
continue
|
||||
}
|
||||
|
||||
err = addWebhookRecord(webhook, record, statusCode, respBody, err)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if len(errs) > 0 {
|
||||
|
||||
@ -238,6 +238,15 @@ func AddRolesInBatch(roles []*Role) bool {
|
||||
return affected
|
||||
}
|
||||
|
||||
func deleteRole(role *Role) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteRole(role *Role) (bool, error) {
|
||||
roleId := role.GetId()
|
||||
permissions, err := GetPermissionsByRole(roleId)
|
||||
@ -253,12 +262,7 @@ func DeleteRole(role *Role) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
affected, err := ormer.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
return deleteRole(role)
|
||||
}
|
||||
|
||||
func (role *Role) GetId() string {
|
||||
|
||||
@ -48,7 +48,7 @@ func SendSms(provider *Provider, content string, phoneNumbers ...string) error {
|
||||
if provider.AppId != "" {
|
||||
phoneNumbers = append([]string{provider.AppId}, phoneNumbers...)
|
||||
}
|
||||
} else if provider.Type == sender.Aliyun {
|
||||
} else if provider.Type == sender.Aliyun || provider.Type == sender.SendCloud {
|
||||
for i, number := range phoneNumbers {
|
||||
phoneNumbers[i] = strings.TrimPrefix(number, "+86")
|
||||
}
|
||||
|
||||
@ -155,7 +155,8 @@ func GetMaskedSyncers(syncers []*Syncer, errs ...error) ([]*Syncer, error) {
|
||||
|
||||
func UpdateSyncer(id string, syncer *Syncer) (bool, error) {
|
||||
owner, name := util.GetOwnerAndNameFromId(id)
|
||||
if s, err := getSyncer(owner, name); err != nil {
|
||||
s, err := getSyncer(owner, name)
|
||||
if err != nil {
|
||||
return false, err
|
||||
} else if s == nil {
|
||||
return false, nil
|
||||
@ -163,7 +164,7 @@ func UpdateSyncer(id string, syncer *Syncer) (bool, error) {
|
||||
|
||||
session := ormer.Engine.ID(core.PK{owner, name}).AllCols()
|
||||
if syncer.Password == "***" {
|
||||
session.Omit("password")
|
||||
syncer.Password = s.Password
|
||||
}
|
||||
affected, err := session.Update(syncer)
|
||||
if err != nil {
|
||||
|
||||
@ -142,10 +142,12 @@ func (syncer *Syncer) syncUsers() error {
|
||||
}
|
||||
}
|
||||
|
||||
if len(newUsers) != 0 {
|
||||
_, err = AddUsersInBatch(newUsers)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if !syncer.IsReadOnly {
|
||||
for _, user := range users {
|
||||
|
||||
@ -877,6 +877,7 @@ func AddUsers(users []*User) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
user.Name = strings.TrimSpace(user.Name)
|
||||
if isUsernameLowered {
|
||||
user.Name = strings.ToLower(user.Name)
|
||||
}
|
||||
@ -919,6 +920,15 @@ func AddUsersInBatch(users []*User) (bool, error) {
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
func deleteUser(user *User) (bool, error) {
|
||||
affected, err := ormer.Engine.ID(core.PK{user.Owner, user.Name}).Delete(&User{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
}
|
||||
|
||||
func DeleteUser(user *User) (bool, error) {
|
||||
// Forced offline the user first
|
||||
_, err := DeleteSession(util.GetSessionId(user.Owner, user.Name, CasdoorApplication))
|
||||
@ -926,12 +936,7 @@ func DeleteUser(user *User) (bool, error) {
|
||||
return false, err
|
||||
}
|
||||
|
||||
affected, err := ormer.Engine.ID(core.PK{user.Owner, user.Name}).Delete(&User{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return affected != 0, nil
|
||||
return deleteUser(user)
|
||||
}
|
||||
|
||||
func GetUserInfo(user *User, scope string, aud string, host string) (*Userinfo, error) {
|
||||
|
||||
@ -21,12 +21,11 @@ import (
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/casdoor/casdoor/conf"
|
||||
"github.com/casdoor/casdoor/i18n"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
|
||||
"github.com/casdoor/casdoor/idp"
|
||||
"github.com/casdoor/casdoor/util"
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/xorm-io/core"
|
||||
)
|
||||
|
||||
@ -57,6 +56,13 @@ func HasUserByField(organizationName string, field string, value string) bool {
|
||||
}
|
||||
|
||||
func GetUserByFields(organization string, field string) (*User, error) {
|
||||
isUsernameLowered := conf.GetConfigBool("isUsernameLowered")
|
||||
if isUsernameLowered {
|
||||
field = strings.ToLower(field)
|
||||
}
|
||||
|
||||
field = strings.TrimSpace(field)
|
||||
|
||||
// check username
|
||||
user, err := GetUserByField(organization, "name", field)
|
||||
if err != nil || user != nil {
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
package object
|
||||
|
||||
import (
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
@ -22,7 +23,7 @@ import (
|
||||
"github.com/casvisor/casvisor-go-sdk/casvisorsdk"
|
||||
)
|
||||
|
||||
func sendWebhook(webhook *Webhook, record *casvisorsdk.Record, extendedUser *User) error {
|
||||
func sendWebhook(webhook *Webhook, record *casvisorsdk.Record, extendedUser *User) (int, string, error) {
|
||||
client := &http.Client{}
|
||||
|
||||
type RecordEx struct {
|
||||
@ -38,7 +39,7 @@ func sendWebhook(webhook *Webhook, record *casvisorsdk.Record, extendedUser *Use
|
||||
|
||||
req, err := http.NewRequest(webhook.Method, webhook.Url, body)
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, "", err
|
||||
}
|
||||
|
||||
req.Header.Set("Content-Type", webhook.ContentType)
|
||||
@ -47,6 +48,15 @@ func sendWebhook(webhook *Webhook, record *casvisorsdk.Record, extendedUser *Use
|
||||
req.Header.Set(header.Name, header.Value)
|
||||
}
|
||||
|
||||
_, err = client.Do(req)
|
||||
return err
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return 0, "", err
|
||||
}
|
||||
|
||||
defer resp.Body.Close()
|
||||
bodyBytes, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return 0, "", err
|
||||
}
|
||||
return resp.StatusCode, string(bodyBytes), err
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ func fastAutoSignin(ctx *context.Context) (string, error) {
|
||||
scope := ctx.Input.Query("scope")
|
||||
state := ctx.Input.Query("state")
|
||||
nonce := ""
|
||||
codeChallenge := ""
|
||||
codeChallenge := ctx.Input.Query("code_challenge")
|
||||
if clientId == "" || responseType != "code" || redirectUri == "" {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ class ProductEditPage extends React.Component {
|
||||
UNSAFE_componentWillMount() {
|
||||
this.getProduct();
|
||||
this.getOrganizations();
|
||||
this.getPaymentProviders();
|
||||
this.getPaymentProviders(this.state.organizationName);
|
||||
}
|
||||
|
||||
getProduct() {
|
||||
@ -67,8 +67,8 @@ class ProductEditPage extends React.Component {
|
||||
});
|
||||
}
|
||||
|
||||
getPaymentProviders() {
|
||||
ProviderBackend.getProviders(this.props.account.owner)
|
||||
getPaymentProviders(organizationName) {
|
||||
ProviderBackend.getProviders(organizationName)
|
||||
.then((res) => {
|
||||
if (res.status === "ok") {
|
||||
this.setState({
|
||||
|
||||
@ -209,6 +209,8 @@ class ProviderEditPage extends React.Component {
|
||||
return Setting.getLabel(i18next.t("provider:Public key"), i18next.t("provider:Public key - Tooltip"));
|
||||
} 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 if (provider.type === "SendCloud SMS") {
|
||||
return "SMS_USER";
|
||||
} else {
|
||||
return Setting.getLabel(i18next.t("provider:Client ID"), i18next.t("provider:Client ID - Tooltip"));
|
||||
}
|
||||
@ -260,6 +262,8 @@ class ProviderEditPage extends React.Component {
|
||||
return Setting.getLabel(i18next.t("provider:Auth Key"), i18next.t("provider:Auth Key - Tooltip"));
|
||||
} else if (provider.type === "Infobip SMS") {
|
||||
return Setting.getLabel(i18next.t("provider:Api Key"), i18next.t("provider:Api Key - Tooltip"));
|
||||
} else if (provider.type === "SendCloud SMS") {
|
||||
return "SMS_KEY";
|
||||
} else {
|
||||
return Setting.getLabel(i18next.t("provider:Client secret"), i18next.t("provider:Client secret - Tooltip"));
|
||||
}
|
||||
@ -828,6 +832,20 @@ class ProviderEditPage extends React.Component {
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
{
|
||||
this.state.provider.type !== "Google" ? null : (
|
||||
<Row style={{marginTop: "20px"}} >
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
{Setting.getLabel(i18next.t("provider:Get phone number"), i18next.t("provider:Get phone number - Tooltip"))} :
|
||||
</Col>
|
||||
<Col span={1} >
|
||||
<Switch disabled={!this.state.provider.clientId} checked={this.state.provider.disableSsl} onChange={checked => {
|
||||
this.updateProviderField("disableSsl", checked);
|
||||
}} />
|
||||
</Col>
|
||||
</Row>
|
||||
)
|
||||
}
|
||||
{
|
||||
this.state.provider.type !== "ADFS" && this.state.provider.type !== "AzureAD" && this.state.provider.type !== "AzureADB2C" && this.state.provider.type !== "Casdoor" && this.state.provider.type !== "Okta" ? null : (
|
||||
<Row style={{marginTop: "20px"}} >
|
||||
@ -1089,7 +1107,7 @@ class ProviderEditPage extends React.Component {
|
||||
</React.Fragment>
|
||||
) : this.state.provider.category === "SMS" ? (
|
||||
<React.Fragment>
|
||||
{["Custom HTTP SMS", "Twilio SMS", "Amazon SNS", "Azure ACS", "Msg91 SMS", "Infobip SMS"].includes(this.state.provider.type) ?
|
||||
{["Custom HTTP SMS", "Twilio SMS", "Amazon SNS", "Azure ACS", "Msg91 SMS", "Infobip SMS", "SendCloud SMS"].includes(this.state.provider.type) ?
|
||||
null :
|
||||
(<Row style={{marginTop: "20px"}} >
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
|
||||
@ -151,6 +151,14 @@ class RecordListPage extends BaseListPage {
|
||||
sorter: true,
|
||||
...this.getColumnSearchProps("language"),
|
||||
},
|
||||
{
|
||||
title: i18next.t("record:Status code"),
|
||||
dataIndex: "statusCode",
|
||||
key: "statusCode",
|
||||
width: "90px",
|
||||
sorter: true,
|
||||
...this.getColumnSearchProps("statusCode"),
|
||||
},
|
||||
{
|
||||
title: i18next.t("record:Response"),
|
||||
dataIndex: "response",
|
||||
|
||||
@ -139,6 +139,10 @@ export const OtherProviderInfo = {
|
||||
logo: `${StaticBaseUrl}/img/social_twilio.svg`,
|
||||
url: "https://www.twilio.com/messaging",
|
||||
},
|
||||
"SendCloud SMS": {
|
||||
logo: `${StaticBaseUrl}/img/sms_sendcloud.png`,
|
||||
url: "https://www.sendcloud.net/",
|
||||
},
|
||||
"SmsBao SMS": {
|
||||
logo: `${StaticBaseUrl}/img/social_smsbao.png`,
|
||||
url: "https://www.smsbao.com/",
|
||||
@ -1039,6 +1043,7 @@ export function getProviderTypeOptions(category) {
|
||||
{id: "Huawei Cloud SMS", name: "Huawei Cloud SMS"},
|
||||
{id: "UCloud SMS", name: "UCloud SMS"},
|
||||
{id: "Twilio SMS", name: "Twilio SMS"},
|
||||
{id: "SendCloud SMS", name: "SendCloud SMS"},
|
||||
{id: "SmsBao SMS", name: "SmsBao SMS"},
|
||||
{id: "SUBMAIL SMS", name: "SUBMAIL SMS"},
|
||||
{id: "Msg91 SMS", name: "Msg91 SMS"},
|
||||
|
||||
@ -202,7 +202,7 @@ class UserEditPage extends React.Component {
|
||||
return value;
|
||||
}
|
||||
|
||||
updateUserField(key, value) {
|
||||
updateUserField(key, value, idx) {
|
||||
if (this.props.account === null) {
|
||||
return;
|
||||
}
|
||||
@ -210,7 +210,15 @@ class UserEditPage extends React.Component {
|
||||
value = this.parseUserField(key, value);
|
||||
|
||||
const user = this.state.user;
|
||||
if (key === "address") {
|
||||
if (!user[key]) {
|
||||
user[key] = ["", ""];
|
||||
}
|
||||
user[key][idx] = value;
|
||||
} else {
|
||||
user[key] = value;
|
||||
}
|
||||
|
||||
this.setState({
|
||||
user: user,
|
||||
});
|
||||
@ -501,16 +509,33 @@ class UserEditPage extends React.Component {
|
||||
);
|
||||
} else if (accountItem.name === "Address") {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<Row style={{marginTop: "20px"}} >
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
{Setting.getLabel(i18next.t("user:Address"), i18next.t("user:Address - Tooltip"))} :
|
||||
</Col>
|
||||
<Col span={22} >
|
||||
<Input value={this.state.user.address} onChange={e => {
|
||||
this.updateUserField("address", e.target.value);
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
<span>{i18next.t("user:Address line") + " 1"}</span> :
|
||||
</Col>
|
||||
<Col span={20} >
|
||||
<Input value={!this.state.user.address ? "" : this.state.user.address[0]} onChange={e => {
|
||||
this.updateUserField("address", e.target.value, 0);
|
||||
}} />
|
||||
</Col>
|
||||
</Row>
|
||||
<Row style={{marginTop: "20px"}} >
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
</Col>
|
||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||
<span>{i18next.t("user:Address line") + " 2"}</span> :
|
||||
</Col>
|
||||
<Col span={20} >
|
||||
<Input value={!this.state.user.address ? "" : this.state.user.address[1]} onChange={e => {
|
||||
this.updateUserField("address", e.target.value, 1);
|
||||
}} />
|
||||
</Col>
|
||||
</Row>
|
||||
</React.Fragment>
|
||||
);
|
||||
} else if (accountItem.name === "Affiliation") {
|
||||
return (
|
||||
|
||||
@ -532,7 +532,7 @@ class LoginPage extends React.Component {
|
||||
if (signinItem.name === "Logo") {
|
||||
return (
|
||||
<div className="login-logo-box">
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{
|
||||
Setting.renderHelmet(application)
|
||||
}
|
||||
@ -544,7 +544,7 @@ class LoginPage extends React.Component {
|
||||
} else if (signinItem.name === "Back button") {
|
||||
return (
|
||||
<div className="back-button">
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{
|
||||
this.renderBackButton()
|
||||
}
|
||||
@ -562,14 +562,14 @@ class LoginPage extends React.Component {
|
||||
|
||||
return (
|
||||
<div className="login-languages">
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<LanguageSelect languages={application.organizationObj.languages} />
|
||||
</div>
|
||||
);
|
||||
} else if (signinItem.name === "Signin methods") {
|
||||
return (
|
||||
<div>
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{this.renderMethodChoiceBox()}
|
||||
</div>
|
||||
)
|
||||
@ -577,10 +577,11 @@ class LoginPage extends React.Component {
|
||||
} else if (signinItem.name === "Username") {
|
||||
return (
|
||||
<div>
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<Form.Item
|
||||
name="username"
|
||||
className="login-username"
|
||||
label={signinItem.label ? signinItem.label : null}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
@ -653,14 +654,14 @@ class LoginPage extends React.Component {
|
||||
} else if (signinItem.name === "Password") {
|
||||
return (
|
||||
<div>
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{this.renderPasswordOrCodeInput()}
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{this.renderPasswordOrCodeInput(signinItem)}
|
||||
</div>
|
||||
);
|
||||
} else if (signinItem.name === "Forgot password?") {
|
||||
return (
|
||||
<div>
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div className="login-forget-password">
|
||||
<Form.Item name="autoSignin" valuePropName="checked" noStyle>
|
||||
<Checkbox style={{float: "left"}}>
|
||||
@ -668,7 +669,7 @@ class LoginPage extends React.Component {
|
||||
</Checkbox>
|
||||
</Form.Item>
|
||||
{
|
||||
signinItem.visible ? Setting.renderForgetLink(application, i18next.t("login:Forgot password?")) : null
|
||||
signinItem.visible ? Setting.renderForgetLink(application, signinItem.label ? signinItem.label : i18next.t("login:Forgot password?")) : null
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@ -678,7 +679,7 @@ class LoginPage extends React.Component {
|
||||
} else if (signinItem.name === "Login button") {
|
||||
return (
|
||||
<Form.Item className="login-button-box">
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<Button
|
||||
type="primary"
|
||||
htmlType="submit"
|
||||
@ -687,7 +688,7 @@ class LoginPage extends React.Component {
|
||||
{
|
||||
this.state.loginMethod === "webAuthn" ? i18next.t("login:Sign in with WebAuthn") :
|
||||
this.state.loginMethod === "faceId" ? i18next.t("login:Sign in with Face ID") :
|
||||
i18next.t("login:Sign In")
|
||||
signinItem.label ? signinItem.label : i18next.t("login:Sign In")
|
||||
}
|
||||
</Button>
|
||||
{
|
||||
@ -722,7 +723,7 @@ class LoginPage extends React.Component {
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
<Form.Item>
|
||||
{
|
||||
application.providers.filter(providerItem => this.isProviderVisible(providerItem)).map(providerItem => {
|
||||
@ -737,13 +738,13 @@ class LoginPage extends React.Component {
|
||||
);
|
||||
} else if (signinItem.name.startsWith("Text ") || signinItem?.isCustom) {
|
||||
return (
|
||||
<div dangerouslySetInnerHTML={{__html: signinItem.label}} />
|
||||
<div dangerouslySetInnerHTML={{__html: signinItem.customCss}} />
|
||||
);
|
||||
} else if (signinItem.name === "Signup link") {
|
||||
return (
|
||||
<div style={{width: "100%"}} className="login-signup-link">
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.label?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{this.renderFooter(application)}
|
||||
<div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
|
||||
{this.renderFooter(application, signinItem)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@ -896,18 +897,21 @@ class LoginPage extends React.Component {
|
||||
/>;
|
||||
}
|
||||
|
||||
renderFooter(application) {
|
||||
renderFooter(application, signinItem) {
|
||||
return (
|
||||
<div>
|
||||
{
|
||||
!application.enableSignUp ? null : (
|
||||
signinItem.label ? Setting.renderSignupLink(application, signinItem.label) :
|
||||
(
|
||||
<React.Fragment>
|
||||
{i18next.t("login:No account?")}
|
||||
{i18next.t("login:No account?")}
|
||||
{
|
||||
Setting.renderSignupLink(application, i18next.t("login:sign up now"))
|
||||
}
|
||||
</React.Fragment>
|
||||
)
|
||||
)
|
||||
}
|
||||
</div>
|
||||
);
|
||||
@ -1022,7 +1026,7 @@ class LoginPage extends React.Component {
|
||||
});
|
||||
}
|
||||
|
||||
renderPasswordOrCodeInput() {
|
||||
renderPasswordOrCodeInput(signinItem) {
|
||||
const application = this.getApplicationObj();
|
||||
if (this.state.loginMethod === "password" || this.state.loginMethod === "ldap") {
|
||||
return (
|
||||
@ -1031,6 +1035,7 @@ class LoginPage extends React.Component {
|
||||
<Form.Item
|
||||
name="password"
|
||||
className="login-password"
|
||||
label={signinItem.label ? signinItem.label : null}
|
||||
rules={[{required: true, message: i18next.t("login:Please input your password!")}]}
|
||||
>
|
||||
<Input.Password
|
||||
|
||||
@ -384,8 +384,7 @@ export function getAuthUrl(application, provider, method, code) {
|
||||
|
||||
let endpoint = authInfo[provider.type].endpoint;
|
||||
let redirectUri = `${window.location.origin}/callback`;
|
||||
const scope = authInfo[provider.type].scope;
|
||||
|
||||
let scope = authInfo[provider.type].scope;
|
||||
const isShortState = (provider.type === "WeChat" && navigator.userAgent.includes("MicroMessenger")) || (provider.type === "Twitter");
|
||||
const state = Util.getStateFromQueryParams(application.name, provider.name, method, isShortState);
|
||||
const codeChallenge = "P3S-a7dr8bgM4bF6vOyiKkKETDl16rcAzao9F8UIL1Y"; // SHA256(Base64-URL-encode("casdoor-verifier"))
|
||||
@ -396,6 +395,8 @@ export function getAuthUrl(application, provider, method, code) {
|
||||
}
|
||||
} else if (provider.type === "Apple") {
|
||||
redirectUri = `${window.location.origin}/api/callback`;
|
||||
} else if (provider.type === "Google" && provider.disableSsl) {
|
||||
scope += "+https://www.googleapis.com/auth/user.phonenumbers.read";
|
||||
}
|
||||
|
||||
if (provider.type === "Google" || provider.type === "GitHub" || provider.type === "QQ" || provider.type === "Facebook"
|
||||
|
||||
@ -389,6 +389,14 @@ class SignupPage extends React.Component {
|
||||
return Promise.reject(i18next.t("signup:The input is not valid Email!"));
|
||||
}
|
||||
|
||||
if (signupItem.regex) {
|
||||
const reg = new RegExp(signupItem.regex);
|
||||
if (!reg.test(this.state.email)) {
|
||||
this.setState({validEmail: false});
|
||||
return Promise.reject(i18next.t("signup:The input Email doesn't match the signup item regex!"));
|
||||
}
|
||||
}
|
||||
|
||||
this.setState({validEmail: true});
|
||||
return Promise.resolve();
|
||||
},
|
||||
|
||||
@ -13,11 +13,14 @@
|
||||
// limitations under the License.
|
||||
|
||||
import {Select} from "antd";
|
||||
import i18next from "i18next";
|
||||
import * as Setting from "../../Setting";
|
||||
import React from "react";
|
||||
|
||||
const {Option} = Select;
|
||||
|
||||
export const CountryCodeSelect = (props) => {
|
||||
const {onChange, style, disabled, initValue} = props;
|
||||
const {onChange, style, disabled, initValue, mode} = props;
|
||||
const countryCodes = props.countryCodes ?? [];
|
||||
const [value, setValue] = React.useState("");
|
||||
|
||||
@ -42,11 +45,19 @@ export const CountryCodeSelect = (props) => {
|
||||
style={style}
|
||||
disabled={disabled}
|
||||
value={value}
|
||||
mode={mode}
|
||||
dropdownMatchSelectWidth={false}
|
||||
optionLabelProp={"label"}
|
||||
onChange={handleOnChange}
|
||||
filterOption={(input, option) => (option?.text ?? "").toLowerCase().includes(input.toLowerCase())}
|
||||
>
|
||||
{
|
||||
props.hasDefault ? (<Option key={"All"} value={"All"} label={i18next.t("organization:All")} text={"organization:All"} >
|
||||
<div style={{display: "flex", justifyContent: "space-between", marginRight: "10px"}}>
|
||||
{i18next.t("organization:All")}
|
||||
</div>
|
||||
</Option>) : null
|
||||
}
|
||||
{
|
||||
Setting.getCountryCodeData(countryCodes).map((country) => Setting.getCountryCodeOption(country))
|
||||
}
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name des Hosts",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Kopiere den Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "Die Eingabe ist keine Rechnungssteuer-ID!",
|
||||
"The input is not invoice title!": "Der Eingabewert ist nicht die Rechnungsbezeichnung!",
|
||||
"The input is not valid Email!": "Die Eingabe ist keine gültige E-Mail-Adresse!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Drittanbieter-Anmeldungen, die mit dem Benutzer verknüpft sind",
|
||||
"Address": "Adresse",
|
||||
"Address - Tooltip": "Wohnadresse",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Zugehörigkeit",
|
||||
"Affiliation - Tooltip": "Arbeitgeber, wie Firmenname oder Organisationsname",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "Eingabe des Passworts"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Anfitrión",
|
||||
"Host - Tooltip": "Nombre del anfitrión",
|
||||
"IdP": "IdP = Proveedor de Identidad",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copiar enlace",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "¡La entrada no es el ID fiscal de la factura!",
|
||||
"The input is not invoice title!": "¡El entrada no es el título de la factura!",
|
||||
"The input is not valid Email!": "¡La entrada no es un correo electrónico válido!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Accesos sociales ligados por el usuario",
|
||||
"Address": "Dirección",
|
||||
"Address - Tooltip": "Dirección residencial",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Afiliación",
|
||||
"Affiliation - Tooltip": "Empleador, como el nombre de una empresa u organización",
|
||||
"Bio": "Bio - Biografía",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "Ingresar contraseña"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "L'adresse e-mail affichée comme expéditeur dans les e-mails envoyés",
|
||||
"From name": "Nom de l'expéditeur",
|
||||
"From name - Tooltip": "Le nom affiché comme expéditeur dans les e-mails envoyés",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Hôte",
|
||||
"Host - Tooltip": "Nom d'hôte",
|
||||
"IdP": "IdP (Identité Fournisseur)",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copier le lien",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "L'entrée n'est pas l'identifiant fiscal de la facture !",
|
||||
"The input is not invoice title!": "L'entrée n'est pas un nom ou une dénomination sociale !",
|
||||
"The input is not valid Email!": "L'entrée n'est pas une adresse e-mail valide !",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Service de connexions tiers liés au compte",
|
||||
"Address": "Adresse",
|
||||
"Address - Tooltip": "Adresse résidentielle",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employeur, tel que le nom de l'entreprise ou de l'organisation",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "saisir le mot de passe"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Tuan rumah",
|
||||
"Host - Tooltip": "Nama tuan rumah",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Salin Tautan",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "Input ini bukan Tax ID faktur!",
|
||||
"The input is not invoice title!": "Masukan bukan judul faktur!",
|
||||
"The input is not valid Email!": "Input yang dimasukkan bukan sesuai dengan format Email yang valid!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Masuk sosial yang terhubung oleh pengguna",
|
||||
"Address": "Alamat",
|
||||
"Address - Tooltip": "Alamat tempat tinggal",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Afiliasi",
|
||||
"Affiliation - Tooltip": "Pemberi Kerja, seperti nama perusahaan atau nama organisasi",
|
||||
"Bio": "Bio: Biografi",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "masukkan kata sandi"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "ホスト",
|
||||
"Host - Tooltip": "ホストの名前",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "コピー リンク",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "入力されたものは請求書の税番号ではありません！",
|
||||
"The input is not invoice title!": "インプットは請求書タイトルではありません！",
|
||||
"The input is not valid Email!": "入力されたものは有効なメールではありません",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "ユーザーによってリンクされたソーシャルログイン",
|
||||
"Address": "住所",
|
||||
"Address - Tooltip": "住所",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "所属",
|
||||
"Affiliation - Tooltip": "企業名や団体名などの雇用主",
|
||||
"Bio": "バイオ技術",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "パスワードを入力してください"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "호스트",
|
||||
"Host - Tooltip": "호스트의 이름",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "링크 복사하기",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "입력한 것은 송장 세금 ID가 아닙니다!",
|
||||
"The input is not invoice title!": "입력값은 송장 제목이 아닙니다!",
|
||||
"The input is not valid Email!": "입력 값은 유효한 이메일이 아닙니다!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "사용자가 연결한 소셜 로그인",
|
||||
"Address": "주소",
|
||||
"Address - Tooltip": "주거지 주소",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "소속",
|
||||
"Affiliation - Tooltip": "고용주, 회사명 또는 조직명",
|
||||
"Bio": "바이오",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "비밀번호를 입력해주세요"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Endereço de e-mail do remetente",
|
||||
"From name": "Nome do remetente",
|
||||
"From name - Tooltip": "Nome do remetente",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Nome do host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copiar Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "A entrada não é um ID fiscal de fatura válido!",
|
||||
"The input is not invoice title!": "A entrada não é um título de fatura válido!",
|
||||
"The input is not valid Email!": "A entrada não é um Email válido!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Logins sociais vinculados pelo usuário",
|
||||
"Address": "Endereço",
|
||||
"Address - Tooltip": "Endereço residencial",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Afiliação",
|
||||
"Affiliation - Tooltip": "Empregador, como nome da empresa ou organização",
|
||||
"Bio": "Biografia",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "Digite a senha"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Хост",
|
||||
"Host - Tooltip": "Имя хоста",
|
||||
"IdP": "ИдП",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Копировать ссылку",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "Входные данные не являются идентификатором налога по счету-фактуре!",
|
||||
"The input is not invoice title!": "Входные данные не являются названием счета-фактуры!",
|
||||
"The input is not valid Email!": "Ввод не является действительным адресом электронной почты!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Социальные логины, связанные пользователем",
|
||||
"Address": "Адрес",
|
||||
"Address - Tooltip": "Адрес проживания",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Принадлежность",
|
||||
"Affiliation - Tooltip": "Работодатель, такой как название компании или организации",
|
||||
"Bio": "Био",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "введите пароль"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "input password"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "Email address of \"From\"",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "Name of \"From\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Host",
|
||||
"Host - Tooltip": "Name of host",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Copy Link",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
|
||||
"The input is not invoice title!": "The input is not invoice title!",
|
||||
"The input is not valid Email!": "The input is not valid Email!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Social logins linked by the user",
|
||||
"Address": "Address",
|
||||
"Address - Tooltip": "Residential address",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Affiliation",
|
||||
"Affiliation - Tooltip": "Employer, such as company name or organization name",
|
||||
"Bio": "Bio",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "şifreyi girin"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -80,6 +80,7 @@
|
||||
"Only signup": "Тільки реєстрація",
|
||||
"Org choice mode": "Режим вибору організації",
|
||||
"Org choice mode - Tooltip": "Режим вибору організації – підказка",
|
||||
"Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"": "Please enable \\\"Signin session\\\" first before enabling \\\"Auto signin\\\"",
|
||||
"Please input your application!": "Будь ласка, введіть свою заявку!",
|
||||
"Please input your organization!": "Будь ласка, введіть вашу організацію!",
|
||||
"Please select a HTML file": "Виберіть файл HTML",
|
||||
@ -229,6 +230,7 @@
|
||||
"Email": "Електронна пошта",
|
||||
"Email - Tooltip": "Дійсна електронна пошта",
|
||||
"Email only": "Лише електронна пошта",
|
||||
"Email or Phone": "Email or Phone",
|
||||
"Enable": "Увімкнути",
|
||||
"Enable dark logo": "Увімкнути темний логотип",
|
||||
"Enable dark logo - Tooltip": "Увімкнути темний логотип",
|
||||
@ -311,6 +313,7 @@
|
||||
"Phone": "Телефон",
|
||||
"Phone - Tooltip": "Номер телефону",
|
||||
"Phone only": "Тільки телефон",
|
||||
"Phone or Email": "Phone or Email",
|
||||
"Plan": "План",
|
||||
"Plan - Tooltip": "План – підказка",
|
||||
"Plans": "Плани",
|
||||
@ -391,6 +394,7 @@
|
||||
"User type": "Тип користувача",
|
||||
"User type - Tooltip": "Теги, до яких належить користувач, за умовчанням \"звичайний користувач\"",
|
||||
"Users": "Користувачі",
|
||||
"Users - Tooltip": "Users - Tooltip",
|
||||
"Users under all organizations": "Користувачі в усіх організаціях",
|
||||
"Verifications": "Перевірки",
|
||||
"Webhooks": "Веб-хуки",
|
||||
@ -473,7 +477,6 @@
|
||||
"LDAP username, Email or phone": "Ім’я користувача LDAP, електронна пошта або телефон",
|
||||
"Loading": "Завантаження",
|
||||
"Logging out...": "Вихід...",
|
||||
"Login button": "Кнопка входу",
|
||||
"MetaMask plugin not detected": "Плагін MetaMask не виявлено",
|
||||
"Model loading failure": "Помилка завантаження моделі",
|
||||
"No account?": "Немає облікового запису?",
|
||||
@ -498,6 +501,7 @@
|
||||
"Sign in with Face ID": "Увійдіть за допомогою Face ID",
|
||||
"Sign in with WebAuthn": "Увійдіть за допомогою WebAuthn",
|
||||
"Sign in with {type}": "Увійдіть за допомогою {type}",
|
||||
"Signin button": "Signin button",
|
||||
"Signing in...": "Вхід...",
|
||||
"Successfully logged in with WebAuthn credentials": "Успішно ввійшли за допомогою облікових даних WebAuthn",
|
||||
"The camera is currently in use by another webpage": "Камера зараз використовується іншою веб-сторінкою",
|
||||
@ -774,6 +778,8 @@
|
||||
"From address - Tooltip": "Електронна адреса \"Від\"",
|
||||
"From name": "Від імені",
|
||||
"From name - Tooltip": "Назва \"Від\"",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Хост",
|
||||
"Host - Tooltip": "Ім'я хоста",
|
||||
"IdP": "IDP",
|
||||
@ -893,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Спрацьовує",
|
||||
"Object": "Об'єкт",
|
||||
"Response": "Відповідь"
|
||||
"Response": "Відповідь",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Копіювати посилання",
|
||||
@ -941,6 +948,7 @@
|
||||
"Please select your country code!": "Виберіть код країни!",
|
||||
"Please select your country/region!": "Виберіть свою країну/регіон!",
|
||||
"Regex": "Регулярний вираз",
|
||||
"Signup button": "Signup button",
|
||||
"Terms of Use": "Умови використання",
|
||||
"Terms of Use - Tooltip": "Умови використання, з якими користувачі повинні ознайомитися та погодитися під час реєстрації",
|
||||
"Text 1": "Текст 1",
|
||||
@ -948,6 +956,7 @@
|
||||
"Text 3": "Текст 3",
|
||||
"Text 4": "Текст 4",
|
||||
"Text 5": "Текст 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "Введені дані не є ідентифікаційним номером платника податків!",
|
||||
"The input is not invoice title!": "Введені дані не є назвою рахунку!",
|
||||
"The input is not valid Email!": "Введена недійсна адреса електронної пошти!",
|
||||
@ -1068,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Соціальні входи, пов’язані користувачем",
|
||||
"Address": "Адреса",
|
||||
"Address - Tooltip": "Адреса місця проживання",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Приналежність",
|
||||
"Affiliation - Tooltip": "Роботодавець, наприклад назва компанії чи організації",
|
||||
"Bio": "біографія",
|
||||
@ -1162,9 +1172,11 @@
|
||||
"Values": "Цінності",
|
||||
"Verification code sent": "Код підтвердження надіслано",
|
||||
"WebAuthn credentials": "Облікові дані WebAuthn",
|
||||
"You have changed the username, please save your change first before modifying the password": "You have changed the username, please save your change first before modifying the password",
|
||||
"input password": "введіть пароль"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Приймач"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "From address - Tooltip",
|
||||
"From name": "From name",
|
||||
"From name - Tooltip": "From name - Tooltip",
|
||||
"Get phone number": "Get phone number",
|
||||
"Get phone number - Tooltip": "If sync phone number is enabled, you should enable google people api first and add scope https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "Chủ nhà",
|
||||
"Host - Tooltip": "Tên của người chủ chỗ ở",
|
||||
"IdP": "IdP",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "Is triggered",
|
||||
"Object": "Object",
|
||||
"Response": "Response"
|
||||
"Response": "Response",
|
||||
"Status code": "Status code"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "Sao chép liên kết",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "Text 3",
|
||||
"Text 4": "Text 4",
|
||||
"Text 5": "Text 5",
|
||||
"The input Email doesn't match the signup item regex!": "The input Email doesn't match the signup item regex!",
|
||||
"The input is not invoice Tax ID!": "Đầu vào không phải là Mã số thuế của hóa đơn!",
|
||||
"The input is not invoice title!": "Đầu vào không phải là tiêu đề hóa đơn!",
|
||||
"The input is not valid Email!": "Đầu vào không phải là địa chỉ Email hợp lệ!",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "Đăng nhập xã hội liên kết bởi người dùng",
|
||||
"Address": "Địa chỉ",
|
||||
"Address - Tooltip": "Địa chỉ cư trú",
|
||||
"Address line": "Address line",
|
||||
"Affiliation": "Liên kết",
|
||||
"Affiliation - Tooltip": "Nhà tuyển dụng, chẳng hạn như tên công ty hoặc tổ chức",
|
||||
"Bio": "bản vẻ đời sống",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "Nhập mật khẩu"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "Is used",
|
||||
"Receiver": "Receiver"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -778,6 +778,8 @@
|
||||
"From address - Tooltip": "邮件里发件人的邮箱地址",
|
||||
"From name": "发件人名称",
|
||||
"From name - Tooltip": "邮件里发件人的显示名称",
|
||||
"Get phone number": "获取手机号码",
|
||||
"Get phone number - Tooltip": "如果启用获取手机号码，你需要先启用peopleApi并添加范围https://www.googleapis.com/auth/user.phonenumbers.read",
|
||||
"Host": "主机",
|
||||
"Host - Tooltip": "主机名",
|
||||
"IdP": "身份提供商",
|
||||
@ -897,7 +899,8 @@
|
||||
"record": {
|
||||
"Is triggered": "是否触发",
|
||||
"Object": "实体",
|
||||
"Response": "响应"
|
||||
"Response": "响应",
|
||||
"Status code": "状态码"
|
||||
},
|
||||
"resource": {
|
||||
"Copy Link": "复制链接",
|
||||
@ -953,6 +956,7 @@
|
||||
"Text 3": "文本3",
|
||||
"Text 4": "文本4",
|
||||
"Text 5": "文本5",
|
||||
"The input Email doesn't match the signup item regex!": "您输入的邮箱地址与注册项的regex表达式不匹配!",
|
||||
"The input is not invoice Tax ID!": "您输入的纳税人识别号有误！",
|
||||
"The input is not invoice title!": "您输入的发票抬头有误！",
|
||||
"The input is not valid Email!": "您输入的电子邮箱格式有误！",
|
||||
@ -1073,6 +1077,7 @@
|
||||
"3rd-party logins - Tooltip": "用户所绑定的社会化登录",
|
||||
"Address": "地址",
|
||||
"Address - Tooltip": "居住地址",
|
||||
"Address line": "地址",
|
||||
"Affiliation": "工作单位",
|
||||
"Affiliation - Tooltip": "工作单位，如公司、组织名称",
|
||||
"Bio": "自我介绍",
|
||||
@ -1171,6 +1176,7 @@
|
||||
"input password": "输入密码"
|
||||
},
|
||||
"verification": {
|
||||
"Is used": "已使用",
|
||||
"Receiver": "接收者"
|
||||
},
|
||||
"webhook": {
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
import React from "react";
|
||||
import {DeleteOutlined, DownOutlined, UpOutlined} from "@ant-design/icons";
|
||||
import {Button, Col, Input, Row, Select, Switch, Table, Tooltip} from "antd";
|
||||
import {CountryCodeSelect} from "../common/select/CountryCodeSelect";
|
||||
import * as Setting from "../Setting";
|
||||
import i18next from "i18next";
|
||||
import * as Provider from "../auth/Provider";
|
||||
@ -29,6 +30,10 @@ class ProviderTable extends React.Component {
|
||||
};
|
||||
}
|
||||
|
||||
getUserOrganization() {
|
||||
return this.props.application?.organizationObj;
|
||||
}
|
||||
|
||||
updateTable(table) {
|
||||
this.props.onUpdateTable(table);
|
||||
}
|
||||
@ -79,7 +84,7 @@ class ProviderTable extends React.Component {
|
||||
|
||||
// If the provider is email or SMS, set the rule to "all" instead of the default "None"
|
||||
if (provider.category === "Email" || provider.category === "SMS") {
|
||||
this.updateField(table, index, "rule", "all");
|
||||
this.updateField(table, index, "rule", "All");
|
||||
}
|
||||
}} >
|
||||
{
|
||||
@ -109,6 +114,30 @@ class ProviderTable extends React.Component {
|
||||
return Provider.getProviderLogoWidget(provider);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: i18next.t("user:Country/Region"),
|
||||
dataIndex: "countryCodes",
|
||||
key: "countryCodes",
|
||||
width: "140px",
|
||||
render: (text, record, index) => {
|
||||
if (record.provider?.category !== "SMS") {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<CountryCodeSelect
|
||||
style={{width: "100%"}}
|
||||
hasDefault={true}
|
||||
mode={"multiple"}
|
||||
initValue={text ? text : ["All"]}
|
||||
onChange={(value) => {
|
||||
this.updateField(table, index, "countryCodes", value);
|
||||
}}
|
||||
countryCodes={this.getUserOrganization()?.countryCodes}
|
||||
/>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: i18next.t("provider:Can signup"),
|
||||
dataIndex: "canSignUp",
|
||||
@ -198,7 +227,7 @@ class ProviderTable extends React.Component {
|
||||
title: i18next.t("application:Rule"),
|
||||
dataIndex: "rule",
|
||||
key: "rule",
|
||||
width: "120px",
|
||||
width: "160px",
|
||||
render: (text, record, index) => {
|
||||
if (record.provider?.type === "Google") {
|
||||
if (text === "None") {
|
||||
@ -230,12 +259,12 @@ class ProviderTable extends React.Component {
|
||||
);
|
||||
} else if (record.provider?.category === "SMS" || record.provider?.category === "Email") {
|
||||
if (text === "None") {
|
||||
text = "all";
|
||||
text = "All";
|
||||
}
|
||||
return (
|
||||
<Select virtual={false} style={{width: "100%"}}
|
||||
value={text}
|
||||
defaultValue="all"
|
||||
defaultValue="All"
|
||||
onChange={value => {
|
||||
this.updateField(table, index, "rule", value);
|
||||
}}>
|
||||
|
||||
@ -134,7 +134,7 @@ class SigninTable extends React.Component {
|
||||
value={getItemDisplayName(text)}
|
||||
onChange={value => {
|
||||
this.updateField(table, index, "name", value);
|
||||
this.updateField(table, index, "label", SigninTableDefaultCssMap[value]);
|
||||
this.updateField(table, index, "customCss", SigninTableDefaultCssMap[value]);
|
||||
}} >
|
||||
{
|
||||
Setting.getDeduplicatedArray(items, table, "name").map((item, index) => <Option key={index} value={item.name}>{item.displayName}</Option>)
|
||||
@ -166,7 +166,7 @@ class SigninTable extends React.Component {
|
||||
},
|
||||
},
|
||||
{
|
||||
title: i18next.t("signup:Label HTML"),
|
||||
title: i18next.t("signup:Label"),
|
||||
dataIndex: "label",
|
||||
key: "label",
|
||||
width: "200px",
|
||||
@ -188,14 +188,18 @@ class SigninTable extends React.Component {
|
||||
}} />
|
||||
</Popover>
|
||||
);
|
||||
} else if (["Username", "Password", "Signup link", "Forgot password?", "Login button"].includes(record.name)) {
|
||||
return <Input value={text} style={{marginBottom: "10px"}} onChange={e => {
|
||||
this.updateField(table, index, "label", e.target.value);
|
||||
}} />;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: i18next.t("application:Custom CSS"),
|
||||
dataIndex: "label",
|
||||
key: "label",
|
||||
dataIndex: "customCss",
|
||||
key: "customCss",
|
||||
width: "200px",
|
||||
render: (text, record, index) => {
|
||||
if (!record.name.startsWith("Text ") && !record?.isCustom) {
|
||||
@ -205,13 +209,13 @@ class SigninTable extends React.Component {
|
||||
<CodeMirror value={text?.replaceAll("<style>", "").replaceAll("</style>", "")}
|
||||
options={{mode: "css", theme: "material-darker"}}
|
||||
onBeforeChange={(editor, data, value) => {
|
||||
this.updateField(table, index, "label", value);
|
||||
this.updateField(table, index, "customCss", value);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
} title={i18next.t("application:CSS style")} trigger="click">
|
||||
<Input value={text?.replaceAll("<style>", "").replaceAll("</style>", "")} onChange={e => {
|
||||
this.updateField(table, index, "label", e.target.value);
|
||||
this.updateField(table, index, "customCss", e.target.value);
|
||||
}} />
|
||||
</Popover>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user