mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-09 01:13:41 +08:00
Compare commits
157 Commits
Author | SHA1 | Date | |
---|---|---|---|
3ae81716b9 | |||
3a70f4e788 | |||
842d4865b2 | |||
19fb7273bb | |||
943bd82731 | |||
f2f962b893 | |||
eb72c9f273 | |||
4605938f8e | |||
14fa914e6f | |||
e877045671 | |||
29f1ec08a2 | |||
389744a27d | |||
dc7b66822d | |||
efacf8226c | |||
6beb68dcce | |||
c9b990a319 | |||
eedcde3aa5 | |||
950a274b23 | |||
478bd05db4 | |||
9256791420 | |||
6f2ef32d02 | |||
8b8c866fd2 | |||
6f7230e949 | |||
9558bb4167 | |||
04567babf8 | |||
543b316942 | |||
e2b6e8ee6e | |||
e7e0518517 | |||
943aa61869 | |||
fcc75dd3be | |||
8698f4111a | |||
fdccb8b22b | |||
19e7d0b0bd | |||
f6a502f7ff | |||
b34e16b145 | |||
11b56c340f | |||
cc6ea1b60e | |||
95b32d5ebf | |||
b47baa06e1 | |||
24a824d394 | |||
75b8357de8 | |||
087405dad2 | |||
6a6a1fa920 | |||
907d18d2e9 | |||
a728e083eb | |||
457e6208ad | |||
d10b1347a8 | |||
f5b7f8cb45 | |||
5d9b17542f | |||
0021226a60 | |||
79fc0516dd | |||
a73be11990 | |||
eddd8acbf4 | |||
d0741e3705 | |||
c66561dc9a | |||
fcdf1e8dd2 | |||
6d4f94986e | |||
9ca686b240 | |||
c93bc0dda2 | |||
7d25b9cdd8 | |||
ead844131e | |||
ce2a4bbf6e | |||
fcb80b800f | |||
6daadf8d3c | |||
090389b86a | |||
b566af8e11 | |||
57028c2059 | |||
a6e9084973 | |||
6fb3e2cd7f | |||
8b6bde6d82 | |||
fb2b03f00f | |||
1681138729 | |||
1d8b0a264e | |||
b525210835 | |||
4ab2ca7a25 | |||
dcf148fb7f | |||
c8846f1a2d | |||
0559298d6c | |||
ddb5e26fcd | |||
1f39027b78 | |||
eae3b0d367 | |||
186f0ac97b | |||
308f305c53 | |||
d498bc60ce | |||
7bbe1e38c1 | |||
f465fc6ce0 | |||
c952c2f2f4 | |||
86ae97d1e5 | |||
6ea73e3eca | |||
a71a190db5 | |||
da69d94445 | |||
b8b915abe1 | |||
5d1548e989 | |||
a0dc6e06cd | |||
ae130788ec | |||
f075d0fd74 | |||
65d4946042 | |||
26acece8af | |||
48a0c8473f | |||
082ae3c91e | |||
1ee2ff1d30 | |||
c0d9969013 | |||
1bdee13150 | |||
d668022af0 | |||
e227875c2b | |||
e473de3162 | |||
c5ef841d3f | |||
d46288b591 | |||
b968bf033c | |||
eca2527bc0 | |||
ef836acfe9 | |||
a51f0d7c08 | |||
e3c36beaf4 | |||
19dce838d1 | |||
b41d8652f0 | |||
e705eecffe | |||
2bb2c36f22 | |||
1bb3d2dea9 | |||
96566a626b | |||
042e52bd16 | |||
e207fd243b | |||
30b7fd963f | |||
ca314bbfb5 | |||
812c44e070 | |||
78e45d07cf | |||
0856977b92 | |||
a44a4b0300 | |||
4b29dd8c41 | |||
165e2e33e3 | |||
d13a307ad5 | |||
27bd771fed | |||
9f3ee275a8 | |||
fcda64ad7d | |||
d815bf92bd | |||
7867060b71 | |||
8890d1d7c7 | |||
6e6a0a074a | |||
cff3007992 | |||
fe448cbcf4 | |||
2ab25df950 | |||
b895926754 | |||
5bb7a4153f | |||
b7cd598ee8 | |||
b10fb97c92 | |||
b337b908ea | |||
ba9d1e2388 | |||
29ec1d2d9c | |||
84a03f6c8e | |||
56ff06bbea | |||
7e756b8ee2 | |||
19ba37e0c2 | |||
b98ce19211 | |||
37d1a73c0c | |||
727877cf54 | |||
939b416717 | |||
f115843fbb | |||
aa6a4dc74f |
5
.gitattributes
vendored
5
.gitattributes
vendored
@ -1,2 +1,5 @@
|
|||||||
*.go linguist-detectable=true
|
*.go linguist-detectable=true
|
||||||
*.js linguist-detectable=false
|
*.js linguist-detectable=false
|
||||||
|
# Declare files that will always have LF line endings on checkout.
|
||||||
|
# Git will always convert line endings to LF on checkout. You should use this for files that must keep LF endings, even on Windows.
|
||||||
|
*.sh text eol=lf
|
49
.github/workflows/build.yml
vendored
49
.github/workflows/build.yml
vendored
@ -76,11 +76,58 @@ jobs:
|
|||||||
version: latest
|
version: latest
|
||||||
args: --disable-all -c dummy.yml -E=gofumpt --max-same-issues=0 --timeout 5m --modules-download-mode=mod
|
args: --disable-all -c dummy.yml -E=gofumpt --max-same-issues=0 --timeout 5m --modules-download-mode=mod
|
||||||
|
|
||||||
|
e2e:
|
||||||
|
name: e2e-test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [ go-tests ]
|
||||||
|
services:
|
||||||
|
mysql:
|
||||||
|
image: mysql:5.7
|
||||||
|
env:
|
||||||
|
MYSQL_DATABASE: casdoor
|
||||||
|
MYSQL_ROOT_PASSWORD: 123456
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
|
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: '^1.16.5'
|
||||||
|
- uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
- name: back start
|
||||||
|
run: nohup go run ./main.go &
|
||||||
|
working-directory: ./
|
||||||
|
- name: front install
|
||||||
|
run: yarn install
|
||||||
|
working-directory: ./web
|
||||||
|
- name: front start
|
||||||
|
run: nohup yarn start &
|
||||||
|
working-directory: ./web
|
||||||
|
- uses: cypress-io/github-action@v4
|
||||||
|
with:
|
||||||
|
working-directory: ./web
|
||||||
|
wait-on: 'http://localhost:7001'
|
||||||
|
wait-on-timeout: 180
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
if: failure()
|
||||||
|
with:
|
||||||
|
name: cypress-screenshots
|
||||||
|
path: ./web/cypress/screenshots
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
if: always()
|
||||||
|
with:
|
||||||
|
name: cypress-videos
|
||||||
|
path: ./web/cypress/videos
|
||||||
|
|
||||||
release-and-push:
|
release-and-push:
|
||||||
name: Release And Push
|
name: Release And Push
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push'
|
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push'
|
||||||
needs: [ frontend, backend, linter ]
|
needs: [ frontend, backend, linter, e2e ]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
21
.github/workflows/sync.yml
vendored
21
.github/workflows/sync.yml
vendored
@ -33,3 +33,24 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
CROWDIN_PROJECT_ID: '463556'
|
CROWDIN_PROJECT_ID: '463556'
|
||||||
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
||||||
|
|
||||||
|
- name: crowdin backend action
|
||||||
|
uses: crowdin/github-action@1.4.8
|
||||||
|
with:
|
||||||
|
upload_translations: true
|
||||||
|
|
||||||
|
download_translations: true
|
||||||
|
push_translations: true
|
||||||
|
commit_message: 'refactor: New Crowdin Backend translations by Github Action'
|
||||||
|
|
||||||
|
localization_branch_name: l10n_crowdin_action
|
||||||
|
create_pull_request: true
|
||||||
|
pull_request_title: 'refactor: New Crowdin Backend translations'
|
||||||
|
|
||||||
|
crowdin_branch_name: l10n_branch
|
||||||
|
config: './crowdin.yml'
|
||||||
|
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
CROWDIN_PROJECT_ID: '463556'
|
||||||
|
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
||||||
|
@ -44,14 +44,12 @@
|
|||||||
|
|
||||||
## Online demo
|
## Online demo
|
||||||
|
|
||||||
- International: https://door.casdoor.org (read-only)
|
- Read-only site: https://door.casdoor.com (any modification operation will fail)
|
||||||
- Asian mirror: https://door.casdoor.com (read-only)
|
- Writable site: https://demo.casdoor.com (original data will be restored for every 5 minutes)
|
||||||
- Asian mirror: https://demo.casdoor.com (read-write, will restore for every 5 minutes)
|
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
- International: https://casdoor.org
|
https://casdoor.org
|
||||||
- Asian mirror: https://casdoor.cn
|
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
|
@ -20,9 +20,9 @@ import (
|
|||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v3"
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
stringadapter "github.com/qiangmzsx/string-adapter/v2"
|
stringadapter "github.com/qiangmzsx/string-adapter/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -32,7 +32,9 @@ func InitAuthz() {
|
|||||||
var err error
|
var err error
|
||||||
|
|
||||||
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
||||||
a, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), "casbin_rule", tableNamePrefix, true)
|
driverName := conf.GetConfigString("driverName")
|
||||||
|
dataSourceName := conf.GetConfigRealDataSourceName(driverName)
|
||||||
|
a, err := xormadapter.NewAdapterWithTableName(driverName, dataSourceName, "casbin_rule", tableNamePrefix, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -85,6 +87,8 @@ p, *, *, POST, /api/logout, *, *
|
|||||||
p, *, *, GET, /api/logout, *, *
|
p, *, *, GET, /api/logout, *, *
|
||||||
p, *, *, GET, /api/get-account, *, *
|
p, *, *, GET, /api/get-account, *, *
|
||||||
p, *, *, GET, /api/userinfo, *, *
|
p, *, *, GET, /api/userinfo, *, *
|
||||||
|
p, *, *, POST, /api/webhook, *, *
|
||||||
|
p, *, *, GET, /api/get-webhook-event, *, *
|
||||||
p, *, *, *, /api/login/oauth, *, *
|
p, *, *, *, /api/login/oauth, *, *
|
||||||
p, *, *, GET, /api/get-application, *, *
|
p, *, *, GET, /api/get-application, *, *
|
||||||
p, *, *, GET, /api/get-organization-applications, *, *
|
p, *, *, GET, /api/get-organization-applications, *, *
|
||||||
@ -156,7 +160,7 @@ func IsAllowed(subOwner string, subName string, method string, urlPath string, o
|
|||||||
|
|
||||||
func isAllowedInDemoMode(subOwner string, subName string, method string, urlPath string, objOwner string, objName string) bool {
|
func isAllowedInDemoMode(subOwner string, subName string, method string, urlPath string, objOwner string, objName string) bool {
|
||||||
if method == "POST" {
|
if method == "POST" {
|
||||||
if strings.HasPrefix(urlPath, "/api/login") || urlPath == "/api/logout" || urlPath == "/api/signup" || urlPath == "/api/send-verification-code" {
|
if strings.HasPrefix(urlPath, "/api/login") || urlPath == "/api/logout" || urlPath == "/api/signup" || urlPath == "/api/send-verification-code" || urlPath == "/api/send-email" {
|
||||||
return true
|
return true
|
||||||
} else if urlPath == "/api/update-user" {
|
} else if urlPath == "/api/update-user" {
|
||||||
// Allow ordinary users to update their own information
|
// Allow ordinary users to update their own information
|
||||||
|
@ -21,17 +21,21 @@ type CaptchaProvider interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetCaptchaProvider(captchaType string) CaptchaProvider {
|
func GetCaptchaProvider(captchaType string) CaptchaProvider {
|
||||||
if captchaType == "Default" {
|
switch captchaType {
|
||||||
|
case "Default":
|
||||||
return NewDefaultCaptchaProvider()
|
return NewDefaultCaptchaProvider()
|
||||||
} else if captchaType == "reCAPTCHA" {
|
case "reCAPTCHA":
|
||||||
return NewReCaptchaProvider()
|
return NewReCaptchaProvider()
|
||||||
} else if captchaType == "hCaptcha" {
|
case "Aliyun Captcha":
|
||||||
return NewHCaptchaProvider()
|
|
||||||
} else if captchaType == "Aliyun Captcha" {
|
|
||||||
return NewAliyunCaptchaProvider()
|
return NewAliyunCaptchaProvider()
|
||||||
} else if captchaType == "GEETEST" {
|
case "hCaptcha":
|
||||||
|
return NewHCaptchaProvider()
|
||||||
|
case "GEETEST":
|
||||||
return NewGEETESTCaptchaProvider()
|
return NewGEETESTCaptchaProvider()
|
||||||
|
case "Cloudflare Turnstile":
|
||||||
|
return NewCloudflareTurnstileProvider()
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
66
captcha/turnstile.go
Normal file
66
captcha/turnstile.go
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package captcha
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const CloudflareTurnstileVerifyUrl = "https://challenges.cloudflare.com/turnstile/v0/siteverify"
|
||||||
|
|
||||||
|
type CloudflareTurnstileProvider struct{}
|
||||||
|
|
||||||
|
func NewCloudflareTurnstileProvider() *CloudflareTurnstileProvider {
|
||||||
|
captcha := &CloudflareTurnstileProvider{}
|
||||||
|
return captcha
|
||||||
|
}
|
||||||
|
|
||||||
|
func (captcha *CloudflareTurnstileProvider) VerifyCaptcha(token, clientSecret string) (bool, error) {
|
||||||
|
reqData := url.Values{
|
||||||
|
"secret": {clientSecret},
|
||||||
|
"response": {token},
|
||||||
|
}
|
||||||
|
resp, err := http.PostForm(CloudflareTurnstileVerifyUrl, reqData)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
type captchaResponse struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
ErrorCodes []string `json:"error-codes"`
|
||||||
|
}
|
||||||
|
captchaResp := &captchaResponse{}
|
||||||
|
err = json.Unmarshal(body, captchaResp)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(captchaResp.ErrorCodes) > 0 {
|
||||||
|
return false, errors.New(strings.Join(captchaResp.ErrorCodes, ","))
|
||||||
|
}
|
||||||
|
|
||||||
|
return captchaResp.Success, nil
|
||||||
|
}
|
@ -21,3 +21,4 @@ isDemoMode = false
|
|||||||
batchSize = 100
|
batchSize = 100
|
||||||
ldapServerPort = 389
|
ldapServerPort = 389
|
||||||
languages = en,zh,es,fr,de,ja,ko,ru
|
languages = en,zh,es,fr,de,ja,ko,ru
|
||||||
|
quota = {"organization": -1, "user": -1, "application": -1, "provider": -1}
|
||||||
|
49
conf/conf.go
49
conf/conf.go
@ -15,6 +15,7 @@
|
|||||||
package conf
|
package conf
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
@ -24,6 +25,15 @@ import (
|
|||||||
"github.com/beego/beego"
|
"github.com/beego/beego"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type Quota struct {
|
||||||
|
Organization int `json:"organization"`
|
||||||
|
User int `json:"user"`
|
||||||
|
Application int `json:"application"`
|
||||||
|
Provider int `json:"provider"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var quota = &Quota{-1, -1, -1, -1}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
// this array contains the beego configuration items that may be modified via env
|
// this array contains the beego configuration items that may be modified via env
|
||||||
presetConfigItems := []string{"httpport", "appname"}
|
presetConfigItems := []string{"httpport", "appname"}
|
||||||
@ -35,6 +45,17 @@ func init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
initQuota()
|
||||||
|
}
|
||||||
|
|
||||||
|
func initQuota() {
|
||||||
|
res := beego.AppConfig.String("quota")
|
||||||
|
if res != "" {
|
||||||
|
err := json.Unmarshal([]byte(res), quota)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetConfigString(key string) string {
|
func GetConfigString(key string) string {
|
||||||
@ -84,6 +105,20 @@ func GetConfigDataSourceName() string {
|
|||||||
return dataSourceName
|
return dataSourceName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetLanguage(language string) string {
|
||||||
|
if language == "" {
|
||||||
|
return "en"
|
||||||
|
}
|
||||||
|
|
||||||
|
language = language[0:2]
|
||||||
|
|
||||||
|
if strings.Contains(GetConfigString("languages"), language) {
|
||||||
|
return language
|
||||||
|
} else {
|
||||||
|
return "en"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func IsDemoMode() bool {
|
func IsDemoMode() bool {
|
||||||
return strings.ToLower(GetConfigString("isDemoMode")) == "true"
|
return strings.ToLower(GetConfigString("isDemoMode")) == "true"
|
||||||
}
|
}
|
||||||
@ -95,3 +130,17 @@ func GetConfigBatchSize() int {
|
|||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetConfigQuota() *Quota {
|
||||||
|
return quota
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetConfigRealDataSourceName(driverName string) string {
|
||||||
|
var dataSourceName string
|
||||||
|
if driverName != "mysql" {
|
||||||
|
dataSourceName = GetConfigDataSourceName()
|
||||||
|
} else {
|
||||||
|
dataSourceName = GetConfigDataSourceName() + GetConfigString("dbName")
|
||||||
|
}
|
||||||
|
return dataSourceName
|
||||||
|
}
|
||||||
|
@ -93,3 +93,19 @@ func TestGetConfBool(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetConfigQuota(t *testing.T) {
|
||||||
|
scenarios := []struct {
|
||||||
|
description string
|
||||||
|
expected *Quota
|
||||||
|
}{
|
||||||
|
{"default", &Quota{-1, -1, -1, -1}},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := beego.LoadAppConfig("ini", "app.conf")
|
||||||
|
assert.Nil(t, err)
|
||||||
|
for _, scenery := range scenarios {
|
||||||
|
quota := GetConfigQuota()
|
||||||
|
assert.Equal(t, scenery.expected, quota)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -17,6 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -57,7 +58,7 @@ type RequestForm struct {
|
|||||||
|
|
||||||
EmailCode string `json:"emailCode"`
|
EmailCode string `json:"emailCode"`
|
||||||
PhoneCode string `json:"phoneCode"`
|
PhoneCode string `json:"phoneCode"`
|
||||||
PhonePrefix string `json:"phonePrefix"`
|
CountryCode string `json:"countryCode"`
|
||||||
|
|
||||||
AutoSignin bool `json:"autoSignin"`
|
AutoSignin bool `json:"autoSignin"`
|
||||||
|
|
||||||
@ -102,7 +103,7 @@ type Captcha struct {
|
|||||||
// @router /signup [post]
|
// @router /signup [post]
|
||||||
func (c *ApiController) Signup() {
|
func (c *ApiController) Signup() {
|
||||||
if c.GetSessionUsername() != "" {
|
if c.GetSessionUsername() != "" {
|
||||||
c.ResponseError(c.T("SignUpErr.SignOutFirst"), c.GetSessionUsername())
|
c.ResponseError(c.T("account:Please sign out first before signing up"), c.GetSessionUsername())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,12 +116,12 @@ func (c *ApiController) Signup() {
|
|||||||
|
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if !application.EnableSignUp {
|
if !application.EnableSignUp {
|
||||||
c.ResponseError(c.T("SignUpErr.DoNotAllowSignUp"))
|
c.ResponseError(c.T("account:The application does not allow to sign up new account"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", form.Organization))
|
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", form.Organization))
|
||||||
msg := object.CheckUserSignup(application, organization, form.Username, form.Password, form.Name, form.FirstName, form.LastName, form.Email, form.Phone, form.Affiliation, c.GetAcceptLanguage())
|
msg := object.CheckUserSignup(application, organization, form.Username, form.Password, form.Name, form.FirstName, form.LastName, form.Email, form.Phone, form.CountryCode, form.Affiliation, c.GetAcceptLanguage())
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
c.ResponseError(msg)
|
c.ResponseError(msg)
|
||||||
return
|
return
|
||||||
@ -129,17 +130,17 @@ func (c *ApiController) Signup() {
|
|||||||
if application.IsSignupItemVisible("Email") && application.GetSignupItemRule("Email") != "No verification" && form.Email != "" {
|
if application.IsSignupItemVisible("Email") && application.GetSignupItemRule("Email") != "No verification" && form.Email != "" {
|
||||||
checkResult := object.CheckVerificationCode(form.Email, form.EmailCode, c.GetAcceptLanguage())
|
checkResult := object.CheckVerificationCode(form.Email, form.EmailCode, c.GetAcceptLanguage())
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
c.ResponseError(c.T("EmailErr.EmailCheckResult"), checkResult)
|
c.ResponseError(c.T("account:Email: %s"), checkResult)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var checkPhone string
|
var checkPhone string
|
||||||
if application.IsSignupItemVisible("Phone") && form.Phone != "" {
|
if application.IsSignupItemVisible("Phone") && form.Phone != "" {
|
||||||
checkPhone = fmt.Sprintf("+%s%s", form.PhonePrefix, form.Phone)
|
checkPhone, _ = util.GetE164Number(form.Phone, form.CountryCode)
|
||||||
checkResult := object.CheckVerificationCode(checkPhone, form.PhoneCode, c.GetAcceptLanguage())
|
checkResult := object.CheckVerificationCode(checkPhone, form.PhoneCode, c.GetAcceptLanguage())
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
c.ResponseError(c.T("PhoneErr.PhoneCheckResult"), checkResult)
|
c.ResponseError(c.T("account:Phone: %s"), checkResult)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -161,9 +162,9 @@ func (c *ApiController) Signup() {
|
|||||||
username = id
|
username = id
|
||||||
}
|
}
|
||||||
|
|
||||||
initScore, err := getInitScore()
|
initScore, err := getInitScore(organization)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(fmt.Errorf(c.T("InitErr.InitScoreFailed"), err).Error())
|
c.ResponseError(fmt.Errorf(c.T("account:Get init score failed, error: %w"), err).Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,6 +179,7 @@ func (c *ApiController) Signup() {
|
|||||||
Avatar: organization.DefaultAvatar,
|
Avatar: organization.DefaultAvatar,
|
||||||
Email: form.Email,
|
Email: form.Email,
|
||||||
Phone: form.Phone,
|
Phone: form.Phone,
|
||||||
|
CountryCode: form.CountryCode,
|
||||||
Address: []string{},
|
Address: []string{},
|
||||||
Affiliation: form.Affiliation,
|
Affiliation: form.Affiliation,
|
||||||
IdCard: form.IdCard,
|
IdCard: form.IdCard,
|
||||||
@ -209,7 +211,7 @@ func (c *ApiController) Signup() {
|
|||||||
|
|
||||||
affected := object.AddUser(user)
|
affected := object.AddUser(user)
|
||||||
if !affected {
|
if !affected {
|
||||||
c.ResponseError(c.T("UserErr.InvalidInformation"), util.StructToJson(user))
|
c.ResponseError(c.T("account:Invalid information"), util.StructToJson(user))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -238,20 +240,71 @@ func (c *ApiController) Signup() {
|
|||||||
// @Title Logout
|
// @Title Logout
|
||||||
// @Tag Login API
|
// @Tag Login API
|
||||||
// @Description logout the current user
|
// @Description logout the current user
|
||||||
|
// @Param id_token_hint query string false "id_token_hint"
|
||||||
|
// @Param post_logout_redirect_uri query string false "post_logout_redirect_uri"
|
||||||
|
// @Param state query string false "state"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /logout [get,post]
|
// @router /logout [get,post]
|
||||||
func (c *ApiController) Logout() {
|
func (c *ApiController) Logout() {
|
||||||
user := c.GetSessionUsername()
|
user := c.GetSessionUsername()
|
||||||
util.LogInfo(c.Ctx, "API: [%s] logged out", user)
|
|
||||||
|
|
||||||
application := c.GetSessionApplication()
|
// https://openid.net/specs/openid-connect-rpinitiated-1_0-final.html
|
||||||
c.ClearUserSession()
|
accessToken := c.Input().Get("id_token_hint")
|
||||||
|
redirectUri := c.Input().Get("post_logout_redirect_uri")
|
||||||
|
state := c.Input().Get("state")
|
||||||
|
|
||||||
if application == nil || application.Name == "app-built-in" || application.HomepageUrl == "" {
|
if accessToken == "" && redirectUri == "" {
|
||||||
c.ResponseOk(user)
|
c.ClearUserSession()
|
||||||
|
// TODO https://github.com/casdoor/casdoor/pull/1494#discussion_r1095675265
|
||||||
|
owner, username := util.GetOwnerAndNameFromId(user)
|
||||||
|
|
||||||
|
object.DeleteSessionId(util.GetSessionId(owner, username, object.CasdoorApplication), c.Ctx.Input.CruSession.SessionID())
|
||||||
|
util.LogInfo(c.Ctx, "API: [%s] logged out", user)
|
||||||
|
|
||||||
|
application := c.GetSessionApplication()
|
||||||
|
if application == nil || application.Name == "app-built-in" || application.HomepageUrl == "" {
|
||||||
|
c.ResponseOk(user)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.ResponseOk(user, application.HomepageUrl)
|
||||||
return
|
return
|
||||||
|
} else {
|
||||||
|
if redirectUri == "" {
|
||||||
|
c.ResponseError(c.T("general:Missing parameter") + ": post_logout_redirect_uri")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if accessToken == "" {
|
||||||
|
c.ResponseError(c.T("general:Missing parameter") + ": id_token_hint")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, application, token := object.ExpireTokenByAccessToken(accessToken)
|
||||||
|
if !affected {
|
||||||
|
c.ResponseError(c.T("token:Token not found, invalid accessToken"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if application == nil {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist")), token.Application)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if application.IsRedirectUriValid(redirectUri) {
|
||||||
|
if user == "" {
|
||||||
|
user = util.GetId(token.Organization, token.User)
|
||||||
|
}
|
||||||
|
|
||||||
|
c.ClearUserSession()
|
||||||
|
// TODO https://github.com/casdoor/casdoor/pull/1494#discussion_r1095675265
|
||||||
|
object.DeleteSessionId(util.GetSessionId(object.CasdoorOrganization, object.CasdoorApplication, user), c.Ctx.Input.CruSession.SessionID())
|
||||||
|
util.LogInfo(c.Ctx, "API: [%s] logged out", user)
|
||||||
|
|
||||||
|
c.Ctx.Redirect(http.StatusFound, fmt.Sprintf("%s?state=%s", strings.TrimRight(redirectUri, "/"), state))
|
||||||
|
} else {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("token:Redirect URI: %s doesn't exist in the allowed Redirect URI list"), redirectUri))
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
c.ResponseOk(user, application.HomepageUrl)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAccount
|
// GetAccount
|
||||||
@ -271,12 +324,17 @@ func (c *ApiController) GetAccount() {
|
|||||||
user = object.ExtendManagedAccountsWithUser(user)
|
user = object.ExtendManagedAccountsWithUser(user)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
object.ExtendUserWithRolesAndPermissions(user)
|
||||||
|
|
||||||
|
user.Permissions = object.GetMaskedPermissions(user.Permissions)
|
||||||
|
user.Roles = object.GetMaskedRoles(user.Roles)
|
||||||
|
|
||||||
organization := object.GetMaskedOrganization(object.GetOrganizationByUser(user))
|
organization := object.GetMaskedOrganization(object.GetOrganizationByUser(user))
|
||||||
resp := Response{
|
resp := Response{
|
||||||
Status: "ok",
|
Status: "ok",
|
||||||
Sub: user.Id,
|
Sub: user.Id,
|
||||||
Name: user.Name,
|
Name: user.Name,
|
||||||
Data: user,
|
Data: object.GetMaskedUser(user),
|
||||||
Data2: organization,
|
Data2: organization,
|
||||||
}
|
}
|
||||||
c.Data["json"] = resp
|
c.Data["json"] = resp
|
||||||
|
@ -46,7 +46,7 @@ func (c *ApiController) GetApplications() {
|
|||||||
if organization == "" {
|
if organization == "" {
|
||||||
applications = object.GetApplications(owner)
|
applications = object.GetApplications(owner)
|
||||||
} else {
|
} else {
|
||||||
applications = object.GetApplicationsByOrganizationName(owner, organization)
|
applications = object.GetOrganizationApplications(owner, organization)
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
||||||
@ -63,7 +63,7 @@ func (c *ApiController) GetApplications() {
|
|||||||
// @Title GetApplication
|
// @Title GetApplication
|
||||||
// @Tag Application API
|
// @Tag Application API
|
||||||
// @Description get the detail of an application
|
// @Description get the detail of an application
|
||||||
// @Param id query string true "The id of the application."
|
// @Param id query string true "The id ( owner/name ) of the application."
|
||||||
// @Success 200 {object} object.Application The Response object
|
// @Success 200 {object} object.Application The Response object
|
||||||
// @router /get-application [get]
|
// @router /get-application [get]
|
||||||
func (c *ApiController) GetApplication() {
|
func (c *ApiController) GetApplication() {
|
||||||
@ -78,7 +78,7 @@ func (c *ApiController) GetApplication() {
|
|||||||
// @Title GetUserApplication
|
// @Title GetUserApplication
|
||||||
// @Tag Application API
|
// @Tag Application API
|
||||||
// @Description get the detail of the user's application
|
// @Description get the detail of the user's application
|
||||||
// @Param id query string true "The id of the user"
|
// @Param id query string true "The id ( owner/name ) of the user"
|
||||||
// @Success 200 {object} object.Application The Response object
|
// @Success 200 {object} object.Application The Response object
|
||||||
// @router /get-user-application [get]
|
// @router /get-user-application [get]
|
||||||
func (c *ApiController) GetUserApplication() {
|
func (c *ApiController) GetUserApplication() {
|
||||||
@ -86,7 +86,7 @@ func (c *ApiController) GetUserApplication() {
|
|||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
user := object.GetUser(id)
|
user := object.GetUser(id)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), id))
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), id))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,24 +103,38 @@ func (c *ApiController) GetUserApplication() {
|
|||||||
// @router /get-organization-applications [get]
|
// @router /get-organization-applications [get]
|
||||||
func (c *ApiController) GetOrganizationApplications() {
|
func (c *ApiController) GetOrganizationApplications() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
owner := c.Input().Get("owner")
|
|
||||||
organization := c.Input().Get("organization")
|
organization := c.Input().Get("organization")
|
||||||
|
owner := c.Input().Get("owner")
|
||||||
|
limit := c.Input().Get("pageSize")
|
||||||
|
page := c.Input().Get("p")
|
||||||
|
field := c.Input().Get("field")
|
||||||
|
value := c.Input().Get("value")
|
||||||
|
sortField := c.Input().Get("sortField")
|
||||||
|
sortOrder := c.Input().Get("sortOrder")
|
||||||
|
|
||||||
if organization == "" {
|
if organization == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.OrgMissingErr"))
|
c.ResponseError(c.T("general:Missing parameter") + ": organization")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
applications := object.GetApplicationsByOrganizationName(owner, organization)
|
if limit == "" || page == "" {
|
||||||
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
var applications []*object.Application
|
||||||
c.ServeJSON()
|
applications = object.GetOrganizationApplications(owner, organization)
|
||||||
|
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
||||||
|
c.ServeJSON()
|
||||||
|
} else {
|
||||||
|
limit := util.ParseInt(limit)
|
||||||
|
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetOrganizationApplicationCount(owner, organization, field, value)))
|
||||||
|
applications := object.GetMaskedApplications(object.GetPaginationOrganizationApplications(owner, organization, paginator.Offset(), limit, field, value, sortField, sortOrder), userId)
|
||||||
|
c.ResponseOk(applications, paginator.Nums())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateApplication
|
// UpdateApplication
|
||||||
// @Title UpdateApplication
|
// @Title UpdateApplication
|
||||||
// @Tag Application API
|
// @Tag Application API
|
||||||
// @Description update an application
|
// @Description update an application
|
||||||
// @Param id query string true "The id of the application"
|
// @Param id query string true "The id ( owner/name ) of the application"
|
||||||
// @Param body body object.Application true "The details of the application"
|
// @Param body body object.Application true "The details of the application"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-application [post]
|
// @router /update-application [post]
|
||||||
@ -153,6 +167,12 @@ func (c *ApiController) AddApplication() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
count := object.GetApplicationCount("", "", "")
|
||||||
|
if err := checkQuotaForApplication(count); err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddApplication(&application))
|
c.Data["json"] = wrapActionResponse(object.AddApplication(&application))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
@ -17,14 +17,16 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/captcha"
|
"github.com/casdoor/casdoor/captcha"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/idp"
|
"github.com/casdoor/casdoor/idp"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
@ -33,6 +35,11 @@ import (
|
|||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
wechatScanType string
|
||||||
|
lock sync.RWMutex
|
||||||
|
)
|
||||||
|
|
||||||
func codeToResponse(code *object.Code) *Response {
|
func codeToResponse(code *object.Code) *Response {
|
||||||
if code.Code == "" {
|
if code.Code == "" {
|
||||||
return &Response{Status: "error", Msg: code.Message, Data: code.Code}
|
return &Response{Status: "error", Msg: code.Message, Data: code.Code}
|
||||||
@ -45,7 +52,7 @@ func tokenToResponse(token *object.Token) *Response {
|
|||||||
if token.AccessToken == "" {
|
if token.AccessToken == "" {
|
||||||
return &Response{Status: "error", Msg: "fail to get accessToken", Data: token.AccessToken}
|
return &Response{Status: "error", Msg: "fail to get accessToken", Data: token.AccessToken}
|
||||||
}
|
}
|
||||||
return &Response{Status: "ok", Msg: "", Data: token.AccessToken}
|
return &Response{Status: "ok", Msg: "", Data: token.AccessToken, Data2: token.RefreshToken}
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleLoggedIn ...
|
// HandleLoggedIn ...
|
||||||
@ -58,7 +65,7 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !allowed {
|
if !allowed {
|
||||||
c.ResponseError(c.T("AuthErr.Unauthorized"))
|
c.ResponseError(c.T("auth:Unauthorized operation"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,7 +84,7 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
codeChallenge := c.Input().Get("code_challenge")
|
codeChallenge := c.Input().Get("code_challenge")
|
||||||
|
|
||||||
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
||||||
c.ResponseError(c.T("AuthErr.ChallengeMethodErr"))
|
c.ResponseError(c.T("auth:Challenge method should be S256"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
code := object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, c.Ctx.Request.Host, c.GetAcceptLanguage())
|
code := object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, c.Ctx.Request.Host, c.GetAcceptLanguage())
|
||||||
@ -96,12 +103,12 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
resp = tokenToResponse(token)
|
resp = tokenToResponse(token)
|
||||||
}
|
}
|
||||||
} else if form.Type == ResponseTypeSaml { // saml flow
|
} else if form.Type == ResponseTypeSaml { // saml flow
|
||||||
res, redirectUrl, err := object.GetSamlResponse(application, user, form.SamlRequest, c.Ctx.Request.Host)
|
res, redirectUrl, method, err := object.GetSamlResponse(application, user, form.SamlRequest, c.Ctx.Request.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error(), nil)
|
c.ResponseError(err.Error(), nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp = &Response{Status: "ok", Msg: "", Data: res, Data2: redirectUrl}
|
resp = &Response{Status: "ok", Msg: "", Data: res, Data2: map[string]string{"redirectUrl": redirectUrl, "method": method}}
|
||||||
} else if form.Type == ResponseTypeCas {
|
} else if form.Type == ResponseTypeCas {
|
||||||
// not oauth but CAS SSO protocol
|
// not oauth but CAS SSO protocol
|
||||||
service := c.Input().Get("service")
|
service := c.Input().Get("service")
|
||||||
@ -132,6 +139,15 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if resp.Status == "ok" && user.Owner == object.CasdoorOrganization && application.Name == object.CasdoorApplication {
|
||||||
|
object.AddSession(&object.Session{
|
||||||
|
Owner: user.Owner,
|
||||||
|
Name: user.Name,
|
||||||
|
Application: application.Name,
|
||||||
|
SessionId: []string{c.Ctx.Input.CruSession.SessionID()},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -163,13 +179,36 @@ func (c *ApiController) GetApplicationLogin() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func setHttpClient(idProvider idp.IdProvider, providerType string) {
|
func setHttpClient(idProvider idp.IdProvider, providerType string) {
|
||||||
if providerType == "GitHub" || providerType == "Google" || providerType == "Facebook" || providerType == "LinkedIn" || providerType == "Steam" {
|
if isProxyProviderType(providerType) {
|
||||||
idProvider.SetHttpClient(proxy.ProxyHttpClient)
|
idProvider.SetHttpClient(proxy.ProxyHttpClient)
|
||||||
} else {
|
} else {
|
||||||
idProvider.SetHttpClient(proxy.DefaultHttpClient)
|
idProvider.SetHttpClient(proxy.DefaultHttpClient)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isProxyProviderType(providerType string) bool {
|
||||||
|
providerTypes := []string{
|
||||||
|
"GitHub",
|
||||||
|
"Google",
|
||||||
|
"Facebook",
|
||||||
|
"LinkedIn",
|
||||||
|
"Steam",
|
||||||
|
"Line",
|
||||||
|
"Amazon",
|
||||||
|
"Instagram",
|
||||||
|
"TikTok",
|
||||||
|
"Twitter",
|
||||||
|
"Uber",
|
||||||
|
"Yahoo",
|
||||||
|
}
|
||||||
|
for _, v := range providerTypes {
|
||||||
|
if strings.EqualFold(v, providerType) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// Login ...
|
// Login ...
|
||||||
// @Title Login
|
// @Title Login
|
||||||
// @Tag Login API
|
// @Tag Login API
|
||||||
@ -198,7 +237,7 @@ func (c *ApiController) Login() {
|
|||||||
if form.Username != "" {
|
if form.Username != "" {
|
||||||
if form.Type == ResponseTypeLogin {
|
if form.Type == ResponseTypeLogin {
|
||||||
if c.GetSessionUsername() != "" {
|
if c.GetSessionUsername() != "" {
|
||||||
c.ResponseError(c.T("LoginErr.SignOutFirst"), c.GetSessionUsername())
|
c.ResponseError(c.T("account:Please sign out first before signing in"), c.GetSessionUsername())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -215,47 +254,49 @@ func (c *ApiController) Login() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// check result through Email or Phone
|
// check result through Email or Phone
|
||||||
|
var checkDest string
|
||||||
if strings.Contains(form.Username, "@") {
|
if strings.Contains(form.Username, "@") {
|
||||||
verificationCodeType = "email"
|
verificationCodeType = "email"
|
||||||
if user != nil && util.GetMaskedEmail(user.Email) == form.Username {
|
if user != nil && util.GetMaskedEmail(user.Email) == form.Username {
|
||||||
form.Username = user.Email
|
form.Username = user.Email
|
||||||
}
|
}
|
||||||
checkResult = object.CheckVerificationCode(form.Username, form.Code, c.GetAcceptLanguage())
|
checkDest = form.Username
|
||||||
} else {
|
} else {
|
||||||
verificationCodeType = "phone"
|
verificationCodeType = "phone"
|
||||||
if len(form.PhonePrefix) == 0 {
|
|
||||||
responseText := fmt.Sprintf(c.T("PhoneErr.NoPrefix"), verificationCodeType)
|
|
||||||
c.ResponseError(responseText)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if user != nil && util.GetMaskedPhone(user.Phone) == form.Username {
|
if user != nil && util.GetMaskedPhone(user.Phone) == form.Username {
|
||||||
form.Username = user.Phone
|
form.Username = user.Phone
|
||||||
}
|
}
|
||||||
checkPhone := fmt.Sprintf("+%s%s", form.PhonePrefix, form.Username)
|
|
||||||
checkResult = object.CheckVerificationCode(checkPhone, form.Code, c.GetAcceptLanguage())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if user = object.GetUserByFields(form.Organization, form.Username); user == nil {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(form.Organization, form.Username)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if verificationCodeType == "phone" {
|
||||||
|
form.CountryCode = user.GetCountryCode(form.CountryCode)
|
||||||
|
var ok bool
|
||||||
|
if checkDest, ok = util.GetE164Number(form.Username, form.CountryCode); !ok {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("verification:Phone number is invalid in your region %s"), form.CountryCode))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
checkResult = object.CheckSigninCode(user, checkDest, form.Code, c.GetAcceptLanguage())
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
responseText := fmt.Sprintf("%s%s", verificationCodeType, checkResult)
|
c.ResponseError(fmt.Sprintf("%s - %s", verificationCodeType, checkResult))
|
||||||
c.ResponseError(responseText)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// disable the verification code
|
// disable the verification code
|
||||||
if strings.Contains(form.Username, "@") {
|
object.DisableVerificationCode(checkDest)
|
||||||
object.DisableVerificationCode(form.Username)
|
|
||||||
} else {
|
|
||||||
object.DisableVerificationCode(fmt.Sprintf("+%s%s", form.PhonePrefix, form.Username))
|
|
||||||
}
|
|
||||||
|
|
||||||
user = object.GetUserByFields(form.Organization, form.Username)
|
|
||||||
if user == nil {
|
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.UserDoNotExist"), form.Organization, form.Username))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The application: %s does not exist", form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), form.Application))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !application.EnablePassword {
|
||||||
|
c.ResponseError(c.T("auth:The login method: login with password is not enabled for the application"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -267,7 +308,7 @@ func (c *ApiController) Login() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !isHuman {
|
if !isHuman {
|
||||||
c.ResponseError("Turing test failed.")
|
c.ResponseError(c.T("auth:Turing test failed."))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -281,7 +322,7 @@ func (c *ApiController) Login() {
|
|||||||
} else {
|
} else {
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,15 +336,15 @@ func (c *ApiController) Login() {
|
|||||||
} else if form.Provider != "" {
|
} else if form.Provider != "" {
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", application.Organization))
|
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", application.Organization))
|
||||||
provider := object.GetProvider(fmt.Sprintf("admin/%s", form.Provider))
|
provider := object.GetProvider(util.GetId("admin", form.Provider))
|
||||||
providerItem := application.GetProviderItem(provider.Name)
|
providerItem := application.GetProviderItem(provider.Name)
|
||||||
if !providerItem.IsProviderVisible() {
|
if !providerItem.IsProviderVisible() {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotEnabled"), provider.Name))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The provider: %s is not enabled for the application"), provider.Name))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -327,14 +368,14 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
idProvider := idp.GetIdProvider(provider.Type, provider.SubType, clientId, clientSecret, provider.AppId, form.RedirectUri, provider.Domain, provider.CustomAuthUrl, provider.CustomTokenUrl, provider.CustomUserInfoUrl)
|
idProvider := idp.GetIdProvider(provider.Type, provider.SubType, clientId, clientSecret, provider.AppId, form.RedirectUri, provider.Domain, provider.CustomAuthUrl, provider.CustomTokenUrl, provider.CustomUserInfoUrl)
|
||||||
if idProvider == nil {
|
if idProvider == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotSupported"), provider.Type))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The provider type: %s is not supported"), provider.Type))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
setHttpClient(idProvider, provider.Type)
|
setHttpClient(idProvider, provider.Type)
|
||||||
|
|
||||||
if form.State != conf.GetConfigString("authState") && form.State != application.Name {
|
if form.State != conf.GetConfigString("authState") && form.State != application.Name {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("AuthErr.AuthStateWrong"), conf.GetConfigString("authState"), form.State))
|
c.ResponseError(fmt.Sprintf(c.T("auth:State expected: %s, but got: %s"), conf.GetConfigString("authState"), form.State))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -346,13 +387,13 @@ func (c *ApiController) Login() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !token.Valid() {
|
if !token.Valid() {
|
||||||
c.ResponseError(c.T("TokenErr.InvalidToken"))
|
c.ResponseError(c.T("auth:Invalid token"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
userInfo, err = idProvider.GetUserInfo(token)
|
userInfo, err = idProvider.GetUserInfo(token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.LoginFail"), err.Error()))
|
c.ResponseError(fmt.Sprintf(c.T("auth:Failed to login in: %s"), err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -369,7 +410,7 @@ func (c *ApiController) Login() {
|
|||||||
// Sign in via OAuth (want to sign up but already have account)
|
// Sign in via OAuth (want to sign up but already have account)
|
||||||
|
|
||||||
if user.IsForbidden {
|
if user.IsForbidden {
|
||||||
c.ResponseError(c.T("LoginErr.UserIsForbidden"))
|
c.ResponseError(c.T("auth:The user is forbidden to sign in, please contact the administrator"))
|
||||||
}
|
}
|
||||||
|
|
||||||
resp = c.HandleLoggedIn(application, user, &form)
|
resp = c.HandleLoggedIn(application, user, &form)
|
||||||
@ -381,63 +422,70 @@ func (c *ApiController) Login() {
|
|||||||
} else if provider.Category == "OAuth" {
|
} else if provider.Category == "OAuth" {
|
||||||
// Sign up via OAuth
|
// Sign up via OAuth
|
||||||
if !application.EnableSignUp {
|
if !application.EnableSignUp {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppNotEnableSignUp"), provider.Type, userInfo.Username, userInfo.DisplayName))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support"), provider.Type, userInfo.Username, userInfo.DisplayName))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !providerItem.CanSignUp {
|
if !providerItem.CanSignUp {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.ProviderCanNotSignUp"), provider.Type, userInfo.Username, userInfo.DisplayName, provider.Type))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up"), provider.Type, userInfo.Username, userInfo.DisplayName, provider.Type))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle username conflicts
|
if application.EnableLinkWithEmail {
|
||||||
tmpUser := object.GetUser(fmt.Sprintf("%s/%s", application.Organization, userInfo.Username))
|
// find user that has the same email
|
||||||
if tmpUser != nil {
|
user = object.GetUserByField(application.Organization, "email", userInfo.Email)
|
||||||
uid, err := uuid.NewRandom()
|
}
|
||||||
|
|
||||||
|
if user == nil || user.IsDeleted {
|
||||||
|
// Handle username conflicts
|
||||||
|
tmpUser := object.GetUser(fmt.Sprintf("%s/%s", application.Organization, userInfo.Username))
|
||||||
|
if tmpUser != nil {
|
||||||
|
uid, err := uuid.NewRandom()
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uidStr := strings.Split(uid.String(), "-")
|
||||||
|
userInfo.Username = fmt.Sprintf("%s_%s", userInfo.Username, uidStr[1])
|
||||||
|
}
|
||||||
|
|
||||||
|
properties := map[string]string{}
|
||||||
|
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
||||||
|
initScore, err := getInitScore(organization)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(fmt.Errorf(c.T("account:Get init score failed, error: %w"), err).Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
uidStr := strings.Split(uid.String(), "-")
|
user = &object.User{
|
||||||
userInfo.Username = fmt.Sprintf("%s_%s", userInfo.Username, uidStr[1])
|
Owner: application.Organization,
|
||||||
|
Name: userInfo.Username,
|
||||||
|
CreatedTime: util.GetCurrentTime(),
|
||||||
|
Id: util.GenerateId(),
|
||||||
|
Type: "normal-user",
|
||||||
|
DisplayName: userInfo.DisplayName,
|
||||||
|
Avatar: userInfo.AvatarUrl,
|
||||||
|
Address: []string{},
|
||||||
|
Email: userInfo.Email,
|
||||||
|
Score: initScore,
|
||||||
|
IsAdmin: false,
|
||||||
|
IsGlobalAdmin: false,
|
||||||
|
IsForbidden: false,
|
||||||
|
IsDeleted: false,
|
||||||
|
SignupApplication: application.Name,
|
||||||
|
Properties: properties,
|
||||||
|
}
|
||||||
|
|
||||||
|
affected := object.AddUser(user)
|
||||||
|
if !affected {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("auth:Failed to create user, user information is invalid: %s"), util.StructToJson(user)))
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
properties := map[string]string{}
|
|
||||||
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
|
||||||
initScore, err := getInitScore()
|
|
||||||
if err != nil {
|
|
||||||
c.ResponseError(fmt.Errorf(c.T("InitErr.InitScoreFailed"), err).Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
user = &object.User{
|
|
||||||
Owner: application.Organization,
|
|
||||||
Name: userInfo.Username,
|
|
||||||
CreatedTime: util.GetCurrentTime(),
|
|
||||||
Id: util.GenerateId(),
|
|
||||||
Type: "normal-user",
|
|
||||||
DisplayName: userInfo.DisplayName,
|
|
||||||
Avatar: userInfo.AvatarUrl,
|
|
||||||
Address: []string{},
|
|
||||||
Email: userInfo.Email,
|
|
||||||
Score: initScore,
|
|
||||||
IsAdmin: false,
|
|
||||||
IsGlobalAdmin: false,
|
|
||||||
IsForbidden: false,
|
|
||||||
IsDeleted: false,
|
|
||||||
SignupApplication: application.Name,
|
|
||||||
Properties: properties,
|
|
||||||
}
|
|
||||||
// sync info from 3rd-party if possible
|
// sync info from 3rd-party if possible
|
||||||
object.SetUserOAuthProperties(organization, user, provider.Type, userInfo)
|
object.SetUserOAuthProperties(organization, user, provider.Type, userInfo)
|
||||||
|
|
||||||
affected := object.AddUser(user)
|
|
||||||
if !affected {
|
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.InvalidUserInformation"), util.StructToJson(user)))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
object.LinkUserAccount(user, provider.Type, userInfo.Id)
|
object.LinkUserAccount(user, provider.Type, userInfo.Id)
|
||||||
|
|
||||||
resp = c.HandleLoggedIn(application, user, &form)
|
resp = c.HandleLoggedIn(application, user, &form)
|
||||||
@ -453,19 +501,19 @@ func (c *ApiController) Login() {
|
|||||||
record2.User = user.Name
|
record2.User = user.Name
|
||||||
util.SafeGoroutine(func() { object.AddRecord(record2) })
|
util.SafeGoroutine(func() { object.AddRecord(record2) })
|
||||||
} else if provider.Category == "SAML" {
|
} else if provider.Category == "SAML" {
|
||||||
resp = &Response{Status: "error", Msg: "The account does not exist"}
|
resp = &Response{Status: "error", Msg: fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(application.Organization, userInfo.Id))}
|
||||||
}
|
}
|
||||||
// resp = &Response{Status: "ok", Msg: "", Data: res}
|
// resp = &Response{Status: "ok", Msg: "", Data: res}
|
||||||
} else { // form.Method != "signup"
|
} else { // form.Method != "signup"
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("LoginErr.AccountDoNotExist"), userInfo)
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(application.Organization, userInfo.Id)), userInfo)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
oldUser := object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
oldUser := object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
||||||
if oldUser != nil {
|
if oldUser != nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.OldUser"), provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)"), provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -486,7 +534,7 @@ func (c *ApiController) Login() {
|
|||||||
// user already signed in to Casdoor, so let the user click the avatar button to do the quick sign-in
|
// user already signed in to Casdoor, so let the user click the avatar button to do the quick sign-in
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -498,7 +546,7 @@ func (c *ApiController) Login() {
|
|||||||
record.User = user.Name
|
record.User = user.Name
|
||||||
util.SafeGoroutine(func() { object.AddRecord(record) })
|
util.SafeGoroutine(func() { object.AddRecord(record) })
|
||||||
} else {
|
} else {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("LoginErr.UnknownAuthentication"), util.StructToJson(form)))
|
c.ResponseError(fmt.Sprintf(c.T("auth:Unknown authentication type (not password or provider), form = %s"), util.StructToJson(form)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -531,3 +579,46 @@ func (c *ApiController) HandleSamlLogin() {
|
|||||||
slice[4], relayState, samlResponse)
|
slice[4], relayState, samlResponse)
|
||||||
c.Redirect(targetUrl, 303)
|
c.Redirect(targetUrl, 303)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HandleOfficialAccountEvent ...
|
||||||
|
// @Tag HandleOfficialAccountEvent API
|
||||||
|
// @Title HandleOfficialAccountEvent
|
||||||
|
// @router /api/webhook [POST]
|
||||||
|
func (c *ApiController) HandleOfficialAccountEvent() {
|
||||||
|
respBytes, err := ioutil.ReadAll(c.Ctx.Request.Body)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
}
|
||||||
|
var data struct {
|
||||||
|
MsgType string `xml:"MsgType"`
|
||||||
|
Event string `xml:"Event"`
|
||||||
|
EventKey string `xml:"EventKey"`
|
||||||
|
}
|
||||||
|
err = xml.Unmarshal(respBytes, &data)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
}
|
||||||
|
lock.Lock()
|
||||||
|
defer lock.Unlock()
|
||||||
|
if data.EventKey != "" {
|
||||||
|
wechatScanType = data.Event
|
||||||
|
c.Ctx.WriteString("")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWebhookEventType ...
|
||||||
|
// @Tag GetWebhookEventType API
|
||||||
|
// @Title GetWebhookEventType
|
||||||
|
// @router /api/get-webhook-event [GET]
|
||||||
|
func (c *ApiController) GetWebhookEventType() {
|
||||||
|
lock.Lock()
|
||||||
|
defer lock.Unlock()
|
||||||
|
resp := &Response{
|
||||||
|
Status: "ok",
|
||||||
|
Msg: "",
|
||||||
|
Data: wechatScanType,
|
||||||
|
}
|
||||||
|
c.Data["json"] = resp
|
||||||
|
wechatScanType = ""
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
@ -210,7 +210,7 @@ func (c *RootController) SamlValidate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !strings.HasPrefix(target, service) {
|
if !strings.HasPrefix(target, service) {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("CasErr.ServiceDoNotMatch"), target, service))
|
c.ResponseError(fmt.Sprintf(c.T("cas:Service %s and %s do not match"), target, service))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import (
|
|||||||
"github.com/beego/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (c *ApiController) GetCasbinAdapters() {
|
func (c *ApiController) GetCasbinAdapters() {
|
||||||
@ -31,8 +32,8 @@ func (c *ApiController) GetCasbinAdapters() {
|
|||||||
sortField := c.Input().Get("sortField")
|
sortField := c.Input().Get("sortField")
|
||||||
sortOrder := c.Input().Get("sortOrder")
|
sortOrder := c.Input().Get("sortOrder")
|
||||||
if limit == "" || page == "" {
|
if limit == "" || page == "" {
|
||||||
c.Data["json"] = object.GetCasbinAdapters(owner)
|
adapters := object.GetCasbinAdapters(owner)
|
||||||
c.ServeJSON()
|
c.ResponseOk(adapters)
|
||||||
} else {
|
} else {
|
||||||
limit := util.ParseInt(limit)
|
limit := util.ParseInt(limit)
|
||||||
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetCasbinAdapterCount(owner, field, value)))
|
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetCasbinAdapterCount(owner, field, value)))
|
||||||
@ -43,8 +44,8 @@ func (c *ApiController) GetCasbinAdapters() {
|
|||||||
|
|
||||||
func (c *ApiController) GetCasbinAdapter() {
|
func (c *ApiController) GetCasbinAdapter() {
|
||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
c.Data["json"] = object.GetCasbinAdapter(id)
|
adapter := object.GetCasbinAdapter(id)
|
||||||
c.ServeJSON()
|
c.ResponseOk(adapter)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) UpdateCasbinAdapter() {
|
func (c *ApiController) UpdateCasbinAdapter() {
|
||||||
@ -89,6 +90,68 @@ func (c *ApiController) SyncPolicies() {
|
|||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
adapter := object.GetCasbinAdapter(id)
|
adapter := object.GetCasbinAdapter(id)
|
||||||
|
|
||||||
c.Data["json"] = object.SyncPolicies(adapter)
|
policies, err := object.SyncPolicies(adapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.ResponseOk(policies)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) UpdatePolicy() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
adapter := object.GetCasbinAdapter(id)
|
||||||
|
var policies []xormadapter.CasbinRule
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &policies)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := object.UpdatePolicy(util.CasbinToSlice(policies[0]), util.CasbinToSlice(policies[1]), adapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Data["json"] = wrapActionResponse(affected)
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) AddPolicy() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
adapter := object.GetCasbinAdapter(id)
|
||||||
|
var policy xormadapter.CasbinRule
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &policy)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := object.AddPolicy(util.CasbinToSlice(policy), adapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Data["json"] = wrapActionResponse(affected)
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) RemovePolicy() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
adapter := object.GetCasbinAdapter(id)
|
||||||
|
var policy xormadapter.CasbinRule
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &policy)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := object.RemovePolicy(util.CasbinToSlice(policy), adapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Data["json"] = wrapActionResponse(affected)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ func (c *ApiController) GetCerts() {
|
|||||||
// @Title GetCert
|
// @Title GetCert
|
||||||
// @Tag Cert API
|
// @Tag Cert API
|
||||||
// @Description get cert
|
// @Description get cert
|
||||||
// @Param id query string true "The id of the cert"
|
// @Param id query string true "The id ( owner/name ) of the cert"
|
||||||
// @Success 200 {object} object.Cert The Response object
|
// @Success 200 {object} object.Cert The Response object
|
||||||
// @router /get-cert [get]
|
// @router /get-cert [get]
|
||||||
func (c *ApiController) GetCert() {
|
func (c *ApiController) GetCert() {
|
||||||
@ -66,7 +66,7 @@ func (c *ApiController) GetCert() {
|
|||||||
// @Title UpdateCert
|
// @Title UpdateCert
|
||||||
// @Tag Cert API
|
// @Tag Cert API
|
||||||
// @Description update cert
|
// @Description update cert
|
||||||
// @Param id query string true "The id of the cert"
|
// @Param id query string true "The id ( owner/name ) of the cert"
|
||||||
// @Param body body object.Cert true "The details of the cert"
|
// @Param body body object.Cert true "The details of the cert"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-cert [post]
|
// @router /update-cert [post]
|
||||||
|
@ -21,12 +21,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (c *ApiController) Enforce() {
|
func (c *ApiController) Enforce() {
|
||||||
userId := c.GetSessionUsername()
|
|
||||||
if userId == "" {
|
|
||||||
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var permissionRule object.PermissionRule
|
var permissionRule object.PermissionRule
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRule)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRule)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -34,17 +28,11 @@ func (c *ApiController) Enforce() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.Enforce(userId, &permissionRule)
|
c.Data["json"] = object.Enforce(&permissionRule)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) BatchEnforce() {
|
func (c *ApiController) BatchEnforce() {
|
||||||
userId := c.GetSessionUsername()
|
|
||||||
if userId == "" {
|
|
||||||
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var permissionRules []object.PermissionRule
|
var permissionRules []object.PermissionRule
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRules)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRules)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -52,14 +40,14 @@ func (c *ApiController) BatchEnforce() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.BatchEnforce(userId, permissionRules)
|
c.Data["json"] = object.BatchEnforce(permissionRules)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) GetAllObjects() {
|
func (c *ApiController) GetAllObjects() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,7 +58,7 @@ func (c *ApiController) GetAllObjects() {
|
|||||||
func (c *ApiController) GetAllActions() {
|
func (c *ApiController) GetAllActions() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,7 +69,7 @@ func (c *ApiController) GetAllActions() {
|
|||||||
func (c *ApiController) GetAllRoles() {
|
func (c *ApiController) GetAllRoles() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ type LdapSyncResp struct {
|
|||||||
func (c *ApiController) GetLdapUser() {
|
func (c *ApiController) GetLdapUser() {
|
||||||
ldapServer := LdapServer{}
|
ldapServer := LdapServer{}
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldapServer)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldapServer)
|
||||||
if err != nil || util.IsStrsEmpty(ldapServer.Host, ldapServer.Admin, ldapServer.Passwd, ldapServer.BaseDn) {
|
if err != nil || util.IsStringsEmpty(ldapServer.Host, ldapServer.Admin, ldapServer.Passwd, ldapServer.BaseDn) {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -104,7 +104,7 @@ func (c *ApiController) GetLdapUser() {
|
|||||||
// GetLdaps
|
// GetLdaps
|
||||||
// @Tag Account API
|
// @Tag Account API
|
||||||
// @Title GetLdaps
|
// @Title GetLdaps
|
||||||
// @router /get-ldaps [post]
|
// @router /get-ldaps [get]
|
||||||
func (c *ApiController) GetLdaps() {
|
func (c *ApiController) GetLdaps() {
|
||||||
owner := c.Input().Get("owner")
|
owner := c.Input().Get("owner")
|
||||||
|
|
||||||
@ -115,12 +115,12 @@ func (c *ApiController) GetLdaps() {
|
|||||||
// GetLdap
|
// GetLdap
|
||||||
// @Tag Account API
|
// @Tag Account API
|
||||||
// @Title GetLdap
|
// @Title GetLdap
|
||||||
// @router /get-ldap [post]
|
// @router /get-ldap [get]
|
||||||
func (c *ApiController) GetLdap() {
|
func (c *ApiController) GetLdap() {
|
||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
|
|
||||||
if util.IsStrsEmpty(id) {
|
if util.IsStringsEmpty(id) {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -136,17 +136,17 @@ func (c *ApiController) AddLdap() {
|
|||||||
var ldap object.Ldap
|
var ldap object.Ldap
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
if util.IsStringsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if object.CheckLdapExist(&ldap) {
|
if object.CheckLdapExist(&ldap) {
|
||||||
c.ResponseError(c.T("LdapErr.ServerExisted"))
|
c.ResponseError(c.T("ldap:Ldap server exist"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -170,8 +170,8 @@ func (c *ApiController) AddLdap() {
|
|||||||
func (c *ApiController) UpdateLdap() {
|
func (c *ApiController) UpdateLdap() {
|
||||||
var ldap object.Ldap
|
var ldap object.Ldap
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
||||||
if err != nil || util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
if err != nil || util.IsStringsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,14 +105,34 @@ func handleSearch(w ldapserver.ResponseWriter, m *ldapserver.Message) {
|
|||||||
}
|
}
|
||||||
for i := 0; i < len(users); i++ {
|
for i := 0; i < len(users); i++ {
|
||||||
user := users[i]
|
user := users[i]
|
||||||
dn := fmt.Sprintf("cn=%s,%s", user.DisplayName, string(r.BaseObject()))
|
dn := fmt.Sprintf("cn=%s,%s", user.Name, string(r.BaseObject()))
|
||||||
e := ldapserver.NewSearchResultEntry(dn)
|
e := ldapserver.NewSearchResultEntry(dn)
|
||||||
e.AddAttribute("cn", message.AttributeValue(user.Name))
|
e.AddAttribute("cn", message.AttributeValue(user.Name))
|
||||||
e.AddAttribute("uid", message.AttributeValue(user.Name))
|
e.AddAttribute("uid", message.AttributeValue(user.Name))
|
||||||
e.AddAttribute("email", message.AttributeValue(user.Email))
|
e.AddAttribute("email", message.AttributeValue(user.Email))
|
||||||
e.AddAttribute("mobile", message.AttributeValue(user.Phone))
|
e.AddAttribute("mobile", message.AttributeValue(user.Phone))
|
||||||
|
e.AddAttribute("userPassword", message.AttributeValue(getUserPasswordWithType(user)))
|
||||||
// e.AddAttribute("postalAddress", message.AttributeValue(user.Address[0]))
|
// e.AddAttribute("postalAddress", message.AttributeValue(user.Address[0]))
|
||||||
w.Write(e)
|
w.Write(e)
|
||||||
}
|
}
|
||||||
w.Write(res)
|
w.Write(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get user password with hash type prefix
|
||||||
|
// TODO not handle salt yet
|
||||||
|
// @return {md5}5f4dcc3b5aa765d61d8327deb882cf99
|
||||||
|
func getUserPasswordWithType(user *object.User) string {
|
||||||
|
org := object.GetOrganizationByUser(user)
|
||||||
|
if org.PasswordType == "" || org.PasswordType == "plain" {
|
||||||
|
return user.Password
|
||||||
|
}
|
||||||
|
prefix := org.PasswordType
|
||||||
|
if prefix == "salt" {
|
||||||
|
prefix = "sha256"
|
||||||
|
} else if prefix == "md5-salt" {
|
||||||
|
prefix = "md5"
|
||||||
|
} else if prefix == "pbkdf2-salt" {
|
||||||
|
prefix = "pbkdf2"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("{%s}%s", prefix, user.Password)
|
||||||
|
}
|
||||||
|
@ -47,7 +47,7 @@ func (c *ApiController) Unlink() {
|
|||||||
|
|
||||||
if user.Id != unlinkedUser.Id && !user.IsGlobalAdmin {
|
if user.Id != unlinkedUser.Id && !user.IsGlobalAdmin {
|
||||||
// if the user is not the same as the one we are unlinking, we need to make sure the user is the global admin.
|
// if the user is not the same as the one we are unlinking, we need to make sure the user is the global admin.
|
||||||
c.ResponseError(c.T("AuthErr.CanNotUnlinkUsers"))
|
c.ResponseError(c.T("link:You are not the global admin, you can't unlink other users"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,23 +55,23 @@ func (c *ApiController) Unlink() {
|
|||||||
// if the user is unlinking themselves, should check the provider can be unlinked, if not, we should return an error.
|
// if the user is unlinking themselves, should check the provider can be unlinked, if not, we should return an error.
|
||||||
application := object.GetApplicationByUser(user)
|
application := object.GetApplicationByUser(user)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(c.T("AuthErr.CanNotLinkMySelf"))
|
c.ResponseError(c.T("link:You can't unlink yourself, you are not a member of any application"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(application.Providers) == 0 {
|
if len(application.Providers) == 0 {
|
||||||
c.ResponseError(c.T("ApplicationErr.HasNoProviders"))
|
c.ResponseError(c.T("link:This application has no providers"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := application.GetProviderItemByType(providerType)
|
provider := application.GetProviderItemByType(providerType)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(c.T("ApplicationErr.HasNoProvidersOfType") + providerType)
|
c.ResponseError(c.T("link:This application has no providers of type") + providerType)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !provider.CanUnlink {
|
if !provider.CanUnlink {
|
||||||
c.ResponseError(c.T("ProviderErr.CanNotBeUnlinked"))
|
c.ResponseError(c.T("link:This provider can't be unlinked"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ func (c *ApiController) Unlink() {
|
|||||||
value := object.GetUserField(&unlinkedUser, providerType)
|
value := object.GetUserField(&unlinkedUser, providerType)
|
||||||
|
|
||||||
if value == "" {
|
if value == "" {
|
||||||
c.ResponseError(c.T("ProviderErr.LinkFirstErr"), value)
|
c.ResponseError(c.T("link:Please link first"), value)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ func (c *ApiController) GetModels() {
|
|||||||
// @Title GetModel
|
// @Title GetModel
|
||||||
// @Tag Model API
|
// @Tag Model API
|
||||||
// @Description get model
|
// @Description get model
|
||||||
// @Param id query string true "The id of the model"
|
// @Param id query string true "The id ( owner/name ) of the model"
|
||||||
// @Success 200 {object} object.Model The Response object
|
// @Success 200 {object} object.Model The Response object
|
||||||
// @router /get-model [get]
|
// @router /get-model [get]
|
||||||
func (c *ApiController) GetModel() {
|
func (c *ApiController) GetModel() {
|
||||||
@ -66,7 +66,7 @@ func (c *ApiController) GetModel() {
|
|||||||
// @Title UpdateModel
|
// @Title UpdateModel
|
||||||
// @Tag Model API
|
// @Tag Model API
|
||||||
// @Description update model
|
// @Description update model
|
||||||
// @Param id query string true "The id of the model"
|
// @Param id query string true "The id ( owner/name ) of the model"
|
||||||
// @Param body body object.Model true "The details of the model"
|
// @Param body body object.Model true "The details of the model"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-model [post]
|
// @router /update-model [post]
|
||||||
@ -80,7 +80,7 @@ func (c *ApiController) UpdateModel() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateModel(id, &model))
|
c.Data["json"] = wrapErrorResponse(object.UpdateModelWithCheck(id, &model))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ func (c *ApiController) GetOrganization() {
|
|||||||
// @Title UpdateOrganization
|
// @Title UpdateOrganization
|
||||||
// @Tag Organization API
|
// @Tag Organization API
|
||||||
// @Description update organization
|
// @Description update organization
|
||||||
// @Param id query string true "The id of the organization"
|
// @Param id query string true "The id ( owner/name ) of the organization"
|
||||||
// @Param body body object.Organization true "The details of the organization"
|
// @Param body body object.Organization true "The details of the organization"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-organization [post]
|
// @router /update-organization [post]
|
||||||
@ -99,6 +99,12 @@ func (c *ApiController) AddOrganization() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
count := object.GetOrganizationCount("", "", "")
|
||||||
|
if err := checkQuotaForOrganization(count); err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddOrganization(&organization))
|
c.Data["json"] = wrapActionResponse(object.AddOrganization(&organization))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ func (c *ApiController) GetUserPayments() {
|
|||||||
// @Title GetPayment
|
// @Title GetPayment
|
||||||
// @Tag Payment API
|
// @Tag Payment API
|
||||||
// @Description get payment
|
// @Description get payment
|
||||||
// @Param id query string true "The id of the payment"
|
// @Param id query string true "The id ( owner/name ) of the payment"
|
||||||
// @Success 200 {object} object.Payment The Response object
|
// @Success 200 {object} object.Payment The Response object
|
||||||
// @router /get-payment [get]
|
// @router /get-payment [get]
|
||||||
func (c *ApiController) GetPayment() {
|
func (c *ApiController) GetPayment() {
|
||||||
@ -85,7 +85,7 @@ func (c *ApiController) GetPayment() {
|
|||||||
// @Title UpdatePayment
|
// @Title UpdatePayment
|
||||||
// @Tag Payment API
|
// @Tag Payment API
|
||||||
// @Description update payment
|
// @Description update payment
|
||||||
// @Param id query string true "The id of the payment"
|
// @Param id query string true "The id ( owner/name ) of the payment"
|
||||||
// @Param body body object.Payment true "The details of the payment"
|
// @Param body body object.Payment true "The details of the payment"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-payment [post]
|
// @router /update-payment [post]
|
||||||
@ -172,7 +172,7 @@ func (c *ApiController) NotifyPayment() {
|
|||||||
// @Title InvoicePayment
|
// @Title InvoicePayment
|
||||||
// @Tag Payment API
|
// @Tag Payment API
|
||||||
// @Description invoice payment
|
// @Description invoice payment
|
||||||
// @Param id query string true "The id of the payment"
|
// @Param id query string true "The id ( owner/name ) of the payment"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /invoice-payment [post]
|
// @router /invoice-payment [post]
|
||||||
func (c *ApiController) InvoicePayment() {
|
func (c *ApiController) InvoicePayment() {
|
||||||
|
@ -65,11 +65,25 @@ func (c *ApiController) GetPermissionsBySubmitter() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetPermissionsByRole
|
||||||
|
// @Title GetPermissionsByRole
|
||||||
|
// @Tag Permission API
|
||||||
|
// @Description get permissions by role
|
||||||
|
// @Param id query string true "The id ( owner/name ) of the role"
|
||||||
|
// @Success 200 {array} object.Permission The Response object
|
||||||
|
// @router /get-permissions-by-role [get]
|
||||||
|
func (c *ApiController) GetPermissionsByRole() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
permissions := object.GetPermissionsByRole(id)
|
||||||
|
c.ResponseOk(permissions, len(permissions))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// GetPermission
|
// GetPermission
|
||||||
// @Title GetPermission
|
// @Title GetPermission
|
||||||
// @Tag Permission API
|
// @Tag Permission API
|
||||||
// @Description get permission
|
// @Description get permission
|
||||||
// @Param id query string true "The id of the permission"
|
// @Param id query string true "The id ( owner/name ) of the permission"
|
||||||
// @Success 200 {object} object.Permission The Response object
|
// @Success 200 {object} object.Permission The Response object
|
||||||
// @router /get-permission [get]
|
// @router /get-permission [get]
|
||||||
func (c *ApiController) GetPermission() {
|
func (c *ApiController) GetPermission() {
|
||||||
@ -83,7 +97,7 @@ func (c *ApiController) GetPermission() {
|
|||||||
// @Title UpdatePermission
|
// @Title UpdatePermission
|
||||||
// @Tag Permission API
|
// @Tag Permission API
|
||||||
// @Description update permission
|
// @Description update permission
|
||||||
// @Param id query string true "The id of the permission"
|
// @Param id query string true "The id ( owner/name ) of the permission"
|
||||||
// @Param body body object.Permission true "The details of the permission"
|
// @Param body body object.Permission true "The details of the permission"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-permission [post]
|
// @router /update-permission [post]
|
||||||
|
@ -53,7 +53,7 @@ func (c *ApiController) GetProducts() {
|
|||||||
// @Title GetProduct
|
// @Title GetProduct
|
||||||
// @Tag Product API
|
// @Tag Product API
|
||||||
// @Description get product
|
// @Description get product
|
||||||
// @Param id query string true "The id of the product"
|
// @Param id query string true "The id ( owner/name ) of the product"
|
||||||
// @Success 200 {object} object.Product The Response object
|
// @Success 200 {object} object.Product The Response object
|
||||||
// @router /get-product [get]
|
// @router /get-product [get]
|
||||||
func (c *ApiController) GetProduct() {
|
func (c *ApiController) GetProduct() {
|
||||||
@ -70,7 +70,7 @@ func (c *ApiController) GetProduct() {
|
|||||||
// @Title UpdateProduct
|
// @Title UpdateProduct
|
||||||
// @Tag Product API
|
// @Tag Product API
|
||||||
// @Description update product
|
// @Description update product
|
||||||
// @Param id query string true "The id of the product"
|
// @Param id query string true "The id ( owner/name ) of the product"
|
||||||
// @Param body body object.Product true "The details of the product"
|
// @Param body body object.Product true "The details of the product"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-product [post]
|
// @router /update-product [post]
|
||||||
@ -130,7 +130,7 @@ func (c *ApiController) DeleteProduct() {
|
|||||||
// @Title BuyProduct
|
// @Title BuyProduct
|
||||||
// @Tag Product API
|
// @Tag Product API
|
||||||
// @Description buy product
|
// @Description buy product
|
||||||
// @Param id query string true "The id of the product"
|
// @Param id query string true "The id ( owner/name ) of the product"
|
||||||
// @Param providerName query string true "The name of the provider"
|
// @Param providerName query string true "The name of the provider"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /buy-product [post]
|
// @router /buy-product [post]
|
||||||
@ -141,13 +141,13 @@ func (c *ApiController) BuyProduct() {
|
|||||||
|
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
user := object.GetUser(userId)
|
user := object.GetUser(userId)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), userId))
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), userId))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,12 +76,11 @@ func (c *ApiController) GetGlobalProviders() {
|
|||||||
// @Title GetProvider
|
// @Title GetProvider
|
||||||
// @Tag Provider API
|
// @Tag Provider API
|
||||||
// @Description get provider
|
// @Description get provider
|
||||||
// @Param id query string true "The id of the provider"
|
// @Param id query string true "The id ( owner/name ) of the provider"
|
||||||
// @Success 200 {object} object.Provider The Response object
|
// @Success 200 {object} object.Provider The Response object
|
||||||
// @router /get-provider [get]
|
// @router /get-provider [get]
|
||||||
func (c *ApiController) GetProvider() {
|
func (c *ApiController) GetProvider() {
|
||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
|
|
||||||
c.Data["json"] = object.GetMaskedProvider(object.GetProvider(id))
|
c.Data["json"] = object.GetMaskedProvider(object.GetProvider(id))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
@ -90,7 +89,7 @@ func (c *ApiController) GetProvider() {
|
|||||||
// @Title UpdateProvider
|
// @Title UpdateProvider
|
||||||
// @Tag Provider API
|
// @Tag Provider API
|
||||||
// @Description update provider
|
// @Description update provider
|
||||||
// @Param id query string true "The id of the provider"
|
// @Param id query string true "The id ( owner/name ) of the provider"
|
||||||
// @Param body body object.Provider true "The details of the provider"
|
// @Param body body object.Provider true "The details of the provider"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-provider [post]
|
// @router /update-provider [post]
|
||||||
@ -123,6 +122,12 @@ func (c *ApiController) AddProvider() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
count := object.GetProviderCount("", "", "")
|
||||||
|
if err := checkQuotaForProvider(count); err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddProvider(&provider))
|
c.Data["json"] = wrapActionResponse(object.AddProvider(&provider))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
@ -40,6 +40,15 @@ func (c *ApiController) GetResources() {
|
|||||||
value := c.Input().Get("value")
|
value := c.Input().Get("value")
|
||||||
sortField := c.Input().Get("sortField")
|
sortField := c.Input().Get("sortField")
|
||||||
sortOrder := c.Input().Get("sortOrder")
|
sortOrder := c.Input().Get("sortOrder")
|
||||||
|
|
||||||
|
userObj, ok := c.RequireSignedInUser()
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if userObj.IsAdmin {
|
||||||
|
user = ""
|
||||||
|
}
|
||||||
|
|
||||||
if limit == "" || page == "" {
|
if limit == "" || page == "" {
|
||||||
c.Data["json"] = object.GetResources(owner, user)
|
c.Data["json"] = object.GetResources(owner, user)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
@ -145,7 +154,7 @@ func (c *ApiController) UploadResource() {
|
|||||||
defer file.Close()
|
defer file.Close()
|
||||||
|
|
||||||
if username == "" || fullFilePath == "" {
|
if username == "" || fullFilePath == "" {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ResourceErr.UsernameOrFilePathEmpty"), username, fullFilePath))
|
c.ResponseError(fmt.Sprintf(c.T("resource:Username or fullFilePath is empty: username = %s, fullFilePath = %s"), username, fullFilePath))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -156,7 +165,7 @@ func (c *ApiController) UploadResource() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider, user, ok := c.GetProviderFromContext("Storage")
|
provider, _, ok := c.GetProviderFromContext("Storage")
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -171,6 +180,21 @@ func (c *ApiController) UploadResource() {
|
|||||||
fileType, _ = util.GetOwnerAndNameFromId(mimeType)
|
fileType, _ = util.GetOwnerAndNameFromId(mimeType)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fullFilePath = object.GetTruncatedPath(provider, fullFilePath, 175)
|
||||||
|
if tag != "avatar" && tag != "termsOfUse" {
|
||||||
|
ext := filepath.Ext(filepath.Base(fullFilePath))
|
||||||
|
index := len(fullFilePath) - len(ext)
|
||||||
|
for i := 1; ; i++ {
|
||||||
|
_, objectKey := object.GetUploadFileUrl(provider, fullFilePath, true)
|
||||||
|
if object.GetResourceCount(owner, username, "name", objectKey) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// duplicated fullFilePath found, change it
|
||||||
|
fullFilePath = fullFilePath[:index] + fmt.Sprintf("-%d", i) + ext
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fileUrl, objectKey, err := object.UploadFileSafe(provider, fullFilePath, fileBuffer)
|
fileUrl, objectKey, err := object.UploadFileSafe(provider, fullFilePath, fileBuffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
@ -202,12 +226,10 @@ func (c *ApiController) UploadResource() {
|
|||||||
|
|
||||||
switch tag {
|
switch tag {
|
||||||
case "avatar":
|
case "avatar":
|
||||||
|
user := object.GetUserNoCheck(util.GetId(owner, username))
|
||||||
if user == nil {
|
if user == nil {
|
||||||
user = object.GetUserNoCheck(username)
|
c.ResponseError(c.T("resource:User is nil for tag: avatar"))
|
||||||
if user == nil {
|
return
|
||||||
c.ResponseError(c.T("ResourceErr.UserIsNil"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
user.Avatar = fileUrl
|
user.Avatar = fileUrl
|
||||||
|
@ -52,7 +52,7 @@ func (c *ApiController) GetRoles() {
|
|||||||
// @Title GetRole
|
// @Title GetRole
|
||||||
// @Tag Role API
|
// @Tag Role API
|
||||||
// @Description get role
|
// @Description get role
|
||||||
// @Param id query string true "The id of the role"
|
// @Param id query string true "The id ( owner/name ) of the role"
|
||||||
// @Success 200 {object} object.Role The Response object
|
// @Success 200 {object} object.Role The Response object
|
||||||
// @router /get-role [get]
|
// @router /get-role [get]
|
||||||
func (c *ApiController) GetRole() {
|
func (c *ApiController) GetRole() {
|
||||||
@ -66,7 +66,7 @@ func (c *ApiController) GetRole() {
|
|||||||
// @Title UpdateRole
|
// @Title UpdateRole
|
||||||
// @Tag Role API
|
// @Tag Role API
|
||||||
// @Description update role
|
// @Description update role
|
||||||
// @Param id query string true "The id of the role"
|
// @Param id query string true "The id ( owner/name ) of the role"
|
||||||
// @Param body body object.Role true "The details of the role"
|
// @Param body body object.Role true "The details of the role"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-role [post]
|
// @router /update-role [post]
|
||||||
|
@ -25,7 +25,7 @@ func (c *ApiController) GetSamlMeta() {
|
|||||||
paramApp := c.Input().Get("application")
|
paramApp := c.Input().Get("application")
|
||||||
application := object.GetApplication(paramApp)
|
application := object.GetApplication(paramApp)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ApplicationErr.AppNotFound"), paramApp))
|
c.ResponseError(fmt.Sprintf(c.T("saml:Application %s not found"), paramApp))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
metadata, _ := object.GetSamlMeta(application, host)
|
metadata, _ := object.GetSamlMeta(application, host)
|
||||||
|
@ -60,7 +60,7 @@ func (c *ApiController) SendEmail() {
|
|||||||
var provider *object.Provider
|
var provider *object.Provider
|
||||||
if emailForm.Provider != "" {
|
if emailForm.Provider != "" {
|
||||||
// called by frontend's TestEmailWidget, provider name is set by frontend
|
// called by frontend's TestEmailWidget, provider name is set by frontend
|
||||||
provider = object.GetProvider(fmt.Sprintf("admin/%s", emailForm.Provider))
|
provider = object.GetProvider(util.GetId("admin", emailForm.Provider))
|
||||||
} else {
|
} else {
|
||||||
// called by Casdoor SDK via Client ID & Client Secret, so the used Email provider will be the application' Email provider or the default Email provider
|
// called by Casdoor SDK via Client ID & Client Secret, so the used Email provider will be the application' Email provider or the default Email provider
|
||||||
var ok bool
|
var ok bool
|
||||||
@ -80,8 +80,8 @@ func (c *ApiController) SendEmail() {
|
|||||||
c.ResponseOk()
|
c.ResponseOk()
|
||||||
}
|
}
|
||||||
|
|
||||||
if util.IsStrsEmpty(emailForm.Title, emailForm.Content, emailForm.Sender) {
|
if util.IsStringsEmpty(emailForm.Title, emailForm.Content, emailForm.Sender) {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("EmailErr.EmptyParam"), emailForm))
|
c.ResponseError(fmt.Sprintf(c.T("service:Empty parameters for emailForm: %v"), emailForm))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ func (c *ApiController) SendEmail() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(invalidReceivers) != 0 {
|
if len(invalidReceivers) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("EmailErr.InvalidReceivers"), invalidReceivers))
|
c.ResponseError(fmt.Sprintf(c.T("service:Invalid Email receivers: %s"), invalidReceivers))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,18 +130,18 @@ func (c *ApiController) SendSms() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
org := object.GetOrganization(smsForm.OrgId)
|
|
||||||
var invalidReceivers []string
|
var invalidReceivers []string
|
||||||
for idx, receiver := range smsForm.Receivers {
|
for idx, receiver := range smsForm.Receivers {
|
||||||
if !util.IsPhoneCnValid(receiver) {
|
// The receiver phone format: E164 like +8613854673829 +441932567890
|
||||||
|
if !util.IsPhoneValid(receiver, "") {
|
||||||
invalidReceivers = append(invalidReceivers, receiver)
|
invalidReceivers = append(invalidReceivers, receiver)
|
||||||
} else {
|
} else {
|
||||||
smsForm.Receivers[idx] = fmt.Sprintf("+%s%s", org.PhonePrefix, receiver)
|
smsForm.Receivers[idx] = receiver
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(invalidReceivers) != 0 {
|
if len(invalidReceivers) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("PhoneErr.InvalidReceivers"), invalidReceivers))
|
c.ResponseError(fmt.Sprintf(c.T("service:Invalid phone receivers: %s"), invalidReceivers))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
139
controllers/session.go
Normal file
139
controllers/session.go
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package controllers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/beego/beego/utils/pagination"
|
||||||
|
"github.com/casdoor/casdoor/object"
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetSessions
|
||||||
|
// @Title GetSessions
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Get organization user sessions.
|
||||||
|
// @Param owner query string true "The organization name"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /get-sessions [get]
|
||||||
|
func (c *ApiController) GetSessions() {
|
||||||
|
limit := c.Input().Get("pageSize")
|
||||||
|
page := c.Input().Get("p")
|
||||||
|
field := c.Input().Get("field")
|
||||||
|
value := c.Input().Get("value")
|
||||||
|
sortField := c.Input().Get("sortField")
|
||||||
|
sortOrder := c.Input().Get("sortOrder")
|
||||||
|
owner := c.Input().Get("owner")
|
||||||
|
if limit == "" || page == "" {
|
||||||
|
c.Data["json"] = object.GetSessions(owner)
|
||||||
|
c.ServeJSON()
|
||||||
|
} else {
|
||||||
|
limit := util.ParseInt(limit)
|
||||||
|
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetSessionCount(owner, field, value)))
|
||||||
|
sessions := object.GetPaginationSessions(owner, paginator.Offset(), limit, field, value, sortField, sortOrder)
|
||||||
|
c.ResponseOk(sessions, paginator.Nums())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSingleSession
|
||||||
|
// @Title GetSingleSession
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Get session for one user in one application.
|
||||||
|
// @Param id query string true "The id(organization/application/user) of session"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /get-session [get]
|
||||||
|
func (c *ApiController) GetSingleSession() {
|
||||||
|
id := c.Input().Get("sessionPkId")
|
||||||
|
|
||||||
|
c.Data["json"] = object.GetSingleSession(id)
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateSession
|
||||||
|
// @Title UpdateSession
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Update session for one user in one application.
|
||||||
|
// @Param id query string true "The id(organization/application/user) of session"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /update-session [post]
|
||||||
|
func (c *ApiController) UpdateSession() {
|
||||||
|
var session object.Session
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &session)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.UpdateSession(util.GetSessionId(session.Owner, session.Name, session.Application), &session))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddSession
|
||||||
|
// @Title AddSession
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Add session for one user in one application. If there are other existing sessions, join the session into the list.
|
||||||
|
// @Param id query string true "The id(organization/application/user) of session"
|
||||||
|
// @Param sessionId query string true "sessionId to be added"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /add-session [post]
|
||||||
|
func (c *ApiController) AddSession() {
|
||||||
|
var session object.Session
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &session)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.AddSession(&session))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteSession
|
||||||
|
// @Title DeleteSession
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Delete session for one user in one application.
|
||||||
|
// @Param id query string true "The id(organization/application/user) of session"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /delete-session [post]
|
||||||
|
func (c *ApiController) DeleteSession() {
|
||||||
|
var session object.Session
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &session)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.DeleteSession(util.GetSessionId(session.Owner, session.Name, session.Application)))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsSessionDuplicated
|
||||||
|
// @Title IsSessionDuplicated
|
||||||
|
// @Tag Session API
|
||||||
|
// @Description Check if there are other different sessions for one user in one application.
|
||||||
|
// @Param id query string true "The id(organization/application/user) of session"
|
||||||
|
// @Param sessionId query string true "sessionId to be checked"
|
||||||
|
// @Success 200 {array} string The Response object
|
||||||
|
// @router /is-session-duplicated [get]
|
||||||
|
func (c *ApiController) IsSessionDuplicated() {
|
||||||
|
id := c.Input().Get("sessionPkId")
|
||||||
|
sessionId := c.Input().Get("sessionId")
|
||||||
|
|
||||||
|
isUserSessionDuplicated := object.IsSessionDuplicated(id, sessionId)
|
||||||
|
c.Data["json"] = &Response{Status: "ok", Msg: "", Data: isUserSessionDuplicated}
|
||||||
|
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
@ -52,7 +52,7 @@ func (c *ApiController) GetSyncers() {
|
|||||||
// @Title GetSyncer
|
// @Title GetSyncer
|
||||||
// @Tag Syncer API
|
// @Tag Syncer API
|
||||||
// @Description get syncer
|
// @Description get syncer
|
||||||
// @Param id query string true "The id of the syncer"
|
// @Param id query string true "The id ( owner/name ) of the syncer"
|
||||||
// @Success 200 {object} object.Syncer The Response object
|
// @Success 200 {object} object.Syncer The Response object
|
||||||
// @router /get-syncer [get]
|
// @router /get-syncer [get]
|
||||||
func (c *ApiController) GetSyncer() {
|
func (c *ApiController) GetSyncer() {
|
||||||
@ -66,7 +66,7 @@ func (c *ApiController) GetSyncer() {
|
|||||||
// @Title UpdateSyncer
|
// @Title UpdateSyncer
|
||||||
// @Tag Syncer API
|
// @Tag Syncer API
|
||||||
// @Description update syncer
|
// @Description update syncer
|
||||||
// @Param id query string true "The id of the syncer"
|
// @Param id query string true "The id ( owner/name ) of the syncer"
|
||||||
// @Param body body object.Syncer true "The details of the syncer"
|
// @Param body body object.Syncer true "The details of the syncer"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-syncer [post]
|
// @router /update-syncer [post]
|
||||||
|
@ -29,7 +29,7 @@ type SystemInfo struct {
|
|||||||
// @Title GetSystemInfo
|
// @Title GetSystemInfo
|
||||||
// @Tag System API
|
// @Tag System API
|
||||||
// @Description get user's system info
|
// @Description get user's system info
|
||||||
// @Param id query string true "The id of the user"
|
// @Param id query string true "The id ( owner/name ) of the user"
|
||||||
// @Success 200 {object} object.SystemInfo The Response object
|
// @Success 200 {object} object.SystemInfo The Response object
|
||||||
// @router /get-system-info [get]
|
// @router /get-system-info [get]
|
||||||
func (c *ApiController) GetSystemInfo() {
|
func (c *ApiController) GetSystemInfo() {
|
||||||
@ -40,7 +40,7 @@ func (c *ApiController) GetSystemInfo() {
|
|||||||
|
|
||||||
user := object.GetUser(id)
|
user := object.GetUser(id)
|
||||||
if user == nil || !user.IsGlobalAdmin {
|
if user == nil || !user.IsGlobalAdmin {
|
||||||
c.ResponseError(c.T("ResourceErr.NotAuthorized"))
|
c.ResponseError(c.T("auth:Unauthorized operation"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ package controllers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/beego/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
@ -55,7 +54,7 @@ func (c *ApiController) GetTokens() {
|
|||||||
// @Title GetToken
|
// @Title GetToken
|
||||||
// @Tag Token API
|
// @Tag Token API
|
||||||
// @Description get token
|
// @Description get token
|
||||||
// @Param id query string true "The id of token"
|
// @Param id query string true "The id ( owner/name ) of token"
|
||||||
// @Success 200 {object} object.Token The Response object
|
// @Success 200 {object} object.Token The Response object
|
||||||
// @router /get-token [get]
|
// @router /get-token [get]
|
||||||
func (c *ApiController) GetToken() {
|
func (c *ApiController) GetToken() {
|
||||||
@ -69,7 +68,7 @@ func (c *ApiController) GetToken() {
|
|||||||
// @Title UpdateToken
|
// @Title UpdateToken
|
||||||
// @Tag Token API
|
// @Tag Token API
|
||||||
// @Description update token
|
// @Description update token
|
||||||
// @Param id query string true "The id of token"
|
// @Param id query string true "The id ( owner/name ) of token"
|
||||||
// @Param body body object.Token true "Details of the token"
|
// @Param body body object.Token true "Details of the token"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-token [post]
|
// @router /update-token [post]
|
||||||
@ -129,7 +128,7 @@ func (c *ApiController) DeleteToken() {
|
|||||||
// @Title GetOAuthCode
|
// @Title GetOAuthCode
|
||||||
// @Tag Token API
|
// @Tag Token API
|
||||||
// @Description get OAuth code
|
// @Description get OAuth code
|
||||||
// @Param user_id query string true "The id of user"
|
// @Param id query string true "The id ( owner/name ) of user"
|
||||||
// @Param client_id query string true "OAuth client id"
|
// @Param client_id query string true "OAuth client id"
|
||||||
// @Param response_type query string true "OAuth response type"
|
// @Param response_type query string true "OAuth response type"
|
||||||
// @Param redirect_uri query string true "OAuth redirect URI"
|
// @Param redirect_uri query string true "OAuth redirect URI"
|
||||||
@ -150,7 +149,7 @@ func (c *ApiController) GetOAuthCode() {
|
|||||||
codeChallenge := c.Input().Get("code_challenge")
|
codeChallenge := c.Input().Get("code_challenge")
|
||||||
|
|
||||||
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
||||||
c.ResponseError(c.T("AuthErr.ChallengeMethodErr"))
|
c.ResponseError(c.T("auth:Challenge method should be S256"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
host := c.Ctx.Request.Host
|
host := c.Ctx.Request.Host
|
||||||
@ -173,6 +172,7 @@ func (c *ApiController) GetOAuthCode() {
|
|||||||
// @router /login/oauth/access_token [post]
|
// @router /login/oauth/access_token [post]
|
||||||
func (c *ApiController) GetOAuthToken() {
|
func (c *ApiController) GetOAuthToken() {
|
||||||
grantType := c.Input().Get("grant_type")
|
grantType := c.Input().Get("grant_type")
|
||||||
|
refreshToken := c.Input().Get("refresh_token")
|
||||||
clientId := c.Input().Get("client_id")
|
clientId := c.Input().Get("client_id")
|
||||||
clientSecret := c.Input().Get("client_secret")
|
clientSecret := c.Input().Get("client_secret")
|
||||||
code := c.Input().Get("code")
|
code := c.Input().Get("code")
|
||||||
@ -193,6 +193,7 @@ func (c *ApiController) GetOAuthToken() {
|
|||||||
clientId = tokenRequest.ClientId
|
clientId = tokenRequest.ClientId
|
||||||
clientSecret = tokenRequest.ClientSecret
|
clientSecret = tokenRequest.ClientSecret
|
||||||
grantType = tokenRequest.GrantType
|
grantType = tokenRequest.GrantType
|
||||||
|
refreshToken = tokenRequest.RefreshToken
|
||||||
code = tokenRequest.Code
|
code = tokenRequest.Code
|
||||||
verifier = tokenRequest.Verifier
|
verifier = tokenRequest.Verifier
|
||||||
scope = tokenRequest.Scope
|
scope = tokenRequest.Scope
|
||||||
@ -204,7 +205,7 @@ func (c *ApiController) GetOAuthToken() {
|
|||||||
}
|
}
|
||||||
host := c.Ctx.Request.Host
|
host := c.Ctx.Request.Host
|
||||||
|
|
||||||
c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code, verifier, scope, username, password, host, tag, avatar, c.GetAcceptLanguage())
|
c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code, verifier, scope, username, password, host, refreshToken, tag, avatar, c.GetAcceptLanguage())
|
||||||
c.SetTokenErrorHttpStatus()
|
c.SetTokenErrorHttpStatus()
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
@ -247,28 +248,6 @@ func (c *ApiController) RefreshToken() {
|
|||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TokenLogout
|
|
||||||
// @Title TokenLogout
|
|
||||||
// @Tag Token API
|
|
||||||
// @Description delete token by AccessToken
|
|
||||||
// @Param id_token_hint query string true "id_token_hint"
|
|
||||||
// @Param post_logout_redirect_uri query string false "post_logout_redirect_uri"
|
|
||||||
// @Param state query string true "state"
|
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
|
||||||
// @router /login/oauth/logout [get]
|
|
||||||
func (c *ApiController) TokenLogout() {
|
|
||||||
token := c.Input().Get("id_token_hint")
|
|
||||||
flag, application := object.DeleteTokenByAccessToken(token)
|
|
||||||
redirectUri := c.Input().Get("post_logout_redirect_uri")
|
|
||||||
state := c.Input().Get("state")
|
|
||||||
if application != nil && object.CheckRedirectUriValid(application, redirectUri) {
|
|
||||||
c.Ctx.Redirect(http.StatusFound, redirectUri+"?state="+state)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.Data["json"] = wrapActionResponse(flag)
|
|
||||||
c.ServeJSON()
|
|
||||||
}
|
|
||||||
|
|
||||||
// IntrospectToken
|
// IntrospectToken
|
||||||
// @Title IntrospectToken
|
// @Title IntrospectToken
|
||||||
// @Description The introspection endpoint is an OAuth 2.0 endpoint that takes a
|
// @Description The introspection endpoint is an OAuth 2.0 endpoint that takes a
|
||||||
@ -290,7 +269,7 @@ func (c *ApiController) IntrospectToken() {
|
|||||||
clientId = c.Input().Get("client_id")
|
clientId = c.Input().Get("client_id")
|
||||||
clientSecret = c.Input().Get("client_secret")
|
clientSecret = c.Input().Get("client_secret")
|
||||||
if clientId == "" || clientSecret == "" {
|
if clientId == "" || clientSecret == "" {
|
||||||
c.ResponseError(c.T("TokenErr.EmptyClientID"))
|
c.ResponseError(c.T("token:Empty clientId or clientSecret"))
|
||||||
c.Data["json"] = &object.TokenError{
|
c.Data["json"] = &object.TokenError{
|
||||||
Error: object.InvalidRequest,
|
Error: object.InvalidRequest,
|
||||||
}
|
}
|
||||||
@ -301,7 +280,7 @@ func (c *ApiController) IntrospectToken() {
|
|||||||
}
|
}
|
||||||
application := object.GetApplicationByClientId(clientId)
|
application := object.GetApplicationByClientId(clientId)
|
||||||
if application == nil || application.ClientSecret != clientSecret {
|
if application == nil || application.ClientSecret != clientSecret {
|
||||||
c.ResponseError(c.T("TokenErr.InvalidAppOrWrongClientSecret"))
|
c.ResponseError(c.T("token:Invalid application or wrong clientSecret"))
|
||||||
c.Data["json"] = &object.TokenError{
|
c.Data["json"] = &object.TokenError{
|
||||||
Error: object.InvalidClient,
|
Error: object.InvalidClient,
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ func (c *ApiController) GetUsers() {
|
|||||||
// @Title GetUser
|
// @Title GetUser
|
||||||
// @Tag User API
|
// @Tag User API
|
||||||
// @Description get user
|
// @Description get user
|
||||||
// @Param id query string true "The id of the user"
|
// @Param id query string true "The id ( owner/name ) of the user"
|
||||||
// @Param owner query string false "The owner of the user"
|
// @Param owner query string false "The owner of the user"
|
||||||
// @Param email query string false "The email of the user"
|
// @Param email query string false "The email of the user"
|
||||||
// @Param phone query string false "The phone of the user"
|
// @Param phone query string false "The phone of the user"
|
||||||
@ -129,7 +129,7 @@ func (c *ApiController) GetUser() {
|
|||||||
// @Title UpdateUser
|
// @Title UpdateUser
|
||||||
// @Tag User API
|
// @Tag User API
|
||||||
// @Description update user
|
// @Description update user
|
||||||
// @Param id query string true "The id of the user"
|
// @Param id query string true "The id ( owner/name ) of the user"
|
||||||
// @Param body body object.User true "The details of the user"
|
// @Param body body object.User true "The details of the user"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-user [post]
|
// @router /update-user [post]
|
||||||
@ -148,8 +148,8 @@ func (c *ApiController) UpdateUser() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.DisplayName == "" {
|
if msg := object.CheckUpdateUser(object.GetUser(id), &user, c.GetAcceptLanguage()); msg != "" {
|
||||||
c.ResponseError(c.T("UserErr.DisplayNameCanNotBeEmpty"))
|
c.ResponseError(msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,6 +159,12 @@ func (c *ApiController) UpdateUser() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isGlobalAdmin := c.IsGlobalAdmin()
|
isGlobalAdmin := c.IsGlobalAdmin()
|
||||||
|
|
||||||
|
if pass, err := checkPermissionForUpdateUser(id, user, c); !pass {
|
||||||
|
c.ResponseError(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
affected := object.UpdateUser(id, &user, columns, isGlobalAdmin)
|
affected := object.UpdateUser(id, &user, columns, isGlobalAdmin)
|
||||||
if affected {
|
if affected {
|
||||||
object.UpdateUserToOriginalDatabase(&user)
|
object.UpdateUserToOriginalDatabase(&user)
|
||||||
@ -183,6 +189,12 @@ func (c *ApiController) AddUser() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
count := object.GetUserCount("", "", "")
|
||||||
|
if err := checkQuotaForUser(count); err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
msg := object.CheckUsername(user.Name, c.GetAcceptLanguage())
|
msg := object.CheckUsername(user.Name, c.GetAcceptLanguage())
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
c.ResponseError(msg)
|
c.ResponseError(msg)
|
||||||
@ -230,7 +242,7 @@ func (c *ApiController) GetEmailAndPhone() {
|
|||||||
|
|
||||||
user := object.GetUserByFields(form.Organization, form.Username)
|
user := object.GetUserByFields(form.Organization, form.Username)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExistInOrg"), form.Organization, form.Username))
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(form.Organization, form.Username)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -288,12 +300,12 @@ func (c *ApiController) SetPassword() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if strings.Contains(newPassword, " ") {
|
if strings.Contains(newPassword, " ") {
|
||||||
c.ResponseError(c.T("SetPasswordErr.CanNotContainBlank"))
|
c.ResponseError(c.T("user:New password cannot contain blank space."))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(newPassword) <= 5 {
|
if len(newPassword) <= 5 {
|
||||||
c.ResponseError(c.T("SetPasswordErr.LessThanSixCharacters"))
|
c.ResponseError(c.T("user:New password must have at least 6 characters"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,6 +61,6 @@ func (c *ApiController) UploadUsers() {
|
|||||||
if affected {
|
if affected {
|
||||||
c.ResponseOk()
|
c.ResponseOk()
|
||||||
} else {
|
} else {
|
||||||
c.ResponseError(c.T("UserErr.FailToImportUsers"))
|
c.ResponseError(c.T("user_upload:Failed to import users"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
139
controllers/user_util.go
Normal file
139
controllers/user_util.go
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package controllers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/object"
|
||||||
|
)
|
||||||
|
|
||||||
|
func checkPermissionForUpdateUser(userId string, newUser object.User, c *ApiController) (bool, string) {
|
||||||
|
oldUser := object.GetUser(userId)
|
||||||
|
organization := object.GetOrganizationByUser(oldUser)
|
||||||
|
var itemsChanged []*object.AccountItem
|
||||||
|
|
||||||
|
if oldUser.Owner != newUser.Owner {
|
||||||
|
item := object.GetAccountItemByName("Organization", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Name != newUser.Name {
|
||||||
|
item := object.GetAccountItemByName("Name", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Id != newUser.Id {
|
||||||
|
item := object.GetAccountItemByName("ID", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.DisplayName != newUser.DisplayName {
|
||||||
|
item := object.GetAccountItemByName("Display name", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Avatar != newUser.Avatar {
|
||||||
|
item := object.GetAccountItemByName("Avatar", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Type != newUser.Type {
|
||||||
|
item := object.GetAccountItemByName("User type", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
// The password is *** when not modified
|
||||||
|
if oldUser.Password != newUser.Password && newUser.Password != "***" {
|
||||||
|
item := object.GetAccountItemByName("Password", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Email != newUser.Email {
|
||||||
|
item := object.GetAccountItemByName("Email", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Phone != newUser.Phone {
|
||||||
|
item := object.GetAccountItemByName("Phone", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.CountryCode != newUser.CountryCode {
|
||||||
|
item := object.GetAccountItemByName("Country code", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Region != newUser.Region {
|
||||||
|
item := object.GetAccountItemByName("Country/Region", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Location != newUser.Location {
|
||||||
|
item := object.GetAccountItemByName("Location", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Affiliation != newUser.Affiliation {
|
||||||
|
item := object.GetAccountItemByName("Affiliation", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Title != newUser.Title {
|
||||||
|
item := object.GetAccountItemByName("Title", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Homepage != newUser.Homepage {
|
||||||
|
item := object.GetAccountItemByName("Homepage", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Bio != newUser.Bio {
|
||||||
|
item := object.GetAccountItemByName("Bio", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.Tag != newUser.Tag {
|
||||||
|
item := object.GetAccountItemByName("Tag", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.SignupApplication != newUser.SignupApplication {
|
||||||
|
item := object.GetAccountItemByName("Signup application", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
oldUserPropertiesJson, _ := json.Marshal(oldUser.Properties)
|
||||||
|
newUserPropertiesJson, _ := json.Marshal(newUser.Properties)
|
||||||
|
if string(oldUserPropertiesJson) != string(newUserPropertiesJson) {
|
||||||
|
item := object.GetAccountItemByName("Properties", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
if oldUser.IsAdmin != newUser.IsAdmin {
|
||||||
|
item := object.GetAccountItemByName("Is admin", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.IsGlobalAdmin != newUser.IsGlobalAdmin {
|
||||||
|
item := object.GetAccountItemByName("Is global admin", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.IsForbidden != newUser.IsForbidden {
|
||||||
|
item := object.GetAccountItemByName("Is forbidden", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
if oldUser.IsDeleted != newUser.IsDeleted {
|
||||||
|
item := object.GetAccountItemByName("Is deleted", organization)
|
||||||
|
itemsChanged = append(itemsChanged, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := c.getCurrentUser()
|
||||||
|
if currentUser == nil && c.IsGlobalAdmin() {
|
||||||
|
currentUser = &object.User{
|
||||||
|
IsGlobalAdmin: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range itemsChanged {
|
||||||
|
if pass, err := object.CheckAccountItemModifyRule(itemsChanged[i], currentUser, c.GetAcceptLanguage()); !pass {
|
||||||
|
return pass, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true, ""
|
||||||
|
}
|
@ -55,11 +55,8 @@ func (c *ApiController) T(error string) string {
|
|||||||
|
|
||||||
// GetAcceptLanguage ...
|
// GetAcceptLanguage ...
|
||||||
func (c *ApiController) GetAcceptLanguage() string {
|
func (c *ApiController) GetAcceptLanguage() string {
|
||||||
lang := c.Ctx.Request.Header.Get("Accept-Language")
|
language := c.Ctx.Request.Header.Get("Accept-Language")
|
||||||
if lang == "" {
|
return conf.GetLanguage(language)
|
||||||
lang = "en"
|
|
||||||
}
|
|
||||||
return lang[0:2]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetTokenErrorHttpStatus ...
|
// SetTokenErrorHttpStatus ...
|
||||||
@ -83,7 +80,7 @@ func (c *ApiController) SetTokenErrorHttpStatus() {
|
|||||||
func (c *ApiController) RequireSignedIn() (string, bool) {
|
func (c *ApiController) RequireSignedIn() (string, bool) {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError(c.T("LoginErr.LoginFirst"), "Please login first")
|
c.ResponseError(c.T("general:Please login first"), "Please login first")
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
return userId, true
|
return userId, true
|
||||||
@ -99,7 +96,7 @@ func (c *ApiController) RequireSignedInUser() (*object.User, bool) {
|
|||||||
user := object.GetUser(userId)
|
user := object.GetUser(userId)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ClearUserSession()
|
c.ClearUserSession()
|
||||||
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), userId))
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), userId))
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
return user, true
|
return user, true
|
||||||
@ -118,16 +115,20 @@ func (c *ApiController) RequireAdmin() (string, bool) {
|
|||||||
return user.Owner, true
|
return user.Owner, true
|
||||||
}
|
}
|
||||||
|
|
||||||
func getInitScore() (int, error) {
|
func getInitScore(organization *object.Organization) (int, error) {
|
||||||
return strconv.Atoi(conf.GetConfigString("initScore"))
|
if organization != nil {
|
||||||
|
return organization.InitScore, nil
|
||||||
|
} else {
|
||||||
|
return strconv.Atoi(conf.GetConfigString("initScore"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) GetProviderFromContext(category string) (*object.Provider, *object.User, bool) {
|
func (c *ApiController) GetProviderFromContext(category string) (*object.Provider, *object.User, bool) {
|
||||||
providerName := c.Input().Get("provider")
|
providerName := c.Input().Get("provider")
|
||||||
if providerName != "" {
|
if providerName != "" {
|
||||||
provider := object.GetProvider(util.GetId(providerName))
|
provider := object.GetProvider(util.GetId("admin", providerName))
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(c.T("ProviderErr.ProviderNotFound"), providerName)
|
c.ResponseError(c.T("util:The provider: %s is not found"), providerName)
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
return provider, nil, true
|
return provider, nil, true
|
||||||
@ -140,15 +141,59 @@ func (c *ApiController) GetProviderFromContext(category string) (*object.Provide
|
|||||||
|
|
||||||
application, user := object.GetApplicationByUserId(userId)
|
application, user := object.GetApplicationByUserId(userId)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ApplicationErr.AppNotFoundForUserID"), userId))
|
c.ResponseError(fmt.Sprintf(c.T("util:No application is found for userId: %s"), userId))
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := application.GetProviderByCategory(category)
|
provider := application.GetProviderByCategory(category)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotFoundForCategory"), category, application.Name))
|
c.ResponseError(fmt.Sprintf(c.T("util:No provider for category: %s is found for application: %s"), category, application.Name))
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
return provider, user, true
|
return provider, user, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkQuotaForApplication(count int) error {
|
||||||
|
quota := conf.GetConfigQuota().Application
|
||||||
|
if quota == -1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if count >= quota {
|
||||||
|
return fmt.Errorf("application quota is exceeded")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkQuotaForOrganization(count int) error {
|
||||||
|
quota := conf.GetConfigQuota().Organization
|
||||||
|
if quota == -1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if count >= quota {
|
||||||
|
return fmt.Errorf("organization quota is exceeded")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkQuotaForProvider(count int) error {
|
||||||
|
quota := conf.GetConfigQuota().Provider
|
||||||
|
if quota == -1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if count >= quota {
|
||||||
|
return fmt.Errorf("provider quota is exceeded")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkQuotaForUser(count int) error {
|
||||||
|
quota := conf.GetConfigQuota().User
|
||||||
|
if quota == -1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if count >= quota {
|
||||||
|
return fmt.Errorf("user quota is exceeded")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
@ -24,6 +24,13 @@ import (
|
|||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
SignupVerification = "signup"
|
||||||
|
ResetVerification = "reset"
|
||||||
|
LoginVerification = "login"
|
||||||
|
ForgetVerification = "forget"
|
||||||
|
)
|
||||||
|
|
||||||
func (c *ApiController) getCurrentUser() *object.User {
|
func (c *ApiController) getCurrentUser() *object.User {
|
||||||
var user *object.User
|
var user *object.User
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
@ -42,105 +49,118 @@ func (c *ApiController) getCurrentUser() *object.User {
|
|||||||
func (c *ApiController) SendVerificationCode() {
|
func (c *ApiController) SendVerificationCode() {
|
||||||
destType := c.Ctx.Request.Form.Get("type")
|
destType := c.Ctx.Request.Form.Get("type")
|
||||||
dest := c.Ctx.Request.Form.Get("dest")
|
dest := c.Ctx.Request.Form.Get("dest")
|
||||||
|
countryCode := c.Ctx.Request.Form.Get("countryCode")
|
||||||
checkType := c.Ctx.Request.Form.Get("checkType")
|
checkType := c.Ctx.Request.Form.Get("checkType")
|
||||||
checkId := c.Ctx.Request.Form.Get("checkId")
|
checkId := c.Ctx.Request.Form.Get("checkId")
|
||||||
checkKey := c.Ctx.Request.Form.Get("checkKey")
|
checkKey := c.Ctx.Request.Form.Get("checkKey")
|
||||||
checkUser := c.Ctx.Request.Form.Get("checkUser")
|
|
||||||
applicationId := c.Ctx.Request.Form.Get("applicationId")
|
applicationId := c.Ctx.Request.Form.Get("applicationId")
|
||||||
|
method := c.Ctx.Request.Form.Get("method")
|
||||||
|
checkUser := c.Ctx.Request.Form.Get("checkUser")
|
||||||
remoteAddr := util.GetIPFromRequest(c.Ctx.Request)
|
remoteAddr := util.GetIPFromRequest(c.Ctx.Request)
|
||||||
|
|
||||||
if destType == "" {
|
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": type.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if dest == "" {
|
if dest == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": dest.")
|
c.ResponseError(c.T("general:Missing parameter") + ": dest.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if applicationId == "" {
|
if applicationId == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": applicationId.")
|
c.ResponseError(c.T("general:Missing parameter") + ": applicationId.")
|
||||||
return
|
|
||||||
}
|
|
||||||
if !strings.Contains(applicationId, "/") {
|
|
||||||
c.ResponseError(c.T("ParameterErr.Wrong") + ": applicationId.")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if checkType == "" {
|
if checkType == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": checkType.")
|
c.ResponseError(c.T("general:Missing parameter") + ": checkType.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if checkKey == "" {
|
||||||
|
c.ResponseError(c.T("general:Missing parameter") + ": checkKey.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !strings.Contains(applicationId, "/") {
|
||||||
|
c.ResponseError(c.T("verification:Wrong parameter") + ": applicationId.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
captchaProvider := captcha.GetCaptchaProvider(checkType)
|
if captchaProvider := captcha.GetCaptchaProvider(checkType); captchaProvider == nil {
|
||||||
|
c.ResponseError(c.T("general:don't support captchaProvider: ") + checkType)
|
||||||
if captchaProvider != nil {
|
return
|
||||||
if checkKey == "" {
|
} else if isHuman, err := captchaProvider.VerifyCaptcha(checkKey, checkId); err != nil {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": checkKey.")
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
}
|
} else if !isHuman {
|
||||||
isHuman, err := captchaProvider.VerifyCaptcha(checkKey, checkId)
|
c.ResponseError(c.T("verification:Turing test failed."))
|
||||||
if err != nil {
|
return
|
||||||
c.ResponseError(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if !isHuman {
|
|
||||||
c.ResponseError(c.T("AuthErr.NotHuman"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
user := c.getCurrentUser()
|
|
||||||
application := object.GetApplication(applicationId)
|
application := object.GetApplication(applicationId)
|
||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", application.Owner, application.Organization))
|
organization := object.GetOrganization(util.GetId(application.Owner, application.Organization))
|
||||||
|
if organization == nil {
|
||||||
if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil {
|
c.ResponseError(c.T("verification:Organization does not exist"))
|
||||||
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var user *object.User
|
||||||
|
// checkUser != "", means method is ForgetVerification
|
||||||
|
if checkUser != "" {
|
||||||
|
owner := application.Organization
|
||||||
|
user = object.GetUser(util.GetId(owner, checkUser))
|
||||||
|
}
|
||||||
|
|
||||||
sendResp := errors.New("invalid dest type")
|
sendResp := errors.New("invalid dest type")
|
||||||
|
|
||||||
if user == nil && checkUser != "" && checkUser != "true" {
|
|
||||||
name := application.Organization
|
|
||||||
user = object.GetUser(fmt.Sprintf("%s/%s", name, checkUser))
|
|
||||||
}
|
|
||||||
switch destType {
|
switch destType {
|
||||||
case "email":
|
case "email":
|
||||||
if user != nil && util.GetMaskedEmail(user.Email) == dest {
|
|
||||||
dest = user.Email
|
|
||||||
}
|
|
||||||
if !util.IsEmailValid(dest) {
|
if !util.IsEmailValid(dest) {
|
||||||
c.ResponseError(c.T("EmailErr.EmailInvalid"))
|
c.ResponseError(c.T("verification:Email is invalid"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if method == LoginVerification || method == ForgetVerification {
|
||||||
|
if user != nil && util.GetMaskedEmail(user.Email) == dest {
|
||||||
|
dest = user.Email
|
||||||
|
}
|
||||||
|
|
||||||
|
user = object.GetUserByEmail(organization.Name, dest)
|
||||||
|
if user == nil {
|
||||||
|
c.ResponseError(c.T("verification:the user does not exist, please sign up first"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if method == ResetVerification {
|
||||||
|
user = c.getCurrentUser()
|
||||||
|
}
|
||||||
|
|
||||||
provider := application.GetEmailProvider()
|
provider := application.GetEmailProvider()
|
||||||
sendResp = object.SendVerificationCodeToEmail(organization, user, provider, remoteAddr, dest)
|
sendResp = object.SendVerificationCodeToEmail(organization, user, provider, remoteAddr, dest)
|
||||||
case "phone":
|
case "phone":
|
||||||
if user != nil && util.GetMaskedPhone(user.Phone) == dest {
|
if method == LoginVerification || method == ForgetVerification {
|
||||||
dest = user.Phone
|
if user != nil && util.GetMaskedPhone(user.Phone) == dest {
|
||||||
}
|
dest = user.Phone
|
||||||
if !util.IsPhoneCnValid(dest) {
|
}
|
||||||
c.ResponseError(c.T("PhoneErr.NumberInvalid"))
|
|
||||||
return
|
if user = object.GetUserByPhone(organization.Name, dest); user == nil {
|
||||||
}
|
c.ResponseError(c.T("verification:the user does not exist, please sign up first"))
|
||||||
if organization == nil {
|
return
|
||||||
c.ResponseError(c.T("OrgErr.DoNotExist"))
|
}
|
||||||
return
|
|
||||||
|
countryCode = user.GetCountryCode(countryCode)
|
||||||
|
} else if method == ResetVerification {
|
||||||
|
if user = c.getCurrentUser(); user != nil {
|
||||||
|
countryCode = user.GetCountryCode(countryCode)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dest = fmt.Sprintf("+%s%s", organization.PhonePrefix, dest)
|
|
||||||
provider := application.GetSmsProvider()
|
provider := application.GetSmsProvider()
|
||||||
sendResp = object.SendVerificationCodeToPhone(organization, user, provider, remoteAddr, dest)
|
if phone, ok := util.GetE164Number(dest, countryCode); !ok {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("verification:Phone number is invalid in your region %s"), countryCode))
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
sendResp = object.SendVerificationCodeToPhone(organization, user, provider, remoteAddr, phone)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if sendResp != nil {
|
if sendResp != nil {
|
||||||
c.Data["json"] = Response{Status: "error", Msg: sendResp.Error()}
|
c.ResponseError(sendResp.Error())
|
||||||
} else {
|
} else {
|
||||||
c.Data["json"] = Response{Status: "ok"}
|
c.ResponseOk()
|
||||||
}
|
}
|
||||||
|
|
||||||
c.ServeJSON()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResetEmailOrPhone ...
|
// ResetEmailOrPhone ...
|
||||||
@ -156,17 +176,23 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
destType := c.Ctx.Request.Form.Get("type")
|
destType := c.Ctx.Request.Form.Get("type")
|
||||||
dest := c.Ctx.Request.Form.Get("dest")
|
dest := c.Ctx.Request.Form.Get("dest")
|
||||||
code := c.Ctx.Request.Form.Get("code")
|
code := c.Ctx.Request.Form.Get("code")
|
||||||
if len(dest) == 0 || len(code) == 0 || len(destType) == 0 {
|
|
||||||
c.ResponseError(c.T("ParameterErr.Missing"))
|
if util.IsStringsEmpty(destType, dest, code) {
|
||||||
|
c.ResponseError(c.T("general:Missing parameter"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
checkDest := dest
|
checkDest := dest
|
||||||
org := object.GetOrganizationByUser(user)
|
organization := object.GetOrganizationByUser(user)
|
||||||
if destType == "phone" {
|
if destType == "phone" {
|
||||||
phoneItem := object.GetAccountItemByName("Phone", org)
|
if object.HasUserByField(user.Owner, "phone", user.Phone) {
|
||||||
|
c.ResponseError(c.T("check:Phone already exists"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
phoneItem := object.GetAccountItemByName("Phone", organization)
|
||||||
if phoneItem == nil {
|
if phoneItem == nil {
|
||||||
c.ResponseError(c.T("PhoneErr.UnableGetModifyRule"))
|
c.ResponseError(c.T("verification:Unable to get the phone modify rule."))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -174,16 +200,19 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
c.ResponseError(errMsg)
|
c.ResponseError(errMsg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if checkDest, ok = util.GetE164Number(dest, user.GetCountryCode("")); !ok {
|
||||||
phonePrefix := "86"
|
c.ResponseError(fmt.Sprintf(c.T("verification:Phone number is invalid in your region %s"), user.CountryCode))
|
||||||
if org != nil && org.PhonePrefix != "" {
|
return
|
||||||
phonePrefix = org.PhonePrefix
|
|
||||||
}
|
}
|
||||||
checkDest = fmt.Sprintf("+%s%s", phonePrefix, dest)
|
|
||||||
} else if destType == "email" {
|
} else if destType == "email" {
|
||||||
emailItem := object.GetAccountItemByName("Email", org)
|
if object.HasUserByField(user.Owner, "email", user.Email) {
|
||||||
|
c.ResponseError(c.T("check:Email already exists"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
emailItem := object.GetAccountItemByName("Email", organization)
|
||||||
if emailItem == nil {
|
if emailItem == nil {
|
||||||
c.ResponseError(c.T("EmailErr.UnableGetModifyRule"))
|
c.ResponseError(c.T("verification:Unable to get the email modify rule."))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -192,8 +221,8 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ret := object.CheckVerificationCode(checkDest, code, c.GetAcceptLanguage()); len(ret) != 0 {
|
if msg := object.CheckVerificationCode(checkDest, code, c.GetAcceptLanguage()); len(msg) != 0 {
|
||||||
c.ResponseError(ret)
|
c.ResponseError(msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -205,13 +234,12 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
user.Phone = dest
|
user.Phone = dest
|
||||||
object.SetUserField(user, "phone", user.Phone)
|
object.SetUserField(user, "phone", user.Phone)
|
||||||
default:
|
default:
|
||||||
c.ResponseError(c.T("ParameterErr.UnknownType"))
|
c.ResponseError(c.T("verification:Unknown type"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
object.DisableVerificationCode(checkDest)
|
object.DisableVerificationCode(checkDest)
|
||||||
c.Data["json"] = Response{Status: "ok"}
|
c.ResponseOk()
|
||||||
c.ServeJSON()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// VerifyCaptcha ...
|
// VerifyCaptcha ...
|
||||||
@ -224,17 +252,17 @@ func (c *ApiController) VerifyCaptcha() {
|
|||||||
captchaToken := c.Ctx.Request.Form.Get("captchaToken")
|
captchaToken := c.Ctx.Request.Form.Get("captchaToken")
|
||||||
clientSecret := c.Ctx.Request.Form.Get("clientSecret")
|
clientSecret := c.Ctx.Request.Form.Get("clientSecret")
|
||||||
if captchaToken == "" {
|
if captchaToken == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": captchaToken.")
|
c.ResponseError(c.T("general:Missing parameter") + ": captchaToken.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if clientSecret == "" {
|
if clientSecret == "" {
|
||||||
c.ResponseError(c.T("ParameterErr.Missing") + ": clientSecret.")
|
c.ResponseError(c.T("general:Missing parameter") + ": clientSecret.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := captcha.GetCaptchaProvider(captchaType)
|
provider := captcha.GetCaptchaProvider(captchaType)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(c.T("ProviderErr.InvalidProvider"))
|
c.ResponseError(c.T("verification:Invalid captcha provider."))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ func (c *ApiController) WebAuthnSignupBegin() {
|
|||||||
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
||||||
user := c.getCurrentUser()
|
user := c.getCurrentUser()
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,13 +66,13 @@ func (c *ApiController) WebAuthnSignupFinish() {
|
|||||||
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
||||||
user := c.getCurrentUser()
|
user := c.getCurrentUser()
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
c.ResponseError(c.T("general:Please login first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
sessionObj := c.GetSession("registration")
|
sessionObj := c.GetSession("registration")
|
||||||
sessionData, ok := sessionObj.(webauthn.SessionData)
|
sessionData, ok := sessionObj.(webauthn.SessionData)
|
||||||
if !ok {
|
if !ok {
|
||||||
c.ResponseError(c.T("AuthErr.CallWebAuthnSigninBegin"))
|
c.ResponseError(c.T("webauthn:Please call WebAuthnSigninBegin first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
||||||
@ -101,9 +101,14 @@ func (c *ApiController) WebAuthnSigninBegin() {
|
|||||||
userName := c.Input().Get("name")
|
userName := c.Input().Get("name")
|
||||||
user := object.GetUserByFields(userOwner, userName)
|
user := object.GetUserByFields(userOwner, userName)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExistInOrg"), userOwner, userName))
|
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(userOwner, userName)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if len(user.WebauthnCredentials) == 0 {
|
||||||
|
c.ResponseError(c.T("webauthn:Found no credentials for this user"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
options, sessionData, err := webauthnObj.BeginLogin(user)
|
options, sessionData, err := webauthnObj.BeginLogin(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
@ -127,7 +132,7 @@ func (c *ApiController) WebAuthnSigninFinish() {
|
|||||||
sessionObj := c.GetSession("authentication")
|
sessionObj := c.GetSession("authentication")
|
||||||
sessionData, ok := sessionObj.(webauthn.SessionData)
|
sessionData, ok := sessionObj.(webauthn.SessionData)
|
||||||
if !ok {
|
if !ok {
|
||||||
c.ResponseError(c.T("AuthErr.CallWebAuthnSigninBegin"))
|
c.ResponseError(c.T("webauthn:Please call WebAuthnSigninBegin first"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
||||||
|
@ -52,7 +52,7 @@ func (c *ApiController) GetWebhooks() {
|
|||||||
// @Title GetWebhook
|
// @Title GetWebhook
|
||||||
// @Tag Webhook API
|
// @Tag Webhook API
|
||||||
// @Description get webhook
|
// @Description get webhook
|
||||||
// @Param id query string true "The id of the webhook"
|
// @Param id query string true "The id ( owner/name ) of the webhook"
|
||||||
// @Success 200 {object} object.Webhook The Response object
|
// @Success 200 {object} object.Webhook The Response object
|
||||||
// @router /get-webhook [get]
|
// @router /get-webhook [get]
|
||||||
func (c *ApiController) GetWebhook() {
|
func (c *ApiController) GetWebhook() {
|
||||||
@ -66,7 +66,7 @@ func (c *ApiController) GetWebhook() {
|
|||||||
// @Title UpdateWebhook
|
// @Title UpdateWebhook
|
||||||
// @Tag Webhook API
|
// @Tag Webhook API
|
||||||
// @Description update webhook
|
// @Description update webhook
|
||||||
// @Param id query string true "The id of the webhook"
|
// @Param id query string true "The id ( owner/name ) of the webhook"
|
||||||
// @Param body body object.Webhook true "The details of the webhook"
|
// @Param body body object.Webhook true "The details of the webhook"
|
||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /update-webhook [post]
|
// @router /update-webhook [post]
|
||||||
|
10
crowdin.yml
Normal file
10
crowdin.yml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
project_id: '491513'
|
||||||
|
api_token_env: 'CROWDIN_PERSONAL_TOKEN'
|
||||||
|
preserve_hierarchy: true
|
||||||
|
files: [
|
||||||
|
# JSON translation files
|
||||||
|
{
|
||||||
|
source: '/i18n/locales/en/data.json',
|
||||||
|
translation: '/i18n/locales/%two_letters_code%/data.json',
|
||||||
|
},
|
||||||
|
]
|
@ -21,9 +21,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDeployStaticFiles(t *testing.T) {
|
func TestDeployStaticFiles(t *testing.T) {
|
||||||
provider := object.GetProvider("admin/provider_storage_aliyun_oss")
|
provider := object.GetProvider(util.GetId("admin", "provider_storage_aliyun_oss"))
|
||||||
deployStaticFiles(provider)
|
deployStaticFiles(provider)
|
||||||
}
|
}
|
||||||
|
26
go.mod
26
go.mod
@ -4,53 +4,53 @@ go 1.16
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b
|
||||||
github.com/Unknwon/goconfig v1.0.0
|
|
||||||
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
|
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
|
||||||
github.com/aws/aws-sdk-go v1.44.4
|
github.com/aws/aws-sdk-go v1.44.4
|
||||||
github.com/beego/beego v1.12.11
|
github.com/beego/beego v1.12.11
|
||||||
github.com/beevik/etree v1.1.0
|
github.com/beevik/etree v1.1.0
|
||||||
github.com/casbin/casbin/v2 v2.30.1
|
github.com/casbin/casbin/v2 v2.30.1
|
||||||
github.com/casbin/xorm-adapter/v3 v3.0.1
|
|
||||||
github.com/casdoor/go-sms-sender v0.5.1
|
github.com/casdoor/go-sms-sender v0.5.1
|
||||||
github.com/casdoor/goth v1.69.0-FIX2
|
github.com/casdoor/gomail/v2 v2.0.1
|
||||||
github.com/casdoor/oss v1.2.0
|
github.com/casdoor/oss v1.2.0
|
||||||
|
github.com/casdoor/xorm-adapter/v3 v3.0.4
|
||||||
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
|
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
|
||||||
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc
|
github.com/denisenkom/go-mssqldb v0.9.0
|
||||||
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b
|
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b
|
||||||
github.com/forestmgy/ldapserver v1.1.0
|
github.com/forestmgy/ldapserver v1.1.0
|
||||||
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
|
|
||||||
github.com/go-ldap/ldap/v3 v3.3.0
|
github.com/go-ldap/ldap/v3 v3.3.0
|
||||||
github.com/go-pay/gopay v1.5.72
|
github.com/go-pay/gopay v1.5.72
|
||||||
github.com/go-sql-driver/mysql v1.5.0
|
github.com/go-sql-driver/mysql v1.5.0
|
||||||
github.com/golang-jwt/jwt/v4 v4.2.0
|
github.com/golang-jwt/jwt/v4 v4.2.0
|
||||||
|
github.com/golang/snappy v0.0.4 // indirect
|
||||||
github.com/google/go-cmp v0.5.8 // indirect
|
github.com/google/go-cmp v0.5.8 // indirect
|
||||||
github.com/google/uuid v1.2.0
|
github.com/google/uuid v1.2.0
|
||||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
|
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
|
||||||
github.com/lestrrat-go/jwx v0.9.0
|
github.com/lestrrat-go/jwx v1.2.21
|
||||||
github.com/lib/pq v1.8.0
|
github.com/lib/pq v1.8.0
|
||||||
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3
|
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3
|
||||||
|
github.com/markbates/goth v1.75.2
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
|
||||||
|
github.com/nyaruka/phonenumbers v1.1.5
|
||||||
github.com/qiangmzsx/string-adapter/v2 v2.1.0
|
github.com/qiangmzsx/string-adapter/v2 v2.1.0
|
||||||
github.com/robfig/cron/v3 v3.0.1
|
github.com/robfig/cron/v3 v3.0.1
|
||||||
github.com/russellhaering/gosaml2 v0.6.0
|
github.com/russellhaering/gosaml2 v0.6.0
|
||||||
github.com/russellhaering/goxmldsig v1.1.1
|
github.com/russellhaering/goxmldsig v1.1.1
|
||||||
github.com/satori/go.uuid v1.2.0
|
github.com/satori/go.uuid v1.2.0
|
||||||
github.com/shirou/gopsutil v3.21.11+incompatible
|
github.com/shirou/gopsutil v3.21.11+incompatible
|
||||||
github.com/smartystreets/goconvey v1.6.4 // indirect
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||||
github.com/stretchr/testify v1.8.0
|
github.com/stretchr/testify v1.8.0
|
||||||
github.com/tealeg/xlsx v1.0.5
|
github.com/tealeg/xlsx v1.0.5
|
||||||
github.com/thanhpk/randstr v1.0.4
|
github.com/thanhpk/randstr v1.0.4
|
||||||
github.com/tklauser/go-sysconf v0.3.10 // indirect
|
github.com/tklauser/go-sysconf v0.3.10 // indirect
|
||||||
|
github.com/xorm-io/core v0.7.4
|
||||||
|
github.com/xorm-io/xorm v1.1.6
|
||||||
github.com/yusufpapurcu/wmi v1.2.2 // indirect
|
github.com/yusufpapurcu/wmi v1.2.2 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20220208233918-bba287dce954
|
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
|
||||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
|
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
|
||||||
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
|
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
||||||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
|
|
||||||
gopkg.in/ini.v1 v1.67.0
|
|
||||||
gopkg.in/square/go-jose.v2 v2.6.0
|
gopkg.in/square/go-jose.v2 v2.6.0
|
||||||
gopkg.in/yaml.v2 v2.3.0 // indirect
|
gopkg.in/yaml.v2 v2.3.0 // indirect
|
||||||
xorm.io/core v0.7.2
|
modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84
|
||||||
xorm.io/xorm v1.0.4
|
|
||||||
)
|
)
|
||||||
|
123
go.sum
123
go.sum
@ -58,11 +58,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
|
|||||||
github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
||||||
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
|
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
|
||||||
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
||||||
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b h1:EgJ6N2S0h1WfFIjU5/VVHWbMSVYXAluop97Qxpr/lfQ=
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b h1:EgJ6N2S0h1WfFIjU5/VVHWbMSVYXAluop97Qxpr/lfQ=
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b/go.mod h1:3SAoF0F5EbcOuBD5WT9nYkbIJieBS84cUQXADbXeBsU=
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b/go.mod h1:3SAoF0F5EbcOuBD5WT9nYkbIJieBS84cUQXADbXeBsU=
|
||||||
github.com/Unknwon/goconfig v1.0.0 h1:9IAu/BYbSLQi8puFjUQApZTxIHqSwrj5d8vpP8vTq4A=
|
|
||||||
github.com/Unknwon/goconfig v1.0.0/go.mod h1:wngxua9XCNjvHjDiTiV26DaKDT+0c63QR6H5hjVUUxw=
|
|
||||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||||
@ -75,7 +72,6 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1075 h1:Z0SzZttfYI/raZ5O9WF3cezZJTS
|
|||||||
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1075/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
|
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1075/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
|
||||||
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM=
|
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM=
|
||||||
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
|
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
|
||||||
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
|
||||||
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
|
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
|
||||||
github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE=
|
github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE=
|
||||||
github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||||
@ -98,14 +94,14 @@ github.com/casbin/casbin/v2 v2.1.0/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n
|
|||||||
github.com/casbin/casbin/v2 v2.28.3/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
github.com/casbin/casbin/v2 v2.28.3/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
||||||
github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeKF0=
|
github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeKF0=
|
||||||
github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
||||||
github.com/casbin/xorm-adapter/v3 v3.0.1 h1:0l0zkYxo6cNuIdrBZgFxlje1TRvmheYa/zIp+sGPK58=
|
|
||||||
github.com/casbin/xorm-adapter/v3 v3.0.1/go.mod h1:1BL7rHEDXrxO+vQdSo/ZaWKRivXl7YTos67GdMYcd20=
|
|
||||||
github.com/casdoor/go-sms-sender v0.5.1 h1:1/Wp1OLkVAVY4lEGQhekSNetSAWhnPcxYPV7xpCZgC0=
|
github.com/casdoor/go-sms-sender v0.5.1 h1:1/Wp1OLkVAVY4lEGQhekSNetSAWhnPcxYPV7xpCZgC0=
|
||||||
github.com/casdoor/go-sms-sender v0.5.1/go.mod h1:kBykbqwgRDXbXdMAIxmZKinVM1WjdqEbej5LAbUbcfI=
|
github.com/casdoor/go-sms-sender v0.5.1/go.mod h1:kBykbqwgRDXbXdMAIxmZKinVM1WjdqEbej5LAbUbcfI=
|
||||||
github.com/casdoor/goth v1.69.0-FIX2 h1:RgfIMkL9kekylgxHHK2ZY8ASAwOGns2HVlaBwLu7Bcs=
|
github.com/casdoor/gomail/v2 v2.0.1 h1:J+FG6x80s9e5lBHUn8Sv0Y56mud34KiWih5YdmudR/w=
|
||||||
github.com/casdoor/goth v1.69.0-FIX2/go.mod h1:Om55nRo8CkeDkPSNBbzXW4G5uI28ZUkSk5S69dPek3s=
|
github.com/casdoor/gomail/v2 v2.0.1/go.mod h1:VnGPslEAtpix5FjHisR/WKB1qvZDBaujbikxDe9d+2Q=
|
||||||
github.com/casdoor/oss v1.2.0 h1:ozLAE+nnNdFQBWbzH8U9spzaO8h8NrB57lBcdyMUUQ8=
|
github.com/casdoor/oss v1.2.0 h1:ozLAE+nnNdFQBWbzH8U9spzaO8h8NrB57lBcdyMUUQ8=
|
||||||
github.com/casdoor/oss v1.2.0/go.mod h1:qii35VBuxnR/uEuYSKpS0aJ8htQFOcCVsZ4FHgHLuss=
|
github.com/casdoor/oss v1.2.0/go.mod h1:qii35VBuxnR/uEuYSKpS0aJ8htQFOcCVsZ4FHgHLuss=
|
||||||
|
github.com/casdoor/xorm-adapter/v3 v3.0.4 h1:vB04Ao8n2jA7aFBI9F+gGXo9+Aa1IQP6mTdo50913DM=
|
||||||
|
github.com/casdoor/xorm-adapter/v3 v3.0.4/go.mod h1:4WTcUw+bTgBylGHeGHzTtBvuTXRS23dtwzFLl9tsgFM=
|
||||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||||
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
@ -127,10 +123,15 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M=
|
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M=
|
||||||
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
|
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
|
||||||
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzqk8QCaRC4os14xoKDdbHqqlJtJA0oc1ZAjg=
|
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
|
||||||
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d h1:1iy2qD6JEhHKKhUOA9IWs7mjco7lnw2qx8FsRI2wirE=
|
||||||
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
|
||||||
|
github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
|
||||||
|
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
|
||||||
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b h1:L63RATZFZuFMXy6ixnKmv3eNAXwYQF6HW1vd4IYsQqQ=
|
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b h1:L63RATZFZuFMXy6ixnKmv3eNAXwYQF6HW1vd4IYsQqQ=
|
||||||
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b/go.mod h1:EYSpSkwoEcryMmQGfhol2IiB3IMN9IIIaNd/wcAQMGQ=
|
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b/go.mod h1:EYSpSkwoEcryMmQGfhol2IiB3IMN9IIIaNd/wcAQMGQ=
|
||||||
|
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
|
||||||
|
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||||
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
|
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
|
||||||
github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
|
github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
|
||||||
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
|
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
|
||||||
@ -152,8 +153,6 @@ github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkPro
|
|||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df h1:Bao6dhmbTA1KFVxmJ6nBoMuOJit2yjEgLJpIMYpop0E=
|
|
||||||
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y=
|
|
||||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||||
github.com/go-ldap/ldap/v3 v3.3.0 h1:lwx+SJpgOHd8tG6SumBQZXCmNX51zM8B1cfxJ5gv4tQ=
|
github.com/go-ldap/ldap/v3 v3.3.0 h1:lwx+SJpgOHd8tG6SumBQZXCmNX51zM8B1cfxJ5gv4tQ=
|
||||||
@ -175,6 +174,8 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
|
|||||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||||
|
github.com/goccy/go-json v0.9.6 h1:5/4CtRQdtsX0sal8fdVhTaiMN01Ri8BExZZ8iRmHQ6E=
|
||||||
|
github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||||
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
|
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
|
||||||
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
|
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
|
||||||
@ -213,8 +214,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
|
|||||||
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
|
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
|
||||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
|
|
||||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
|
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
||||||
|
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
|
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
|
||||||
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
|
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
|
||||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||||
@ -229,6 +231,7 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
|
|||||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
|
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
|
||||||
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
@ -248,7 +251,6 @@ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
|
|||||||
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
|
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||||
github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
|
github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
|
||||||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
||||||
@ -265,6 +267,7 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
|
|||||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
|
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da h1:FjHUJJ7oBW4G/9j1KzlHaXL09LyMVM9rupS39lncbXk=
|
||||||
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
|
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
|
||||||
github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
|
github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
|
||||||
github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
|
github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
|
||||||
@ -278,15 +281,17 @@ github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9q
|
|||||||
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
|
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
|
||||||
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||||
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
|
|
||||||
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||||
|
github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
|
||||||
|
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
||||||
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
|
|
||||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
||||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
|
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
|
||||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
|
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
|
||||||
|
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
||||||
|
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
|
||||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||||
@ -301,8 +306,18 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
|
github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
|
||||||
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
|
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
|
||||||
github.com/lestrrat-go/jwx v0.9.0 h1:Fnd0EWzTm0kFrBPzE/PEPp9nzllES5buMkksPMjEKpM=
|
github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
|
||||||
github.com/lestrrat-go/jwx v0.9.0/go.mod h1:iEoxlYfZjvoGpuWwxUz+eR5e6KTJGsaRcy/YNA/UnBk=
|
github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
|
||||||
|
github.com/lestrrat-go/blackmagic v1.0.0 h1:XzdxDbuQTz0RZZEmdU7cnQxUtFUzgCSPq8RCz4BxIi4=
|
||||||
|
github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
|
||||||
|
github.com/lestrrat-go/httpcc v1.0.0 h1:FszVC6cKfDvBKcJv646+lkh4GydQg2Z29scgUfkOpYc=
|
||||||
|
github.com/lestrrat-go/httpcc v1.0.0/go.mod h1:tGS/u00Vh5N6FHNkExqGGNId8e0Big+++0Gf8MBnAvE=
|
||||||
|
github.com/lestrrat-go/iter v1.0.1 h1:q8faalr2dY6o8bV45uwrxq12bRa1ezKrB6oM9FUgN4A=
|
||||||
|
github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
|
||||||
|
github.com/lestrrat-go/jwx v1.2.21 h1:n+yG95UMm5ZFsDdvsZmui+bqat4Cj/di4ys6XbgSlE8=
|
||||||
|
github.com/lestrrat-go/jwx v1.2.21/go.mod h1:9cfxnOH7G1gN75CaJP2hKGcxFEx5sPh1abRIA/ZJVh4=
|
||||||
|
github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4=
|
||||||
|
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
|
||||||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||||
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
|
github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
|
||||||
@ -311,12 +326,16 @@ github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 h1:wIONC+HMNRqmWBjuM
|
|||||||
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3/go.mod h1:37YR9jabpiIxsb8X9VCIx8qFOjTDIIrIHHODa8C4gz0=
|
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3/go.mod h1:37YR9jabpiIxsb8X9VCIx8qFOjTDIIrIHHODa8C4gz0=
|
||||||
github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0=
|
github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0=
|
||||||
github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
|
github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
|
||||||
|
github.com/markbates/goth v1.75.2 h1:C7KloBMMk50JyXaHhzfqWYLW6+bDcSVIvUGHXneLWro=
|
||||||
|
github.com/markbates/goth v1.75.2/go.mod h1:X6xdNgpapSENS0O35iTBBcMHoJDQDfI9bJl+APCkYMc=
|
||||||
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911 h1:erppMjjp69Rertg1zlgRbLJH1u+eCmRPxKjMZ5I8/Ro=
|
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911 h1:erppMjjp69Rertg1zlgRbLJH1u+eCmRPxKjMZ5I8/Ro=
|
||||||
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
|
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
|
||||||
github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
|
github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
|
||||||
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
|
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
|
||||||
|
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||||
|
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||||
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
||||||
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
|
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||||
github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
|
github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
|
||||||
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
|
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
|
||||||
@ -335,6 +354,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
|
|||||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
|
||||||
|
github.com/nyaruka/phonenumbers v1.1.5 h1:vYy2DI+z5hdaemqVzXYJ4CVyK92IG484CirEY+40GTo=
|
||||||
|
github.com/nyaruka/phonenumbers v1.1.5/go.mod h1:yShPJHDSH3aTKzCbXyVxNpbl2kA+F+Ne5Pun/MvFRos=
|
||||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
|
github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
|
||||||
@ -372,6 +393,8 @@ github.com/qiangmzsx/string-adapter/v2 v2.1.0/go.mod h1:PElPB7b7HnGKTsuADAffFpOQ
|
|||||||
github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
|
github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
|
||||||
github.com/qiniu/go-sdk/v7 v7.12.1/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
|
github.com/qiniu/go-sdk/v7 v7.12.1/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
|
||||||
github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
|
github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
||||||
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
|
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||||
@ -394,11 +417,10 @@ github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKz
|
|||||||
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
|
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
|
||||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
||||||
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||||
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
|
|
||||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
|
||||||
github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
|
github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
@ -433,6 +455,12 @@ github.com/volcengine/volc-sdk-golang v1.0.19/go.mod h1:+GGi447k4p1I5PNdbpG2GLaF
|
|||||||
github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
|
github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
|
||||||
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
|
github.com/xorm-io/builder v0.3.13 h1:J4oZxt4Gjgm/Si9iKazfzYwHB/ijEOD9EHInyjOSX+M=
|
||||||
|
github.com/xorm-io/builder v0.3.13/go.mod h1:24o5riRwzre2WvjmN+LM4YpUtJg7W8MdvJ8H57rvrJA=
|
||||||
|
github.com/xorm-io/core v0.7.4 h1:qIznlqqmYNEb03ewzRXCrNkbbxpkgc/44nVF8yoFV7Y=
|
||||||
|
github.com/xorm-io/core v0.7.4/go.mod h1:GueyhafDnkB0KK0fXX/dEhr/P1EAGW0GLmoNDUEE1Mo=
|
||||||
|
github.com/xorm-io/xorm v1.1.6 h1:s4fDpUXJx8Zr/PBovXNaadn+v1P3h/U3iV4OxAkWS8s=
|
||||||
|
github.com/xorm-io/xorm v1.1.6/go.mod h1:7nsSUdmgLIcqHSSaKOzbVQiZtzIzbpGf1GGSYp6DD70=
|
||||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
@ -462,8 +490,9 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP
|
|||||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20220208233918-bba287dce954 h1:BkypuErRT9A9I/iljuaG3/zdMjd/J6m8tKKJQtGfSdA=
|
|
||||||
golang.org/x/crypto v0.0.0-20220208233918-bba287dce954/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220208233918-bba287dce954/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
|
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
|
||||||
|
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -494,8 +523,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
|
|||||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
|
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
|
||||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
@ -527,7 +556,7 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
|
|||||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200927032502-5d4f70055728/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200927032502-5d4f70055728/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200930145003-4acb6c075d10/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
@ -550,6 +579,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -574,6 +604,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@ -588,7 +619,10 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@ -658,10 +692,13 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
|
|||||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||||
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
|
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
|
||||||
golang.org/x/tools v0.0.0-20200929161345-d7fc70abf50f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
|
golang.org/x/tools v0.0.0-20200929161345-d7fc70abf50f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
|
||||||
|
golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
|
golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
|
||||||
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
||||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
||||||
@ -756,8 +793,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
|
|||||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||||
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
|
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
|
||||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
|
|
||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
|
|
||||||
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||||
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
||||||
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||||
@ -784,13 +819,33 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
|||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||||
|
modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009 h1:u0oCo5b9wyLr++HF3AN9JicGhkUxJhMz51+8TIZH9N0=
|
||||||
|
modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878=
|
||||||
|
modernc.org/ccgo/v3 v3.9.0 h1:JbcEIqjw4Agf+0g3Tc85YvfYqkkFOv6xBwS4zkfqSoA=
|
||||||
|
modernc.org/ccgo/v3 v3.9.0/go.mod h1:nQbgkn8mwzPdp4mm6BT6+p85ugQ7FrGgIcYaE7nSrpY=
|
||||||
|
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
|
||||||
|
modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
|
||||||
|
modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
|
||||||
|
modernc.org/libc v1.8.0 h1:Pp4uv9g0csgBMpGPABKtkieF6O5MGhfGo6ZiOdlYfR8=
|
||||||
|
modernc.org/libc v1.8.0/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
|
||||||
|
modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
|
||||||
|
modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
|
||||||
|
modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
|
||||||
|
modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
|
||||||
|
modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
|
||||||
|
modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
|
||||||
|
modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
|
||||||
|
modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84 h1:rgEUzE849tFlHSoeCrKyS9cZAljC+DY7MdMHKq6R6sY=
|
||||||
|
modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84/go.mod h1:PGzq6qlhyYjL6uVbSgS6WoF7ZopTW/sI7+7p+mb4ZVU=
|
||||||
|
modernc.org/strutil v1.1.0 h1:+1/yCzZxY2pZwwrsbH+4T7BQMoLQ9QiBshRC9eicYsc=
|
||||||
|
modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
|
||||||
|
modernc.org/tcl v1.5.0 h1:euZSUNfE0Fd4W8VqXI1Ly1v7fqDJoBuAV88Ea+SnaSs=
|
||||||
|
modernc.org/tcl v1.5.0/go.mod h1:gb57hj4pO8fRrK54zveIfFXBaMHK3SKJNWcmRw1cRzc=
|
||||||
|
modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
|
||||||
|
modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
||||||
|
modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
|
||||||
|
modernc.org/z v1.0.1 h1:WyIDpEpAIx4Hel6q/Pcgj/VhaQV5XPJ2I6ryIYbjnpc=
|
||||||
|
modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||||
xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI=
|
|
||||||
xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
|
|
||||||
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
|
|
||||||
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
|
|
||||||
xorm.io/xorm v1.0.3/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=
|
|
||||||
xorm.io/xorm v1.0.4 h1:UBXA4I3NhiyjXfPqxXUkS2t5hMta9SSPATeMMaZg9oA=
|
|
||||||
xorm.io/xorm v1.0.4/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=
|
|
||||||
|
@ -26,16 +26,22 @@ import (
|
|||||||
|
|
||||||
type I18nData map[string]map[string]string
|
type I18nData map[string]map[string]string
|
||||||
|
|
||||||
var reI18n *regexp.Regexp
|
var (
|
||||||
|
reI18nFrontend *regexp.Regexp
|
||||||
|
reI18nBackendObject *regexp.Regexp
|
||||||
|
reI18nBackendController *regexp.Regexp
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
reI18n, _ = regexp.Compile("i18next.t\\(\"(.*?)\"\\)")
|
reI18nFrontend, _ = regexp.Compile("i18next.t\\(\"(.*?)\"\\)")
|
||||||
|
reI18nBackendObject, _ = regexp.Compile("i18n.Translate\\((.*?)\"\\)")
|
||||||
|
reI18nBackendController, _ = regexp.Compile("c.T\\((.*?)\"\\)")
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAllI18nStrings(fileContent string) []string {
|
func getAllI18nStringsFrontend(fileContent string) []string {
|
||||||
res := []string{}
|
res := []string{}
|
||||||
|
|
||||||
matches := reI18n.FindAllStringSubmatch(fileContent, -1)
|
matches := reI18nFrontend.FindAllStringSubmatch(fileContent, -1)
|
||||||
if matches == nil {
|
if matches == nil {
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
@ -46,17 +52,39 @@ func getAllI18nStrings(fileContent string) []string {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAllJsFilePaths() []string {
|
func getAllI18nStringsBackend(fileContent string, isObjectPackage bool) []string {
|
||||||
path := "../web/src"
|
|
||||||
|
|
||||||
res := []string{}
|
res := []string{}
|
||||||
err := filepath.Walk(path,
|
if isObjectPackage {
|
||||||
|
matches := reI18nBackendObject.FindAllStringSubmatch(fileContent, -1)
|
||||||
|
if matches == nil {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
for _, match := range matches {
|
||||||
|
match := strings.SplitN(match[1], ",", 2)
|
||||||
|
res = append(res, match[1][2:])
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
matches := reI18nBackendController.FindAllStringSubmatch(fileContent, -1)
|
||||||
|
if matches == nil {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
for _, match := range matches {
|
||||||
|
res = append(res, match[1][1:])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func getAllFilePathsInFolder(folder string, fileSuffix string) []string {
|
||||||
|
res := []string{}
|
||||||
|
err := filepath.Walk(folder,
|
||||||
func(path string, info os.FileInfo, err error) error {
|
func(path string, info os.FileInfo, err error) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !strings.HasSuffix(info.Name(), ".js") {
|
if !strings.HasSuffix(info.Name(), fileSuffix) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,19 +99,32 @@ func getAllJsFilePaths() []string {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseToData() *I18nData {
|
func parseEnData(category string) *I18nData {
|
||||||
|
var paths []string
|
||||||
|
if category == "backend" {
|
||||||
|
paths = getAllFilePathsInFolder("../", ".go")
|
||||||
|
} else {
|
||||||
|
paths = getAllFilePathsInFolder("../web/src", ".js")
|
||||||
|
}
|
||||||
|
|
||||||
allWords := []string{}
|
allWords := []string{}
|
||||||
paths := getAllJsFilePaths()
|
|
||||||
for _, path := range paths {
|
for _, path := range paths {
|
||||||
fileContent := util.ReadStringFromPath(path)
|
fileContent := util.ReadStringFromPath(path)
|
||||||
words := getAllI18nStrings(fileContent)
|
|
||||||
|
var words []string
|
||||||
|
if category == "backend" {
|
||||||
|
isObjectPackage := strings.Contains(path, "object")
|
||||||
|
words = getAllI18nStringsBackend(fileContent, isObjectPackage)
|
||||||
|
} else {
|
||||||
|
words = getAllI18nStringsFrontend(fileContent)
|
||||||
|
}
|
||||||
allWords = append(allWords, words...)
|
allWords = append(allWords, words...)
|
||||||
}
|
}
|
||||||
fmt.Printf("%v\n", allWords)
|
fmt.Printf("%v\n", allWords)
|
||||||
|
|
||||||
data := I18nData{}
|
data := I18nData{}
|
||||||
for _, word := range allWords {
|
for _, word := range allWords {
|
||||||
tokens := strings.Split(word, ":")
|
tokens := strings.SplitN(word, ":", 2)
|
||||||
namespace := tokens[0]
|
namespace := tokens[0]
|
||||||
key := tokens[1]
|
key := tokens[1]
|
||||||
|
|
||||||
|
@ -1,122 +0,0 @@
|
|||||||
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package i18n
|
|
||||||
|
|
||||||
import (
|
|
||||||
"log"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"regexp"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/Unknwon/goconfig"
|
|
||||||
"github.com/casdoor/casdoor/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
reI18nBackendObject *regexp.Regexp
|
|
||||||
re18nBackendController *regexp.Regexp
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
reI18nBackendObject, _ = regexp.Compile("i18n.Translate\\((.*?)\"\\)")
|
|
||||||
re18nBackendController, _ = regexp.Compile("c.T\\((.*?)\"\\)")
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetAllI18nStrings(fileContent string, path string) []string {
|
|
||||||
res := []string{}
|
|
||||||
if strings.Contains(path, "object") {
|
|
||||||
matches := reI18nBackendObject.FindAllStringSubmatch(fileContent, -1)
|
|
||||||
if matches == nil {
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
for _, match := range matches {
|
|
||||||
match := strings.Split(match[1], ",")
|
|
||||||
res = append(res, match[1][2:])
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
matches := re18nBackendController.FindAllStringSubmatch(fileContent, -1)
|
|
||||||
if matches == nil {
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
for _, match := range matches {
|
|
||||||
res = append(res, match[1][1:])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
func getAllGoFilePaths() []string {
|
|
||||||
path := "../"
|
|
||||||
|
|
||||||
res := []string{}
|
|
||||||
err := filepath.Walk(path,
|
|
||||||
func(path string, info os.FileInfo, err error) error {
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !strings.HasSuffix(info.Name(), ".go") {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
res = append(res, path)
|
|
||||||
// fmt.Println(path, info.Name())
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
func getErrName(paths []string) map[string]bool {
|
|
||||||
ErrName := make(map[string]bool)
|
|
||||||
for i := 0; i < len(paths); i++ {
|
|
||||||
content := util.ReadStringFromPath(paths[i])
|
|
||||||
words := GetAllI18nStrings(content, paths[i])
|
|
||||||
for i := 0; i < len(words); i++ {
|
|
||||||
ErrName[words[i]] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ErrName
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeToAllLanguageFiles(errName map[string]bool) {
|
|
||||||
languages := "en,zh,es,fr,de,ja,ko,ru"
|
|
||||||
languageArr := strings.Split(languages, ",")
|
|
||||||
var c [10]*goconfig.ConfigFile
|
|
||||||
for i := 0; i < len(languageArr); i++ {
|
|
||||||
var err error
|
|
||||||
c[i], err = goconfig.LoadConfigFile("../i18n/languages/" + "locale_" + languageArr[i] + ".ini")
|
|
||||||
if err != nil {
|
|
||||||
log.Println(err.Error())
|
|
||||||
}
|
|
||||||
for j := range errName {
|
|
||||||
parts := strings.Split(j, ".")
|
|
||||||
_, err := c[i].GetValue(parts[0], parts[1])
|
|
||||||
if err != nil {
|
|
||||||
c[i].SetValue(parts[0], parts[1], parts[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
c[i].SetPrettyFormat(true)
|
|
||||||
err = goconfig.SaveConfigFile(c[i], "../i18n/languages/"+"locale_"+languageArr[i]+".ini")
|
|
||||||
if err != nil {
|
|
||||||
log.Println(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -15,40 +15,39 @@
|
|||||||
package i18n
|
package i18n
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func applyToOtherLanguage(dataEn *I18nData, lang string) {
|
func applyToOtherLanguage(category string, language string, i18nData *I18nData) {
|
||||||
dataOther := readI18nFile(lang)
|
newData := readI18nFile(category, language)
|
||||||
println(dataOther)
|
println(newData)
|
||||||
|
|
||||||
applyData(dataEn, dataOther)
|
applyData(i18nData, newData)
|
||||||
writeI18nFile(lang, dataEn)
|
writeI18nFile(category, language, i18nData)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerateI18nStringsForFrontend(t *testing.T) {
|
func TestGenerateI18nFrontend(t *testing.T) {
|
||||||
dataEn := parseToData()
|
enData := parseEnData("frontend")
|
||||||
writeI18nFile("en", dataEn)
|
writeI18nFile("frontend", "en", enData)
|
||||||
|
|
||||||
applyToOtherLanguage(dataEn, "de")
|
applyToOtherLanguage("frontend", "de", enData)
|
||||||
applyToOtherLanguage(dataEn, "fr")
|
applyToOtherLanguage("frontend", "es", enData)
|
||||||
applyToOtherLanguage(dataEn, "ja")
|
applyToOtherLanguage("frontend", "fr", enData)
|
||||||
applyToOtherLanguage(dataEn, "ko")
|
applyToOtherLanguage("frontend", "ja", enData)
|
||||||
applyToOtherLanguage(dataEn, "ru")
|
applyToOtherLanguage("frontend", "ko", enData)
|
||||||
applyToOtherLanguage(dataEn, "zh")
|
applyToOtherLanguage("frontend", "ru", enData)
|
||||||
|
applyToOtherLanguage("frontend", "zh", enData)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerateI18nStringsForBackend(t *testing.T) {
|
func TestGenerateI18nBackend(t *testing.T) {
|
||||||
paths := getAllGoFilePaths()
|
enData := parseEnData("backend")
|
||||||
|
writeI18nFile("backend", "en", enData)
|
||||||
|
|
||||||
errName := getErrName(paths)
|
applyToOtherLanguage("backend", "de", enData)
|
||||||
|
applyToOtherLanguage("backend", "es", enData)
|
||||||
writeToAllLanguageFiles(errName)
|
applyToOtherLanguage("backend", "fr", enData)
|
||||||
|
applyToOtherLanguage("backend", "ja", enData)
|
||||||
fmt.Println("Total Err Words:", len(errName))
|
applyToOtherLanguage("backend", "ko", enData)
|
||||||
|
applyToOtherLanguage("backend", "ru", enData)
|
||||||
for i := range errName {
|
applyToOtherLanguage("backend", "zh", enData)
|
||||||
fmt.Println(i)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
WrongPasswordManyTimes = You have entered the wrong password too many times, please wait for %d minutes %d seconds and try again
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = Application %s not found
|
|
||||||
AppNotFoundForUserID = No application is found for userId: %s
|
|
||||||
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
|
||||||
HasNoProviders = This application has no providers
|
|
||||||
HasNoProvidersOfType = This application has no providers of type
|
|
||||||
InvalidID = Invalid application id
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = State expected: %s, but got: %s
|
|
||||||
ChallengeMethodErr = Challenge method should be S256
|
|
||||||
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
|
||||||
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
|
||||||
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
|
||||||
NotHuman = Turing test failed.
|
|
||||||
Unauthorized = Unauthorized operation
|
|
||||||
WrongPasswordManyTimes = WrongPasswordManyTimes
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = Service %s and %s do not match
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = Email already exists
|
|
||||||
EmptyErr = Email cannot be empty
|
|
||||||
EmailInvalid = Email is invalid
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = Empty parameters for emailForm: %v
|
|
||||||
InvalidReceivers = Invalid Email receivers: %s
|
|
||||||
UnableGetModifyRule = Unable to get the email modify rule.
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = Please sign in first
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = Get init score failed, error: %%w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
|
||||||
PasswordWrong = Ldap user name or password incorrect
|
|
||||||
ServerExisted = Ldap server exist
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = The application: %s does not exist
|
|
||||||
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
|
||||||
AccountDoNotExist = The account does not exist
|
|
||||||
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
|
||||||
LoginFirst = Please login first
|
|
||||||
LoginFail = Failed to login in: %s
|
|
||||||
NoPermission = You don't have the permission to do this
|
|
||||||
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
|
||||||
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
|
||||||
SessionOutdated = Session outdated, please login again
|
|
||||||
SignOutFirst = Please sign out first before signing in
|
|
||||||
UserDoNotExist = The user: %s/%s doesn't exist
|
|
||||||
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
|
||||||
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
|
||||||
UnsupportedPasswordType = unsupported password type: %s
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = Organization does not exist
|
|
||||||
Immutable = The %s is immutable.
|
|
||||||
OnlyAdmin = Only admin can modify the %s.
|
|
||||||
UnknownModifyRule = Unknown modify rule %s.
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
OrgMissingErr = Parameter organization is missing
|
|
||||||
Missing = Missing parameter
|
|
||||||
UnknownType = Unknown type
|
|
||||||
Wrong = Wrong parameter
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = Code has not been sent yet!
|
|
||||||
CodeTimeOut = You should verify your code in %d min!
|
|
||||||
ExistedErr = Phone already exists
|
|
||||||
EmptyErr = Phone cannot be empty
|
|
||||||
InvalidReceivers = Invalid phone receivers: %s
|
|
||||||
NumberInvalid = Phone number is invalid
|
|
||||||
NoPrefix = %s No phone prefix
|
|
||||||
PhoneCheckResult = Phone: %s
|
|
||||||
UnableGetModifyRule = Unable to get the phone modify rule.
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = This provider can't be unlinked
|
|
||||||
CategoryNotSAML = provider %s's category is not SAML
|
|
||||||
DoNotExist = the provider: %s does not exist
|
|
||||||
InvalidProvider = Invalid captcha provider.
|
|
||||||
LinkFirstErr = Please link first
|
|
||||||
ProviderNotEnabled = The provider: %s is not enabled for the application
|
|
||||||
ProviderNotSupported = The provider type: %s is not supported
|
|
||||||
ProviderNotFound = The provider: %s is not found
|
|
||||||
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = You are not authorized to access this resource
|
|
||||||
UserIsNil = User is nil for tag: /"avatar/"
|
|
||||||
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = New password cannot contain blank space.
|
|
||||||
LessThanSixCharacters = New password must have at least 6 characters
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = The application does not allow to sign up new account
|
|
||||||
SignOutFirst = Please sign out first before signing up
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = Empty clientId or clientSecret
|
|
||||||
InvalidToken = Invalid token
|
|
||||||
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
|
||||||
InvalidClientId = Invalid client_id
|
|
||||||
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = Affiliation cannot be blank
|
|
||||||
DisplayNameBlankErr = DisplayName cannot be blank
|
|
||||||
DisplayNameInvalid = DisplayName is not valid real name
|
|
||||||
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
|
||||||
DoNotExist = The user: %s doesn't exist
|
|
||||||
DoNotExistInOrg = The user: %s/%s doesn't exist
|
|
||||||
DoNotExistSignUp = the user does not exist, please sign up first
|
|
||||||
FirstNameBlankErr = FirstName cannot be blank
|
|
||||||
FailToImportUsers = Failed to import users
|
|
||||||
LastNameBlankErr = LastName cannot be blank
|
|
||||||
NameLessThanTwoCharacters = Username must have at least 2 characters
|
|
||||||
NameStartWithADigitErr = Username cannot start with a digit
|
|
||||||
NameIsEmailErr = Username cannot be an email address
|
|
||||||
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
|
||||||
NameExistedErr = Username already exists
|
|
||||||
NameEmptyErr = Empty username.
|
|
||||||
NameTooLang = Username is too long (maximum is 39 characters).
|
|
||||||
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
|
||||||
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
|
||||||
InvalidInformation = Invalid information
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
|||||||
[ApplicationErr]
|
|
||||||
AppNotFound = 应用 %%s 未找到
|
|
||||||
AppNotFoundForUserID = 找不到该用户的应用程序 %s
|
|
||||||
GrantTypeNotSupport = 此应用中不支持此授权类型
|
|
||||||
HasNoProviders = 该应用无提供商
|
|
||||||
HasNoProvidersOfType = 应用没有该类型的提供商
|
|
||||||
InvalidID = 无效的Application ID
|
|
||||||
|
|
||||||
[AuthErr]
|
|
||||||
AuthStateWrong = 期望状态位: %s, 实际状态为: %s
|
|
||||||
ChallengeMethodErr = Challenge 方法应该为 S256
|
|
||||||
CanNotUnlinkUsers = 您不是全局管理员,无法取消链接其他用户
|
|
||||||
CanNotLinkMySelf = 您无法取消链接,您不是任何应用程序的成员
|
|
||||||
CallWebAuthnSigninBegin = 请先调用WebAuthnSigninBegin
|
|
||||||
NotHuman = 真人验证失败
|
|
||||||
Unauthorized = 未授权的操作
|
|
||||||
WrongPasswordManyTimes = 输入密码错误次数已达上限,请在 %d 分 %d 秒后重试
|
|
||||||
|
|
||||||
[CasErr]
|
|
||||||
ServiceDoNotMatch = 服务 %s 与 %s 不匹配
|
|
||||||
|
|
||||||
[EmailErr]
|
|
||||||
ExistedErr = 该邮箱已存在
|
|
||||||
EmptyErr = 邮箱不可为空
|
|
||||||
EmailInvalid = 无效邮箱
|
|
||||||
EmailCheckResult = Email: %s
|
|
||||||
EmptyParam = 邮件参数为空: %v
|
|
||||||
InvalidReceivers = 无效的邮箱接收者: %%s
|
|
||||||
UnableGetModifyRule = 无法得到Email修改规则
|
|
||||||
|
|
||||||
[EnforcerErr]
|
|
||||||
SignInFirst = 请先登录
|
|
||||||
|
|
||||||
[InitErr]
|
|
||||||
InitScoreFailed = 初始化分数失败: %w
|
|
||||||
|
|
||||||
[LdapErr]
|
|
||||||
MultipleAccounts = 多个帐户具有相同的uid,请检查您的 ldap 服务器
|
|
||||||
PasswordWrong = Ldap密码错误
|
|
||||||
ServerExisted = Ldap服务器已存在
|
|
||||||
|
|
||||||
[LoginErr]
|
|
||||||
AppDoNotExist = 应用不存在: %s
|
|
||||||
AppNotEnableSignUp = 提供商账户: %s 与用户名: %s (%s) 不存在且 不允许注册新账户, 请联系IT支持
|
|
||||||
AccountDoNotExist = 账户不存在
|
|
||||||
InvalidUserInformation = 创建用户失败,用户信息无效: %%s
|
|
||||||
LoginFirst = 请先登录
|
|
||||||
LoginFail = 无法登录: %s
|
|
||||||
NoPermission = 您没有权限执行此操作
|
|
||||||
OldUser = 提供商账户: %s 与用户名: %s (%s) 已经与其他账户绑定: %s (%s)
|
|
||||||
ProviderCanNotSignUp = 提供商账户: %s 与用户名: %s (%s) 不存在且 不允许通过 %s 注册新账户, 请使用其他方式注册
|
|
||||||
SignOutFirst = 请在登录前登出
|
|
||||||
SessionOutdated = Session已过期,请重新登陆
|
|
||||||
UserDoNotExist = 用户不存在: %s/%s
|
|
||||||
UserIsForbidden = 该用户被禁止登陆,请联系管理员
|
|
||||||
UnknownAuthentication = 未知的认证类型 (非密码或提供商认证), form = %s
|
|
||||||
UnsupportedPasswordType = 不支持此密码类型
|
|
||||||
|
|
||||||
[OrgErr]
|
|
||||||
DoNotExist = 组织不存在
|
|
||||||
Immutable = %s是不可变的
|
|
||||||
OnlyAdmin = 只有管理员用户有此权限
|
|
||||||
UnknownModifyRule = 未知的修改规则
|
|
||||||
|
|
||||||
[ParameterErr]
|
|
||||||
Missing = 参数丢失
|
|
||||||
OrgMissingErr = Organization参数丢失
|
|
||||||
UnknownType = 未知类型
|
|
||||||
Wrong = 参数错误
|
|
||||||
|
|
||||||
[PhoneErr]
|
|
||||||
CodeNotSent = 验证码还未发送
|
|
||||||
CodeTimeOut = 验证码过期
|
|
||||||
ExistedErr = 该电话已存在
|
|
||||||
EmptyErr = 电话不可为空
|
|
||||||
InvalidReceivers = 无效的电话接收者: %s
|
|
||||||
NumberInvalid = 无效电话
|
|
||||||
PhoneCheckResult = 电话: %s
|
|
||||||
UnableGetModifyRule = 无法得到电话修改规则
|
|
||||||
NoPrefix = %s 无此电话前缀
|
|
||||||
|
|
||||||
[ProviderErr]
|
|
||||||
CanNotBeUnlinked = 该提供商不可被链接
|
|
||||||
InvalidProvider = 无效的验证码提供商
|
|
||||||
LinkFirstErr = 请先绑定
|
|
||||||
ProviderNotEnabled = 提供商: %s 未被启用
|
|
||||||
ProviderNotSupported = 不支持该类型的提供商: %s
|
|
||||||
ProviderNotFound = 该提供商未找到: %s
|
|
||||||
ProviderNotFoundForCategory = 该类型的提供商: %s 在应用中未找到: %s
|
|
||||||
DoNotExist = 提供商: %s 不存在
|
|
||||||
CategoryNotSAML = 提供商 %s类型不是SAML
|
|
||||||
|
|
||||||
[ResourceErr]
|
|
||||||
NotAuthorized = 您无权获取此资源
|
|
||||||
UserIsNil = 用户头像标签为空
|
|
||||||
UsernameOrFilePathEmpty = username或FilePath为空: username = %s, fullFilePath = %s
|
|
||||||
|
|
||||||
[SetPasswordErr]
|
|
||||||
CanNotContainBlank = 新密码不可以包含空客
|
|
||||||
LessThanSixCharacters = 新密码至少为6位
|
|
||||||
|
|
||||||
[SignUpErr]
|
|
||||||
DoNotAllowSignUp = 该应用不允许注册新账户
|
|
||||||
SignOutFirst = 请在登陆前登出
|
|
||||||
|
|
||||||
[TokenErr]
|
|
||||||
EmptyClientID = clientId或clientSecret为空
|
|
||||||
InvalidAppOrWrongClientSecret = 无效应用或错误的clientSecret
|
|
||||||
InvalidToken = 无效token
|
|
||||||
InvalidClientId = 无效的ClientId
|
|
||||||
RedirectURIDoNotExist = 重定向 URI:%s 在可列表中未找到
|
|
||||||
|
|
||||||
[UserErr]
|
|
||||||
AffiliationBlankErr = 联系方式不可为空
|
|
||||||
DisplayNameBlankErr = 展示名称不可为空
|
|
||||||
DisplayNameInvalid = 展示名称无效
|
|
||||||
DisplayNameCanNotBeEmpty = 展示名称不可为空
|
|
||||||
DoNotExist = 用户不存在: %s
|
|
||||||
DoNotExistInOrg = 用户不存在: %s/%s
|
|
||||||
FirstNameBlankErr = 名不可以为空
|
|
||||||
FailToImportUsers = 导入用户失败
|
|
||||||
LastNameBlankErr = 姓不可以为空
|
|
||||||
NameLessThanTwoCharacters = 用户名至少要有2个字符
|
|
||||||
NameStartWithADigitErr = 用户名禁止使用数字作为第一个字符
|
|
||||||
NameIsEmailErr = 用户名不可以是邮箱地址
|
|
||||||
NameCantainWhitSpaceErr = 用户名不可以包含空格
|
|
||||||
NameExistedErr = 用户名已存在
|
|
||||||
NameEmptyErr = 用户名不可为空
|
|
||||||
NameTooLang = 用户名过长(最大长度为39个字符)
|
|
||||||
NameFormatErr = 用户名只能包含字母数字字符、下划线或连字符,不能有连续的连字符或下划线,也不能以连字符或下划线开头或结尾
|
|
||||||
PasswordLessThanSixCharacters = 密码至少为6字符
|
|
||||||
DoNotExistSignUp = 用户不存在,请先注册
|
|
||||||
InvalidInformation = 无效信息
|
|
||||||
|
|
||||||
[StorageErr]
|
|
||||||
ObjectKeyNotAllowed = object key :%s 不被允许
|
|
||||||
|
|
147
i18n/locales/de/data.json
Normal file
147
i18n/locales/de/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/en/data.json
Normal file
147
i18n/locales/en/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/es/data.json
Normal file
147
i18n/locales/es/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/fr/data.json
Normal file
147
i18n/locales/fr/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/ja/data.json
Normal file
147
i18n/locales/ja/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/ko/data.json
Normal file
147
i18n/locales/ko/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/ru/data.json
Normal file
147
i18n/locales/ru/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "Email: %s",
|
||||||
|
"Get init score failed, error: %w": "Get init score failed, error: %w",
|
||||||
|
"Invalid information": "Invalid information",
|
||||||
|
"Phone: %s": "Phone: %s",
|
||||||
|
"Please sign out first before signing in": "Please sign out first before signing in",
|
||||||
|
"Please sign out first before signing up": "Please sign out first before signing up",
|
||||||
|
"The application does not allow to sign up new account": "The application does not allow to sign up new account"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge method should be S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
|
||||||
|
"Failed to login in: %s": "Failed to login in: %s",
|
||||||
|
"Invalid token": "Invalid token",
|
||||||
|
"State expected: %s, but got: %s": "State expected: %s, but got: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
|
||||||
|
"The application: %s does not exist": "The application: %s does not exist",
|
||||||
|
"The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported",
|
||||||
|
"The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unauthorized operation": "Unauthorized operation",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "Service %s and %s do not match"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "Affiliation cannot be blank",
|
||||||
|
"DisplayName cannot be blank": "DisplayName cannot be blank",
|
||||||
|
"DisplayName is not valid real name": "DisplayName is not valid real name",
|
||||||
|
"Email already exists": "Email already exists",
|
||||||
|
"Email cannot be empty": "Email cannot be empty",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Empty username.": "Empty username.",
|
||||||
|
"FirstName cannot be blank": "FirstName cannot be blank",
|
||||||
|
"LastName cannot be blank": "LastName cannot be blank",
|
||||||
|
"Ldap user name or password incorrect": "Ldap user name or password incorrect",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Password must have at least 6 characters": "Password must have at least 6 characters",
|
||||||
|
"Phone already exists": "Phone already exists",
|
||||||
|
"Phone cannot be empty": "Phone cannot be empty",
|
||||||
|
"Phone number is invalid": "Phone number is invalid",
|
||||||
|
"Session outdated, please login again": "Session outdated, please login again",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
|
||||||
|
"Username already exists": "Username already exists",
|
||||||
|
"Username cannot be an email address": "Username cannot be an email address",
|
||||||
|
"Username cannot contain white spaces": "Username cannot contain white spaces",
|
||||||
|
"Username cannot start with a digit": "Username cannot start with a digit",
|
||||||
|
"Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
|
||||||
|
"Username must have at least 2 characters": "Username must have at least 2 characters",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
|
||||||
|
"Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
|
||||||
|
"unsupported password type: %s": "unsupported password type: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "Missing parameter",
|
||||||
|
"Please login first": "Please login first",
|
||||||
|
"The user: %s doesn't exist": "The user: %s doesn't exist",
|
||||||
|
"don't support captchaProvider: ": "don't support captchaProvider: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "Ldap server exist"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "Please link first",
|
||||||
|
"This application has no providers": "This application has no providers",
|
||||||
|
"This application has no providers of type": "This application has no providers of type",
|
||||||
|
"This provider can't be unlinked": "This provider can't be unlinked",
|
||||||
|
"You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "Only admin can modify the %s.",
|
||||||
|
"The %s is immutable.": "The %s is immutable.",
|
||||||
|
"Unknown modify rule %s.": "Unknown modify rule %s."
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "Invalid application id",
|
||||||
|
"the provider: %s does not exist": "the provider: %s does not exist"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "User is nil for tag: avatar",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "Application %s not found"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "provider %s's category is not SAML"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
|
||||||
|
"Invalid Email receivers: %s": "Invalid Email receivers: %s",
|
||||||
|
"Invalid phone receivers: %s": "Invalid phone receivers: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
|
||||||
|
"The provider type: %s is not supported": "The provider type: %s is not supported"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "Empty clientId or clientSecret",
|
||||||
|
"Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
|
||||||
|
"Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
|
||||||
|
"Invalid client_id": "Invalid client_id",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
|
||||||
|
"Token not found, invalid accessToken": "Token not found, invalid accessToken"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "Display name cannot be empty",
|
||||||
|
"New password cannot contain blank space.": "New password cannot contain blank space.",
|
||||||
|
"New password must have at least 6 characters": "New password must have at least 6 characters"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "Failed to import users"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "No application is found for userId: %s",
|
||||||
|
"No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
|
||||||
|
"The provider: %s is not found": "The provider: %s is not found"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "Code has not been sent yet!",
|
||||||
|
"Email is invalid": "Email is invalid",
|
||||||
|
"Invalid captcha provider.": "Invalid captcha provider.",
|
||||||
|
"Organization does not exist": "Organization does not exist",
|
||||||
|
"Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
|
||||||
|
"Turing test failed.": "Turing test failed.",
|
||||||
|
"Unable to get the email modify rule.": "Unable to get the email modify rule.",
|
||||||
|
"Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
|
||||||
|
"Unknown type": "Unknown type",
|
||||||
|
"Wrong parameter": "Wrong parameter",
|
||||||
|
"You should verify your code in %d min!": "You should verify your code in %d min!",
|
||||||
|
"the user does not exist, please sign up first": "the user does not exist, please sign up first"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "Found no credentials for this user",
|
||||||
|
"Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
|
||||||
|
}
|
||||||
|
}
|
147
i18n/locales/zh/data.json
Normal file
147
i18n/locales/zh/data.json
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
{
|
||||||
|
"account": {
|
||||||
|
"Email: %s": "邮件: %s",
|
||||||
|
"Get init score failed, error: %w": "初始化分数失败: %w",
|
||||||
|
"Invalid information": "无效信息",
|
||||||
|
"Phone: %s": "手机号: %s",
|
||||||
|
"Please sign out first before signing in": "请在登录前先退出登录",
|
||||||
|
"Please sign out first before signing up": "请在注册前先退出登录",
|
||||||
|
"The application does not allow to sign up new account": "该应用不允许注册新用户"
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"Challenge method should be S256": "Challenge 方法应该为 S256",
|
||||||
|
"Failed to create user, user information is invalid: %s": "创建用户失败,用户信息无效: %s",
|
||||||
|
"Failed to login in: %s": "登录失败: %s",
|
||||||
|
"Invalid token": "无效token",
|
||||||
|
"State expected: %s, but got: %s": "期望状态为: %s, 实际状态为: %s",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许通过 %s 注册新账户, 请使用其他方式注册",
|
||||||
|
"The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许注册新账户, 请联系IT支持",
|
||||||
|
"The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "提供商账户: %s 与用户名: %s (%s) 已经与其他账户绑定: %s (%s)",
|
||||||
|
"The application: %s does not exist": "应用 %s 不存在",
|
||||||
|
"The login method: login with password is not enabled for the application": "该应用禁止采用密码登录方式",
|
||||||
|
"The provider type: %s is not supported": "不支持该类型的提供商: %s",
|
||||||
|
"The provider: %s is not enabled for the application": "该应用的提供商: %s 未被启用",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "该用户被禁止登录,请联系管理员",
|
||||||
|
"Turing test failed.": "人机验证失败",
|
||||||
|
"Unauthorized operation": "未授权的操作",
|
||||||
|
"Unknown authentication type (not password or provider), form = %s": "未知的认证类型(非密码或第三方提供商):%s"
|
||||||
|
},
|
||||||
|
"cas": {
|
||||||
|
"Service %s and %s do not match": "服务 %s 与 %s 不匹配"
|
||||||
|
},
|
||||||
|
"check": {
|
||||||
|
"Affiliation cannot be blank": "工作单位不可为空",
|
||||||
|
"DisplayName cannot be blank": "显示名称不可为空",
|
||||||
|
"DisplayName is not valid real name": "显示名称必须是真实姓名",
|
||||||
|
"Email already exists": "该邮箱已存在",
|
||||||
|
"Email cannot be empty": "邮箱不可为空",
|
||||||
|
"Email is invalid": "无效邮箱",
|
||||||
|
"Empty username.": "用户名不可为空",
|
||||||
|
"FirstName cannot be blank": "名不可以为空",
|
||||||
|
"LastName cannot be blank": "姓不可以为空",
|
||||||
|
"Ldap user name or password incorrect": "LDAP密码错误",
|
||||||
|
"Multiple accounts with same uid, please check your ldap server": "多个帐户具有相同的uid,请检查您的 LDAP 服务器",
|
||||||
|
"Organization does not exist": "组织不存在",
|
||||||
|
"Password must have at least 6 characters": "新密码至少为6位",
|
||||||
|
"Phone already exists": "该手机号已存在",
|
||||||
|
"Phone cannot be empty": "手机号不可为空",
|
||||||
|
"Phone number is invalid": "无效手机号",
|
||||||
|
"Session outdated, please login again": "会话已过期,请重新登录",
|
||||||
|
"The user is forbidden to sign in, please contact the administrator": "该用户被禁止登录,请联系管理员",
|
||||||
|
"The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "用户名只能包含字母数字字符、下划线或连字符,不能有连续的连字符或下划线,也不能以连字符或下划线开头或结尾",
|
||||||
|
"Username already exists": "用户名已存在",
|
||||||
|
"Username cannot be an email address": "用户名不可以是邮箱地址",
|
||||||
|
"Username cannot contain white spaces": "用户名禁止包含空格",
|
||||||
|
"Username cannot start with a digit": "用户名禁止使用数字开头",
|
||||||
|
"Username is too long (maximum is 39 characters).": "用户名过长(最大允许长度为39个字符)",
|
||||||
|
"Username must have at least 2 characters": "用户名至少要有2个字符",
|
||||||
|
"You have entered the wrong password or code too many times, please wait for %d minutes and try again": "密码错误次数已达上限,请在 %d 分后重试",
|
||||||
|
"Your region is not allow to signup by phone": "所在地区不支持手机号注册",
|
||||||
|
"password or code is incorrect, you have %d remaining chances": "密码错误,您还有 %d 次尝试的机会",
|
||||||
|
"unsupported password type: %s": "不支持的密码类型: %s"
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"Missing parameter": "缺少参数",
|
||||||
|
"Please login first": "请先登录",
|
||||||
|
"The user: %s doesn't exist": "用户: %s 不存在",
|
||||||
|
"don't support captchaProvider: ": "不支持验证码提供商: "
|
||||||
|
},
|
||||||
|
"ldap": {
|
||||||
|
"Ldap server exist": "LDAP服务器已存在"
|
||||||
|
},
|
||||||
|
"link": {
|
||||||
|
"Please link first": "请先绑定",
|
||||||
|
"This application has no providers": "该应用无可用的提供商",
|
||||||
|
"This application has no providers of type": "应用没有该类型的提供商",
|
||||||
|
"This provider can't be unlinked": "该提供商被禁止解绑",
|
||||||
|
"You are not the global admin, you can't unlink other users": "您不是全局管理员,无法解绑其他用户",
|
||||||
|
"You can't unlink yourself, you are not a member of any application": "您无法自行解绑,您不是任何应用程序的成员"
|
||||||
|
},
|
||||||
|
"organization": {
|
||||||
|
"Only admin can modify the %s.": "仅允许管理员可以修改 %s",
|
||||||
|
"The %s is immutable.": "%s 是不可变的",
|
||||||
|
"Unknown modify rule %s.": "未知的修改规则: %s"
|
||||||
|
},
|
||||||
|
"provider": {
|
||||||
|
"Invalid application id": "无效的应用ID",
|
||||||
|
"the provider: %s does not exist": "提供商: %s 不存在"
|
||||||
|
},
|
||||||
|
"resource": {
|
||||||
|
"User is nil for tag: avatar": "上传头像时用户为空",
|
||||||
|
"Username or fullFilePath is empty: username = %s, fullFilePath = %s": "username或fullFilePath为空: username = %s, fullFilePath = %s"
|
||||||
|
},
|
||||||
|
"saml": {
|
||||||
|
"Application %s not found": "未找到应用: %s"
|
||||||
|
},
|
||||||
|
"saml_sp": {
|
||||||
|
"provider %s's category is not SAML": "提供商: %s 不是SAML类型"
|
||||||
|
},
|
||||||
|
"service": {
|
||||||
|
"Empty parameters for emailForm: %v": "邮件参数为空: %v",
|
||||||
|
"Invalid Email receivers: %s": " 无效的邮箱收件人: %s",
|
||||||
|
"Invalid phone receivers: %s": "无效的手机短信收信人: %s"
|
||||||
|
},
|
||||||
|
"storage": {
|
||||||
|
"The objectKey: %s is not allowed": "objectKey: %s 被禁止",
|
||||||
|
"The provider type: %s is not supported": "不支持的提供商类型: %s"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"Empty clientId or clientSecret": "clientId或clientSecret为空",
|
||||||
|
"Grant_type: %s is not supported in this application": "该应用不支持Grant_type: %s",
|
||||||
|
"Invalid application or wrong clientSecret": "无效应用或错误的clientSecret",
|
||||||
|
"Invalid client_id": "无效的ClientId",
|
||||||
|
"Redirect URI: %s doesn't exist in the allowed Redirect URI list": "重定向 URI:%s 在许可跳转列表中未找到",
|
||||||
|
"Token not found, invalid accessToken": "未查询到对应token, accessToken无效"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"Display name cannot be empty": "显示名称不可为空",
|
||||||
|
"New password cannot contain blank space.": "新密码不可以包含空格",
|
||||||
|
"New password must have at least 6 characters": "新密码至少需要6位字符"
|
||||||
|
},
|
||||||
|
"user_upload": {
|
||||||
|
"Failed to import users": "导入用户失败"
|
||||||
|
},
|
||||||
|
"util": {
|
||||||
|
"No application is found for userId: %s": "未找到用户: %s 的应用",
|
||||||
|
"No provider for category: %s is found for application: %s": "未找到类别为: %s 的提供商来满足应用: %s",
|
||||||
|
"The provider: %s is not found": "未找到提供商: %s"
|
||||||
|
},
|
||||||
|
"verification": {
|
||||||
|
"Code has not been sent yet!": "验证码还未发送",
|
||||||
|
"Email is invalid": "非法的邮箱",
|
||||||
|
"Invalid captcha provider.": "非法的验证码提供商",
|
||||||
|
"Organization does not exist": "组织不存在",
|
||||||
|
"Phone number is invalid in your region %s": "您所在地区的电话号码无效 %s",
|
||||||
|
"Turing test failed.": "验证码还未发送",
|
||||||
|
"Unable to get the email modify rule.": "无法获取邮箱修改规则",
|
||||||
|
"Unable to get the phone modify rule.": "无法获取手机号修改规则",
|
||||||
|
"Unknown type": "未知类型",
|
||||||
|
"Wrong parameter": "参数错误",
|
||||||
|
"You should verify your code in %d min!": "请在 %d 分钟内输入正确验证码",
|
||||||
|
"the user does not exist, please sign up first": "用户不存在,请先注册"
|
||||||
|
},
|
||||||
|
"webauthn": {
|
||||||
|
"Found no credentials for this user": "该用户没有 WebAuthn 凭据",
|
||||||
|
"Please call WebAuthnSigninBegin first": "请先调用 WebAuthnSigninBegin"
|
||||||
|
}
|
||||||
|
}
|
49
i18n/util.go
49
i18n/util.go
@ -17,27 +17,26 @@ package i18n
|
|||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"gopkg.in/ini.v1"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed languages/*.ini
|
//go:embed locales/*/data.json
|
||||||
var f embed.FS
|
var f embed.FS
|
||||||
|
|
||||||
var (
|
var langMap = make(map[string]map[string]map[string]string) // for example : langMap[en][account][Invalid information] = Invalid information
|
||||||
langMapConfig = make(map[string]*ini.File)
|
|
||||||
isNotFirstLoad = make(map[string]bool)
|
|
||||||
)
|
|
||||||
|
|
||||||
func getI18nFilePath(language string) string {
|
func getI18nFilePath(category string, language string) string {
|
||||||
return fmt.Sprintf("../web/src/locales/%s/data.json", language)
|
if category == "backend" {
|
||||||
|
return fmt.Sprintf("../i18n/locales/%s/data.json", language)
|
||||||
|
} else {
|
||||||
|
return fmt.Sprintf("../web/src/locales/%s/data.json", language)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func readI18nFile(language string) *I18nData {
|
func readI18nFile(category string, language string) *I18nData {
|
||||||
s := util.ReadStringFromPath(getI18nFilePath(language))
|
s := util.ReadStringFromPath(getI18nFilePath(category, language))
|
||||||
|
|
||||||
data := &I18nData{}
|
data := &I18nData{}
|
||||||
err := util.JsonToStruct(s, data)
|
err := util.JsonToStruct(s, data)
|
||||||
@ -47,13 +46,13 @@ func readI18nFile(language string) *I18nData {
|
|||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeI18nFile(language string, data *I18nData) {
|
func writeI18nFile(category string, language string, data *I18nData) {
|
||||||
s := util.StructToJsonFormatted(data)
|
s := util.StructToJsonFormatted(data)
|
||||||
s = strings.ReplaceAll(s, "\\u0026", "&")
|
s = strings.ReplaceAll(s, "\\u0026", "&")
|
||||||
s += "\n"
|
s += "\n"
|
||||||
println(s)
|
println(s)
|
||||||
|
|
||||||
util.WriteStringToPath(s, getI18nFilePath(language))
|
util.WriteStringToPath(s, getI18nFilePath(category, language))
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyData(data1 *I18nData, data2 *I18nData) {
|
func applyData(data1 *I18nData, data2 *I18nData) {
|
||||||
@ -75,18 +74,20 @@ func applyData(data1 *I18nData, data2 *I18nData) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Translate(lang string, error string) string {
|
func Translate(lang string, error string) string {
|
||||||
parts := strings.Split(error, ".")
|
parts := strings.SplitN(error, ":", 2)
|
||||||
if !strings.Contains(error, ".") || len(parts) != 2 {
|
if !strings.Contains(error, ":") || len(parts) != 2 {
|
||||||
log.Println("Invalid Error Name")
|
return "Translate Error: " + error
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
if langMap[lang] != nil {
|
||||||
if isNotFirstLoad[lang] {
|
return langMap[lang][parts[0]][parts[1]]
|
||||||
return langMapConfig[lang].Section(parts[0]).Key(parts[1]).String()
|
|
||||||
} else {
|
} else {
|
||||||
file, _ := f.ReadFile("languages/locale_" + lang + ".ini")
|
file, _ := f.ReadFile("locales/" + lang + "/data.json")
|
||||||
langMapConfig[lang], _ = ini.Load(file)
|
data := I18nData{}
|
||||||
isNotFirstLoad[lang] = true
|
err := util.JsonToStruct(string(file), &data)
|
||||||
return langMapConfig[lang].Section(parts[0]).Key(parts[1]).String()
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
langMap[lang] = data
|
||||||
|
return langMap[lang][parts[0]][parts[1]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
package idp
|
package idp
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"time"
|
"time"
|
||||||
@ -118,13 +118,14 @@ func (idp *AdfsIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
keyset, err := jwk.Parse(resp.Body)
|
body, err := ioutil.ReadAll(resp.Body)
|
||||||
|
keyset, err := jwk.ParseKey(body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
tokenSrc := []byte(token.AccessToken)
|
tokenSrc := []byte(token.AccessToken)
|
||||||
publicKey, _ := keyset.Keys[0].Materialize()
|
publicKey, _ := keyset.PublicKey()
|
||||||
idToken, _ := jwt.Parse(bytes.NewReader(tokenSrc), jwt.WithVerify(jwa.RS256, publicKey))
|
idToken, _ := jwt.Parse(tokenSrc, jwt.WithVerify(jwa.RS256, publicKey))
|
||||||
sid, _ := idToken.Get("sid")
|
sid, _ := idToken.Get("sid")
|
||||||
upn, _ := idToken.Get("upn")
|
upn, _ := idToken.Get("upn")
|
||||||
name, _ := idToken.Get("unique_name")
|
name, _ := idToken.Get("unique_name")
|
||||||
|
@ -256,6 +256,8 @@ func (idp *DingTalkIdProvider) isUserInOrg(unionId string) (bool, error) {
|
|||||||
}
|
}
|
||||||
if data.ErrCode == 60121 {
|
if data.ErrCode == 60121 {
|
||||||
return false, fmt.Errorf("the user is not found in the organization where clientId and clientSecret belong")
|
return false, fmt.Errorf("the user is not found in the organization where clientId and clientSecret belong")
|
||||||
|
} else if data.ErrCode != 0 {
|
||||||
|
return false, fmt.Errorf(data.ErrMessage)
|
||||||
}
|
}
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
245
idp/goth.go
245
idp/goth.go
@ -22,35 +22,64 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"github.com/casdoor/goth"
|
"github.com/markbates/goth"
|
||||||
"github.com/casdoor/goth/providers/amazon"
|
"github.com/markbates/goth/providers/amazon"
|
||||||
"github.com/casdoor/goth/providers/apple"
|
"github.com/markbates/goth/providers/apple"
|
||||||
"github.com/casdoor/goth/providers/azuread"
|
"github.com/markbates/goth/providers/auth0"
|
||||||
"github.com/casdoor/goth/providers/bitbucket"
|
"github.com/markbates/goth/providers/azureadv2"
|
||||||
"github.com/casdoor/goth/providers/digitalocean"
|
"github.com/markbates/goth/providers/battlenet"
|
||||||
"github.com/casdoor/goth/providers/discord"
|
"github.com/markbates/goth/providers/bitbucket"
|
||||||
"github.com/casdoor/goth/providers/dropbox"
|
"github.com/markbates/goth/providers/box"
|
||||||
"github.com/casdoor/goth/providers/facebook"
|
"github.com/markbates/goth/providers/cloudfoundry"
|
||||||
"github.com/casdoor/goth/providers/gitea"
|
"github.com/markbates/goth/providers/dailymotion"
|
||||||
"github.com/casdoor/goth/providers/github"
|
"github.com/markbates/goth/providers/deezer"
|
||||||
"github.com/casdoor/goth/providers/gitlab"
|
"github.com/markbates/goth/providers/digitalocean"
|
||||||
"github.com/casdoor/goth/providers/google"
|
"github.com/markbates/goth/providers/discord"
|
||||||
"github.com/casdoor/goth/providers/heroku"
|
"github.com/markbates/goth/providers/dropbox"
|
||||||
"github.com/casdoor/goth/providers/instagram"
|
"github.com/markbates/goth/providers/eveonline"
|
||||||
"github.com/casdoor/goth/providers/kakao"
|
"github.com/markbates/goth/providers/facebook"
|
||||||
"github.com/casdoor/goth/providers/line"
|
"github.com/markbates/goth/providers/fitbit"
|
||||||
"github.com/casdoor/goth/providers/linkedin"
|
"github.com/markbates/goth/providers/gitea"
|
||||||
"github.com/casdoor/goth/providers/microsoftonline"
|
"github.com/markbates/goth/providers/github"
|
||||||
"github.com/casdoor/goth/providers/paypal"
|
"github.com/markbates/goth/providers/gitlab"
|
||||||
"github.com/casdoor/goth/providers/salesforce"
|
"github.com/markbates/goth/providers/google"
|
||||||
"github.com/casdoor/goth/providers/shopify"
|
"github.com/markbates/goth/providers/heroku"
|
||||||
"github.com/casdoor/goth/providers/slack"
|
"github.com/markbates/goth/providers/influxcloud"
|
||||||
"github.com/casdoor/goth/providers/steam"
|
"github.com/markbates/goth/providers/instagram"
|
||||||
"github.com/casdoor/goth/providers/tumblr"
|
"github.com/markbates/goth/providers/intercom"
|
||||||
"github.com/casdoor/goth/providers/twitter"
|
"github.com/markbates/goth/providers/kakao"
|
||||||
"github.com/casdoor/goth/providers/yahoo"
|
"github.com/markbates/goth/providers/lastfm"
|
||||||
"github.com/casdoor/goth/providers/yandex"
|
"github.com/markbates/goth/providers/line"
|
||||||
"github.com/casdoor/goth/providers/zoom"
|
"github.com/markbates/goth/providers/linkedin"
|
||||||
|
"github.com/markbates/goth/providers/mailru"
|
||||||
|
"github.com/markbates/goth/providers/meetup"
|
||||||
|
"github.com/markbates/goth/providers/microsoftonline"
|
||||||
|
"github.com/markbates/goth/providers/naver"
|
||||||
|
"github.com/markbates/goth/providers/nextcloud"
|
||||||
|
"github.com/markbates/goth/providers/onedrive"
|
||||||
|
"github.com/markbates/goth/providers/oura"
|
||||||
|
"github.com/markbates/goth/providers/patreon"
|
||||||
|
"github.com/markbates/goth/providers/paypal"
|
||||||
|
"github.com/markbates/goth/providers/salesforce"
|
||||||
|
"github.com/markbates/goth/providers/shopify"
|
||||||
|
"github.com/markbates/goth/providers/slack"
|
||||||
|
"github.com/markbates/goth/providers/soundcloud"
|
||||||
|
"github.com/markbates/goth/providers/spotify"
|
||||||
|
"github.com/markbates/goth/providers/steam"
|
||||||
|
"github.com/markbates/goth/providers/strava"
|
||||||
|
"github.com/markbates/goth/providers/stripe"
|
||||||
|
"github.com/markbates/goth/providers/tiktok"
|
||||||
|
"github.com/markbates/goth/providers/tumblr"
|
||||||
|
"github.com/markbates/goth/providers/twitch"
|
||||||
|
"github.com/markbates/goth/providers/twitterv2"
|
||||||
|
"github.com/markbates/goth/providers/typetalk"
|
||||||
|
"github.com/markbates/goth/providers/uber"
|
||||||
|
"github.com/markbates/goth/providers/wepay"
|
||||||
|
"github.com/markbates/goth/providers/xero"
|
||||||
|
"github.com/markbates/goth/providers/yahoo"
|
||||||
|
"github.com/markbates/goth/providers/yammer"
|
||||||
|
"github.com/markbates/goth/providers/yandex"
|
||||||
|
"github.com/markbates/goth/providers/zoom"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -74,14 +103,44 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
}
|
}
|
||||||
case "AzureAD":
|
case "AzureAD":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: azuread.New(clientId, clientSecret, redirectUrl, nil),
|
Provider: azureadv2.New(clientId, clientSecret, redirectUrl, azureadv2.ProviderOptions{Tenant: "common"}),
|
||||||
Session: &azuread.Session{},
|
Session: &azureadv2.Session{},
|
||||||
|
}
|
||||||
|
case "Auth0":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: auth0.New(clientId, clientSecret, redirectUrl, "casdoor.auth0.com"),
|
||||||
|
Session: &auth0.Session{},
|
||||||
|
}
|
||||||
|
case "BattleNet":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: battlenet.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &battlenet.Session{},
|
||||||
}
|
}
|
||||||
case "Bitbucket":
|
case "Bitbucket":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: bitbucket.New(clientId, clientSecret, redirectUrl),
|
Provider: bitbucket.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &bitbucket.Session{},
|
Session: &bitbucket.Session{},
|
||||||
}
|
}
|
||||||
|
case "Box":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: box.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &box.Session{},
|
||||||
|
}
|
||||||
|
case "CloudFoundry":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: cloudfoundry.New("", clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &cloudfoundry.Session{},
|
||||||
|
}
|
||||||
|
case "Dailymotion":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: dailymotion.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &dailymotion.Session{},
|
||||||
|
}
|
||||||
|
case "Deezer":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: deezer.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &deezer.Session{},
|
||||||
|
}
|
||||||
case "DigitalOcean":
|
case "DigitalOcean":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: digitalocean.New(clientId, clientSecret, redirectUrl),
|
Provider: digitalocean.New(clientId, clientSecret, redirectUrl),
|
||||||
@ -97,6 +156,16 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
Provider: dropbox.New(clientId, clientSecret, redirectUrl),
|
Provider: dropbox.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &dropbox.Session{},
|
Session: &dropbox.Session{},
|
||||||
}
|
}
|
||||||
|
case "EveOnline":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: eveonline.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &eveonline.Session{},
|
||||||
|
}
|
||||||
|
case "Fitbit":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: fitbit.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &fitbit.Session{},
|
||||||
|
}
|
||||||
case "Facebook":
|
case "Facebook":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: facebook.New(clientId, clientSecret, redirectUrl),
|
Provider: facebook.New(clientId, clientSecret, redirectUrl),
|
||||||
@ -127,16 +196,31 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
Provider: heroku.New(clientId, clientSecret, redirectUrl),
|
Provider: heroku.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &heroku.Session{},
|
Session: &heroku.Session{},
|
||||||
}
|
}
|
||||||
|
case "InfluxCloud":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: influxcloud.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &influxcloud.Session{},
|
||||||
|
}
|
||||||
case "Instagram":
|
case "Instagram":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: instagram.New(clientId, clientSecret, redirectUrl),
|
Provider: instagram.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &instagram.Session{},
|
Session: &instagram.Session{},
|
||||||
}
|
}
|
||||||
|
case "Intercom":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: intercom.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &intercom.Session{},
|
||||||
|
}
|
||||||
case "Kakao":
|
case "Kakao":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: kakao.New(clientId, clientSecret, redirectUrl),
|
Provider: kakao.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &kakao.Session{},
|
Session: &kakao.Session{},
|
||||||
}
|
}
|
||||||
|
case "Lastfm":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: lastfm.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &lastfm.Session{},
|
||||||
|
}
|
||||||
case "Linkedin":
|
case "Linkedin":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: linkedin.New(clientId, clientSecret, redirectUrl),
|
Provider: linkedin.New(clientId, clientSecret, redirectUrl),
|
||||||
@ -147,11 +231,46 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
Provider: line.New(clientId, clientSecret, redirectUrl),
|
Provider: line.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &line.Session{},
|
Session: &line.Session{},
|
||||||
}
|
}
|
||||||
|
case "Mailru":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: mailru.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &mailru.Session{},
|
||||||
|
}
|
||||||
|
case "Meetup":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: meetup.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &meetup.Session{},
|
||||||
|
}
|
||||||
case "MicrosoftOnline":
|
case "MicrosoftOnline":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: microsoftonline.New(clientId, clientSecret, redirectUrl),
|
Provider: microsoftonline.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: µsoftonline.Session{},
|
Session: µsoftonline.Session{},
|
||||||
}
|
}
|
||||||
|
case "Naver":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: naver.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &naver.Session{},
|
||||||
|
}
|
||||||
|
case "Nextcloud":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: nextcloud.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &nextcloud.Session{},
|
||||||
|
}
|
||||||
|
case "OneDrive":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: onedrive.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &onedrive.Session{},
|
||||||
|
}
|
||||||
|
case "Oura":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: oura.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &oura.Session{},
|
||||||
|
}
|
||||||
|
case "Patreon":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: patreon.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &patreon.Session{},
|
||||||
|
}
|
||||||
case "Paypal":
|
case "Paypal":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: paypal.New(clientId, clientSecret, redirectUrl),
|
Provider: paypal.New(clientId, clientSecret, redirectUrl),
|
||||||
@ -172,26 +291,81 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
Provider: slack.New(clientId, clientSecret, redirectUrl),
|
Provider: slack.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &slack.Session{},
|
Session: &slack.Session{},
|
||||||
}
|
}
|
||||||
|
case "Soundcloud":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: soundcloud.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &soundcloud.Session{},
|
||||||
|
}
|
||||||
|
case "Spotify":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: spotify.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &spotify.Session{},
|
||||||
|
}
|
||||||
case "Steam":
|
case "Steam":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: steam.New(clientSecret, redirectUrl),
|
Provider: steam.New(clientSecret, redirectUrl),
|
||||||
Session: &steam.Session{},
|
Session: &steam.Session{},
|
||||||
}
|
}
|
||||||
|
case "Strava":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: strava.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &strava.Session{},
|
||||||
|
}
|
||||||
|
case "Stripe":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: stripe.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &stripe.Session{},
|
||||||
|
}
|
||||||
|
case "TikTok":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: tiktok.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &tiktok.Session{},
|
||||||
|
}
|
||||||
case "Tumblr":
|
case "Tumblr":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: tumblr.New(clientId, clientSecret, redirectUrl),
|
Provider: tumblr.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &tumblr.Session{},
|
Session: &tumblr.Session{},
|
||||||
}
|
}
|
||||||
|
case "Twitch":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: twitch.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &twitch.Session{},
|
||||||
|
}
|
||||||
case "Twitter":
|
case "Twitter":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: twitter.New(clientId, clientSecret, redirectUrl),
|
Provider: twitterv2.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &twitter.Session{},
|
Session: &twitterv2.Session{},
|
||||||
|
}
|
||||||
|
case "Typetalk":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: typetalk.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &typetalk.Session{},
|
||||||
|
}
|
||||||
|
case "Uber":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: uber.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &uber.Session{},
|
||||||
|
}
|
||||||
|
case "Wepay":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: wepay.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &wepay.Session{},
|
||||||
|
}
|
||||||
|
case "Xero":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: xero.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &xero.Session{},
|
||||||
}
|
}
|
||||||
case "Yahoo":
|
case "Yahoo":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: yahoo.New(clientId, clientSecret, redirectUrl),
|
Provider: yahoo.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &yahoo.Session{},
|
Session: &yahoo.Session{},
|
||||||
}
|
}
|
||||||
|
case "Yammer":
|
||||||
|
idp = GothIdProvider{
|
||||||
|
Provider: yammer.New(clientId, clientSecret, redirectUrl),
|
||||||
|
Session: &yammer.Session{},
|
||||||
|
}
|
||||||
case "Yandex":
|
case "Yandex":
|
||||||
idp = GothIdProvider{
|
idp = GothIdProvider{
|
||||||
Provider: yandex.New(clientId, clientSecret, redirectUrl),
|
Provider: yandex.New(clientId, clientSecret, redirectUrl),
|
||||||
@ -202,6 +376,8 @@ func NewGothIdProvider(providerType string, clientId string, clientSecret string
|
|||||||
Provider: zoom.New(clientId, clientSecret, redirectUrl),
|
Provider: zoom.New(clientId, clientSecret, redirectUrl),
|
||||||
Session: &zoom.Session{},
|
Session: &zoom.Session{},
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return &idp
|
return &idp
|
||||||
@ -230,6 +406,9 @@ func (idp *GothIdProvider) GetToken(code string) (*oauth2.Token, error) {
|
|||||||
// to call the function to obtain accessToken
|
// to call the function to obtain accessToken
|
||||||
value = url.Values{}
|
value = url.Values{}
|
||||||
value.Add("code", code)
|
value.Add("code", code)
|
||||||
|
if idp.Provider.Name() == "twitterv2" || idp.Provider.Name() == "fitbit" {
|
||||||
|
value.Add("oauth_verifier", "casdoor-verifier")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
accessToken, err := idp.Session.Authorize(idp.Provider, value)
|
accessToken, err := idp.Session.Authorize(idp.Provider, value)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -98,7 +98,61 @@ func GetIdProvider(typ string, subType string, clientId string, clientSecret str
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var gothList = []string{"Apple", "AzureAd", "Slack", "Steam"}
|
var gothList = []string{
|
||||||
|
"Apple",
|
||||||
|
"AzureAD",
|
||||||
|
"Slack",
|
||||||
|
"Steam",
|
||||||
|
"Line",
|
||||||
|
"Amazon",
|
||||||
|
"Auth0",
|
||||||
|
"BattleNet",
|
||||||
|
"Bitbucket",
|
||||||
|
"Box",
|
||||||
|
"CloudFoundry",
|
||||||
|
"Dailymotion",
|
||||||
|
"Deezer",
|
||||||
|
"DigitalOcean",
|
||||||
|
"Discord",
|
||||||
|
"Dropbox",
|
||||||
|
"EveOnline",
|
||||||
|
"Fitbit",
|
||||||
|
"Gitea",
|
||||||
|
"Heroku",
|
||||||
|
"InfluxCloud",
|
||||||
|
"Instagram",
|
||||||
|
"Intercom",
|
||||||
|
"Kakao",
|
||||||
|
"Lastfm",
|
||||||
|
"Mailru",
|
||||||
|
"Meetup",
|
||||||
|
"MicrosoftOnline",
|
||||||
|
"Naver",
|
||||||
|
"Nextcloud",
|
||||||
|
"OneDrive",
|
||||||
|
"Oura",
|
||||||
|
"Patreon",
|
||||||
|
"Paypal",
|
||||||
|
"SalesForce",
|
||||||
|
"Shopify",
|
||||||
|
"Soundcloud",
|
||||||
|
"Spotify",
|
||||||
|
"Strava",
|
||||||
|
"Stripe",
|
||||||
|
"TikTok",
|
||||||
|
"Tumblr",
|
||||||
|
"Twitch",
|
||||||
|
"Twitter",
|
||||||
|
"Typetalk",
|
||||||
|
"Uber",
|
||||||
|
"VK",
|
||||||
|
"Wepay",
|
||||||
|
"Xero",
|
||||||
|
"Yahoo",
|
||||||
|
"Yammer",
|
||||||
|
"Yandex",
|
||||||
|
"Zoom",
|
||||||
|
}
|
||||||
|
|
||||||
func isGothSupport(provider string) bool {
|
func isGothSupport(provider string) bool {
|
||||||
for _, value := range gothList {
|
for _, value := range gothList {
|
||||||
|
@ -16,14 +16,17 @@ package idp
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/skip2/go-qrcode"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -191,3 +194,54 @@ func (idp *WeChatIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
|
|||||||
}
|
}
|
||||||
return &userInfo, nil
|
return &userInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetWechatOfficialAccountAccessToken(clientId string, clientSecret string) (string, error) {
|
||||||
|
accessTokenUrl := fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", clientId, clientSecret)
|
||||||
|
request, err := http.NewRequest("GET", accessTokenUrl, nil)
|
||||||
|
client := new(http.Client)
|
||||||
|
resp, err := client.Do(request)
|
||||||
|
respBytes, err := ioutil.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
var data struct {
|
||||||
|
ExpireIn int `json:"expires_in"`
|
||||||
|
AccessToken string `json:"access_token"`
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(respBytes, &data)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return data.AccessToken, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetWechatOfficialAccountQRCode(clientId string, clientSecret string) (string, error) {
|
||||||
|
accessToken, err := GetWechatOfficialAccountAccessToken(clientId, clientSecret)
|
||||||
|
client := new(http.Client)
|
||||||
|
params := "{\"action_name\": \"QR_LIMIT_STR_SCENE\", \"action_info\": {\"scene\": {\"scene_str\": \"test\"}}}"
|
||||||
|
bodyData := bytes.NewReader([]byte(params))
|
||||||
|
qrCodeUrl := fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=%s", accessToken)
|
||||||
|
requeset, err := http.NewRequest("POST", qrCodeUrl, bodyData)
|
||||||
|
resp, err := client.Do(requeset)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
respBytes, err := ioutil.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
var data struct {
|
||||||
|
Ticket string `json:"ticket"`
|
||||||
|
ExpireSeconds int `json:"expire_seconds"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(respBytes, &data)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
var png []byte
|
||||||
|
png, err = qrcode.Encode(data.URL, qrcode.Medium, 256)
|
||||||
|
base64Image := base64.StdEncoding.EncodeToString(png)
|
||||||
|
return base64Image, nil
|
||||||
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"websiteUrl": "",
|
"websiteUrl": "",
|
||||||
"favicon": "",
|
"favicon": "",
|
||||||
"passwordType": "",
|
"passwordType": "",
|
||||||
"phonePrefix": "",
|
"countryCodes": [""],
|
||||||
"defaultAvatar": "",
|
"defaultAvatar": "",
|
||||||
"tags": [""]
|
"tags": [""]
|
||||||
}
|
}
|
||||||
@ -107,6 +107,7 @@
|
|||||||
"avatar": "",
|
"avatar": "",
|
||||||
"email": "",
|
"email": "",
|
||||||
"phone": "",
|
"phone": "",
|
||||||
|
"countryCode": "",
|
||||||
"address": [],
|
"address": [],
|
||||||
"affiliation": "",
|
"affiliation": "",
|
||||||
"tag": "",
|
"tag": "",
|
||||||
@ -156,5 +157,187 @@
|
|||||||
"autoSync": 0,
|
"autoSync": 0,
|
||||||
"lastSync": ""
|
"lastSync": ""
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"owner": "",
|
||||||
|
"name": "",
|
||||||
|
"modelText": "",
|
||||||
|
"displayName": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"permissions": [
|
||||||
|
{
|
||||||
|
"actions": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"displayName": "",
|
||||||
|
"effect": "",
|
||||||
|
"isEnabled": true,
|
||||||
|
"model": "",
|
||||||
|
"name": "",
|
||||||
|
"owner": "",
|
||||||
|
"resourceType": "",
|
||||||
|
"resources": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"roles": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
""
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"payments": [
|
||||||
|
{
|
||||||
|
"currency": "",
|
||||||
|
"detail": "",
|
||||||
|
"displayName": "",
|
||||||
|
"invoiceRemark": "",
|
||||||
|
"invoiceTaxId": "",
|
||||||
|
"invoiceTitle": "",
|
||||||
|
"invoiceType": "",
|
||||||
|
"invoiceUrl": "",
|
||||||
|
"message": "",
|
||||||
|
"name": "",
|
||||||
|
"organization": "",
|
||||||
|
"owner": "",
|
||||||
|
"payUrl": "",
|
||||||
|
"personEmail": "",
|
||||||
|
"personIdCard": "",
|
||||||
|
"personName": "",
|
||||||
|
"personPhone": "",
|
||||||
|
"price": 0,
|
||||||
|
"productDisplayName": "",
|
||||||
|
"productName": "",
|
||||||
|
"provider": "",
|
||||||
|
"returnUrl": "",
|
||||||
|
"state": "",
|
||||||
|
"tag": "",
|
||||||
|
"type": "",
|
||||||
|
"user": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"products": [
|
||||||
|
{
|
||||||
|
"currency": "",
|
||||||
|
"detail": "",
|
||||||
|
"displayName": "",
|
||||||
|
"image": "",
|
||||||
|
"name": "",
|
||||||
|
"owner": "",
|
||||||
|
"price": 0,
|
||||||
|
"providers": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"quantity": 0,
|
||||||
|
"returnUrl": "",
|
||||||
|
"sold": 0,
|
||||||
|
"state": "",
|
||||||
|
"tag": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"resources": [
|
||||||
|
{
|
||||||
|
"owner": "",
|
||||||
|
"name": "",
|
||||||
|
"user": "",
|
||||||
|
"provider": "",
|
||||||
|
"application": "",
|
||||||
|
"tag": "",
|
||||||
|
"parent": "",
|
||||||
|
"fileName": "",
|
||||||
|
"fileType": "",
|
||||||
|
"fileFormat": "",
|
||||||
|
"url": "",
|
||||||
|
"description": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"roles": [
|
||||||
|
{
|
||||||
|
"displayName": "",
|
||||||
|
"isEnabled": true,
|
||||||
|
"name": "",
|
||||||
|
"owner": "",
|
||||||
|
"roles": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
""
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"syncers": [
|
||||||
|
{
|
||||||
|
"affiliationTable": "",
|
||||||
|
"avatarBaseUrl": "",
|
||||||
|
"database": "",
|
||||||
|
"databaseType": "",
|
||||||
|
"errorText": "",
|
||||||
|
"host": "",
|
||||||
|
"isEnabled": true,
|
||||||
|
"name": "",
|
||||||
|
"organization": "",
|
||||||
|
"owner": "",
|
||||||
|
"password": "",
|
||||||
|
"port": 0,
|
||||||
|
"syncInterval": 0,
|
||||||
|
"table": "",
|
||||||
|
"tableColumns": [
|
||||||
|
{
|
||||||
|
"casdoorName": "",
|
||||||
|
"isHashed": true,
|
||||||
|
"name": "",
|
||||||
|
"type": "",
|
||||||
|
"values": [
|
||||||
|
""
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tablePrimaryKey": "",
|
||||||
|
"type": "",
|
||||||
|
"user": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tokens": [
|
||||||
|
{
|
||||||
|
"accessToken": "",
|
||||||
|
"application": "",
|
||||||
|
"code": "",
|
||||||
|
"codeChallenge": "",
|
||||||
|
"codeExpireIn": 0,
|
||||||
|
"codeIsUsed": true,
|
||||||
|
"createdTime": "",
|
||||||
|
"expiresIn": 0,
|
||||||
|
"name": "",
|
||||||
|
"organization": "",
|
||||||
|
"owner": "",
|
||||||
|
"refreshToken": "",
|
||||||
|
"scope": "",
|
||||||
|
"tokenType": "",
|
||||||
|
"user": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"webhooks": [
|
||||||
|
{
|
||||||
|
"contentType": "",
|
||||||
|
"events": [
|
||||||
|
""
|
||||||
|
],
|
||||||
|
"headers": [
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"value": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"isEnabled": true,
|
||||||
|
"isUserExtended": true,
|
||||||
|
"method": "",
|
||||||
|
"name": "",
|
||||||
|
"organization": "",
|
||||||
|
"owner": "",
|
||||||
|
"url": ""
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
5
main.go
5
main.go
@ -35,7 +35,10 @@ func main() {
|
|||||||
createDatabase := flag.Bool("createDatabase", false, "true if you need Casdoor to create database")
|
createDatabase := flag.Bool("createDatabase", false, "true if you need Casdoor to create database")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
object.InitAdapter(*createDatabase)
|
object.InitAdapter()
|
||||||
|
object.DoMigration()
|
||||||
|
object.CreateTables(*createDatabase)
|
||||||
|
|
||||||
object.InitDb()
|
object.InitDb()
|
||||||
object.InitFromFile()
|
object.InitFromFile()
|
||||||
object.InitDefaultStorageProvider()
|
object.InitDefaultStorageProvider()
|
||||||
|
@ -19,16 +19,15 @@ import (
|
|||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
"github.com/beego/beego"
|
"github.com/beego/beego"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v3"
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
_ "github.com/denisenkom/go-mssqldb" // db = mssql
|
_ "github.com/denisenkom/go-mssqldb" // db = mssql
|
||||||
_ "github.com/go-sql-driver/mysql" // db = mysql
|
_ "github.com/go-sql-driver/mysql" // db = mysql
|
||||||
_ "github.com/lib/pq" // db = postgres
|
_ "github.com/lib/pq" // db = postgres
|
||||||
"xorm.io/xorm/migrate"
|
"github.com/xorm-io/core"
|
||||||
//_ "github.com/mattn/go-sqlite3" // db = sqlite3
|
"github.com/xorm-io/xorm"
|
||||||
"xorm.io/core"
|
_ "modernc.org/sqlite" // db = sqlite
|
||||||
"xorm.io/xorm"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var adapter *Adapter
|
var adapter *Adapter
|
||||||
@ -41,12 +40,16 @@ func InitConfig() {
|
|||||||
|
|
||||||
beego.BConfig.WebConfig.Session.SessionOn = true
|
beego.BConfig.WebConfig.Session.SessionOn = true
|
||||||
|
|
||||||
InitAdapter(true)
|
InitAdapter()
|
||||||
initMigrations()
|
DoMigration()
|
||||||
|
CreateTables(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitAdapter(createDatabase bool) {
|
func InitAdapter() {
|
||||||
adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName"))
|
adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateTables(createDatabase bool) {
|
||||||
if createDatabase {
|
if createDatabase {
|
||||||
adapter.CreateDatabase()
|
adapter.CreateDatabase()
|
||||||
}
|
}
|
||||||
@ -222,6 +225,11 @@ func (a *Adapter) createTable() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = a.Engine.Sync2(new(Session))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetSession(owner string, offset, limit int, field, value, sortField, sortOrder string) *xorm.Session {
|
func GetSession(owner string, offset, limit int, field, value, sortField, sortOrder string) *xorm.Session {
|
||||||
@ -247,22 +255,3 @@ func GetSession(owner string, offset, limit int, field, value, sortField, sortOr
|
|||||||
}
|
}
|
||||||
return session
|
return session
|
||||||
}
|
}
|
||||||
|
|
||||||
func initMigrations() {
|
|
||||||
migrations := []*migrate.Migration{
|
|
||||||
{
|
|
||||||
ID: "20221015CasbinRule--fill ptype field with p",
|
|
||||||
Migrate: func(tx *xorm.Engine) error {
|
|
||||||
_, err := tx.Cols("ptype").Update(&xormadapter.CasbinRule{
|
|
||||||
Ptype: "p",
|
|
||||||
})
|
|
||||||
return err
|
|
||||||
},
|
|
||||||
Rollback: func(tx *xorm.Engine) error {
|
|
||||||
return tx.DropTables(&xormadapter.CasbinRule{})
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
m := migrate.New(adapter.Engine, migrate.DefaultOptions, migrations)
|
|
||||||
m.Migrate()
|
|
||||||
}
|
|
||||||
|
@ -16,12 +16,12 @@ package object
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/idp"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SignupItem struct {
|
type SignupItem struct {
|
||||||
@ -50,28 +50,31 @@ type Application struct {
|
|||||||
EnableCodeSignin bool `json:"enableCodeSignin"`
|
EnableCodeSignin bool `json:"enableCodeSignin"`
|
||||||
EnableSamlCompress bool `json:"enableSamlCompress"`
|
EnableSamlCompress bool `json:"enableSamlCompress"`
|
||||||
EnableWebAuthn bool `json:"enableWebAuthn"`
|
EnableWebAuthn bool `json:"enableWebAuthn"`
|
||||||
|
EnableLinkWithEmail bool `json:"enableLinkWithEmail"`
|
||||||
|
SamlReplyUrl string `xorm:"varchar(100)" json:"samlReplyUrl"`
|
||||||
Providers []*ProviderItem `xorm:"mediumtext" json:"providers"`
|
Providers []*ProviderItem `xorm:"mediumtext" json:"providers"`
|
||||||
SignupItems []*SignupItem `xorm:"varchar(1000)" json:"signupItems"`
|
SignupItems []*SignupItem `xorm:"varchar(1000)" json:"signupItems"`
|
||||||
GrantTypes []string `xorm:"varchar(1000)" json:"grantTypes"`
|
GrantTypes []string `xorm:"varchar(1000)" json:"grantTypes"`
|
||||||
OrganizationObj *Organization `xorm:"-" json:"organizationObj"`
|
OrganizationObj *Organization `xorm:"-" json:"organizationObj"`
|
||||||
|
|
||||||
ClientId string `xorm:"varchar(100)" json:"clientId"`
|
ClientId string `xorm:"varchar(100)" json:"clientId"`
|
||||||
ClientSecret string `xorm:"varchar(100)" json:"clientSecret"`
|
ClientSecret string `xorm:"varchar(100)" json:"clientSecret"`
|
||||||
RedirectUris []string `xorm:"varchar(1000)" json:"redirectUris"`
|
RedirectUris []string `xorm:"varchar(1000)" json:"redirectUris"`
|
||||||
TokenFormat string `xorm:"varchar(100)" json:"tokenFormat"`
|
TokenFormat string `xorm:"varchar(100)" json:"tokenFormat"`
|
||||||
ExpireInHours int `json:"expireInHours"`
|
ExpireInHours int `json:"expireInHours"`
|
||||||
RefreshExpireInHours int `json:"refreshExpireInHours"`
|
RefreshExpireInHours int `json:"refreshExpireInHours"`
|
||||||
SignupUrl string `xorm:"varchar(200)" json:"signupUrl"`
|
SignupUrl string `xorm:"varchar(200)" json:"signupUrl"`
|
||||||
SigninUrl string `xorm:"varchar(200)" json:"signinUrl"`
|
SigninUrl string `xorm:"varchar(200)" json:"signinUrl"`
|
||||||
ForgetUrl string `xorm:"varchar(200)" json:"forgetUrl"`
|
ForgetUrl string `xorm:"varchar(200)" json:"forgetUrl"`
|
||||||
AffiliationUrl string `xorm:"varchar(100)" json:"affiliationUrl"`
|
AffiliationUrl string `xorm:"varchar(100)" json:"affiliationUrl"`
|
||||||
TermsOfUse string `xorm:"varchar(100)" json:"termsOfUse"`
|
TermsOfUse string `xorm:"varchar(100)" json:"termsOfUse"`
|
||||||
SignupHtml string `xorm:"mediumtext" json:"signupHtml"`
|
SignupHtml string `xorm:"mediumtext" json:"signupHtml"`
|
||||||
SigninHtml string `xorm:"mediumtext" json:"signinHtml"`
|
SigninHtml string `xorm:"mediumtext" json:"signinHtml"`
|
||||||
FormCss string `xorm:"text" json:"formCss"`
|
ThemeData *ThemeData `xorm:"json" json:"themeData"`
|
||||||
FormOffset int `json:"formOffset"`
|
FormCss string `xorm:"text" json:"formCss"`
|
||||||
FormSideHtml string `xorm:"mediumtext" json:"formSideHtml"`
|
FormOffset int `json:"formOffset"`
|
||||||
FormBackgroundUrl string `xorm:"varchar(200)" json:"formBackgroundUrl"`
|
FormSideHtml string `xorm:"mediumtext" json:"formSideHtml"`
|
||||||
|
FormBackgroundUrl string `xorm:"varchar(200)" json:"formBackgroundUrl"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetApplicationCount(owner, field, value string) int {
|
func GetApplicationCount(owner, field, value string) int {
|
||||||
@ -84,6 +87,16 @@ func GetApplicationCount(owner, field, value string) int {
|
|||||||
return int(count)
|
return int(count)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetOrganizationApplicationCount(owner, Organization, field, value string) int {
|
||||||
|
session := GetSession(owner, -1, -1, field, value, "", "")
|
||||||
|
count, err := session.Count(&Application{Organization: Organization})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return int(count)
|
||||||
|
}
|
||||||
|
|
||||||
func GetApplications(owner string) []*Application {
|
func GetApplications(owner string) []*Application {
|
||||||
applications := []*Application{}
|
applications := []*Application{}
|
||||||
err := adapter.Engine.Desc("created_time").Find(&applications, &Application{Owner: owner})
|
err := adapter.Engine.Desc("created_time").Find(&applications, &Application{Owner: owner})
|
||||||
@ -94,8 +107,18 @@ func GetApplications(owner string) []*Application {
|
|||||||
return applications
|
return applications
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetPaginationApplications(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Application {
|
func GetOrganizationApplications(owner string, organization string) []*Application {
|
||||||
applications := []*Application{}
|
applications := []*Application{}
|
||||||
|
err := adapter.Engine.Desc("created_time").Find(&applications, &Application{Owner: owner, Organization: organization})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return applications
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetPaginationApplications(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Application {
|
||||||
|
var applications []*Application
|
||||||
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
|
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
|
||||||
err := session.Find(&applications)
|
err := session.Find(&applications)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -105,9 +128,10 @@ func GetPaginationApplications(owner string, offset, limit int, field, value, so
|
|||||||
return applications
|
return applications
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetApplicationsByOrganizationName(owner string, organization string) []*Application {
|
func GetPaginationOrganizationApplications(owner, organization string, offset, limit int, field, value, sortField, sortOrder string) []*Application {
|
||||||
applications := []*Application{}
|
applications := []*Application{}
|
||||||
err := adapter.Engine.Desc("created_time").Find(&applications, &Application{Owner: owner, Organization: organization})
|
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
|
||||||
|
err := session.Find(&applications, &Application{Owner: owner, Organization: organization})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -119,9 +143,11 @@ func getProviderMap(owner string) map[string]*Provider {
|
|||||||
providers := GetProviders(owner)
|
providers := GetProviders(owner)
|
||||||
m := map[string]*Provider{}
|
m := map[string]*Provider{}
|
||||||
for _, provider := range providers {
|
for _, provider := range providers {
|
||||||
//if provider.Category != "OAuth" {
|
// Get QRCode only once
|
||||||
// continue
|
if provider.Type == "WeChat" && provider.DisableSsl == true && provider.Content == "" {
|
||||||
//}
|
provider.Content, _ = idp.GetWechatOfficialAccountQRCode(provider.ClientId2, provider.ClientSecret2)
|
||||||
|
UpdateProvider(provider.Owner+"/"+provider.Name, provider)
|
||||||
|
}
|
||||||
|
|
||||||
m[provider.Name] = GetMaskedProvider(provider)
|
m[provider.Name] = GetMaskedProvider(provider)
|
||||||
}
|
}
|
||||||
@ -129,7 +155,7 @@ func getProviderMap(owner string) map[string]*Provider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func extendApplicationWithProviders(application *Application) {
|
func extendApplicationWithProviders(application *Application) {
|
||||||
m := getProviderMap(application.Owner)
|
m := getProviderMap(application.Organization)
|
||||||
for _, providerItem := range application.Providers {
|
for _, providerItem := range application.Providers {
|
||||||
if provider, ok := m[providerItem.Name]; ok {
|
if provider, ok := m[providerItem.Name]; ok {
|
||||||
providerItem.Provider = provider
|
providerItem.Provider = provider
|
||||||
@ -262,7 +288,8 @@ func GetMaskedApplications(applications []*Application, userId string) []*Applic
|
|||||||
|
|
||||||
func UpdateApplication(id string, application *Application) bool {
|
func UpdateApplication(id string, application *Application) bool {
|
||||||
owner, name := util.GetOwnerAndNameFromId(id)
|
owner, name := util.GetOwnerAndNameFromId(id)
|
||||||
if getApplication(owner, name) == nil {
|
oldApplication := getApplication(owner, name)
|
||||||
|
if oldApplication == nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -277,6 +304,10 @@ func UpdateApplication(id string, application *Application) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if oldApplication.ClientId != application.ClientId && GetApplicationByClientId(application.ClientId) != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
for _, providerItem := range application.Providers {
|
for _, providerItem := range application.Providers {
|
||||||
providerItem.Provider = nil
|
providerItem.Provider = nil
|
||||||
}
|
}
|
||||||
@ -300,6 +331,9 @@ func AddApplication(application *Application) bool {
|
|||||||
if application.ClientSecret == "" {
|
if application.ClientSecret == "" {
|
||||||
application.ClientSecret = util.GenerateClientSecret()
|
application.ClientSecret = util.GenerateClientSecret()
|
||||||
}
|
}
|
||||||
|
if GetApplicationByClientId(application.ClientId) != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
for _, providerItem := range application.Providers {
|
for _, providerItem := range application.Providers {
|
||||||
providerItem.Provider = nil
|
providerItem.Provider = nil
|
||||||
}
|
}
|
||||||
@ -329,56 +363,30 @@ func (application *Application) GetId() string {
|
|||||||
return fmt.Sprintf("%s/%s", application.Owner, application.Name)
|
return fmt.Sprintf("%s/%s", application.Owner, application.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckRedirectUriValid(application *Application, redirectUri string) bool {
|
func (application *Application) IsRedirectUriValid(redirectUri string) bool {
|
||||||
validUri := false
|
isValid := false
|
||||||
for _, tmpUri := range application.RedirectUris {
|
for _, targetUri := range application.RedirectUris {
|
||||||
tmpUriRegex := regexp.MustCompile(tmpUri)
|
targetUriRegex := regexp.MustCompile(targetUri)
|
||||||
if tmpUriRegex.MatchString(redirectUri) || strings.Contains(redirectUri, tmpUri) {
|
if targetUriRegex.MatchString(redirectUri) || strings.Contains(redirectUri, targetUri) {
|
||||||
validUri = true
|
isValid = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return validUri
|
return isValid
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsAllowOrigin(origin string) bool {
|
func IsOriginAllowed(origin string) bool {
|
||||||
allowOrigin := false
|
applications := GetApplications("")
|
||||||
originUrl, err := url.Parse(origin)
|
for _, application := range applications {
|
||||||
if err != nil {
|
if application.IsRedirectUriValid(origin) {
|
||||||
return false
|
return true
|
||||||
}
|
|
||||||
|
|
||||||
rows, err := adapter.Engine.Cols("redirect_uris").Rows(&Application{})
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
application := Application{}
|
|
||||||
for rows.Next() {
|
|
||||||
err := rows.Scan(&application)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
for _, tmpRedirectUri := range application.RedirectUris {
|
|
||||||
u1, err := url.Parse(tmpRedirectUri)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if u1.Scheme == originUrl.Scheme && u1.Host == originUrl.Host {
|
|
||||||
allowOrigin = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if allowOrigin {
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return false
|
||||||
return allowOrigin
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getApplicationMap(organization string) map[string]*Application {
|
func getApplicationMap(organization string) map[string]*Application {
|
||||||
applications := GetApplicationsByOrganizationName("admin", organization)
|
applications := GetOrganizationApplications("admin", organization)
|
||||||
|
|
||||||
applicationMap := make(map[string]*Application)
|
applicationMap := make(map[string]*Application)
|
||||||
for _, application := range applications {
|
for _, application := range applications {
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
package object
|
package object
|
||||||
|
|
||||||
func (application *Application) GetProviderByCategory(category string) *Provider {
|
func (application *Application) GetProviderByCategory(category string) *Provider {
|
||||||
providers := GetProviders(application.Owner)
|
providers := GetProviders(application.Organization)
|
||||||
m := map[string]*Provider{}
|
m := map[string]*Provider{}
|
||||||
for _, provider := range providers {
|
for _, provider := range providers {
|
||||||
if provider.Category != category {
|
if provider.Category != category {
|
||||||
|
@ -60,7 +60,7 @@ func getPermanentAvatarUrl(organization string, username string, url string, upl
|
|||||||
}
|
}
|
||||||
|
|
||||||
fullFilePath := fmt.Sprintf("/avatar/%s/%s.png", organization, username)
|
fullFilePath := fmt.Sprintf("/avatar/%s/%s.png", organization, username)
|
||||||
uploadedFileUrl, _ := getUploadFileUrl(defaultStorageProvider, fullFilePath, false)
|
uploadedFileUrl, _ := GetUploadFileUrl(defaultStorageProvider, fullFilePath, false)
|
||||||
|
|
||||||
if upload {
|
if upload {
|
||||||
DownloadAndUpload(url, fullFilePath)
|
DownloadAndUpload(url, fullFilePath)
|
||||||
|
@ -20,9 +20,9 @@ import (
|
|||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v3"
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CasbinAdapter struct {
|
type CasbinAdapter struct {
|
||||||
@ -148,34 +148,7 @@ func (casbinAdapter *CasbinAdapter) getTable() string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func safeReturn(policy []string, i int) string {
|
func initEnforcer(modelObj *Model, casbinAdapter *CasbinAdapter) (*casbin.Enforcer, error) {
|
||||||
if len(policy) > i {
|
|
||||||
return policy[i]
|
|
||||||
} else {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func matrixToCasbinRules(pType string, policies [][]string) []*xormadapter.CasbinRule {
|
|
||||||
res := []*xormadapter.CasbinRule{}
|
|
||||||
|
|
||||||
for _, policy := range policies {
|
|
||||||
line := xormadapter.CasbinRule{
|
|
||||||
Ptype: pType,
|
|
||||||
V0: safeReturn(policy, 0),
|
|
||||||
V1: safeReturn(policy, 1),
|
|
||||||
V2: safeReturn(policy, 2),
|
|
||||||
V3: safeReturn(policy, 3),
|
|
||||||
V4: safeReturn(policy, 4),
|
|
||||||
V5: safeReturn(policy, 5),
|
|
||||||
}
|
|
||||||
res = append(res, &line)
|
|
||||||
}
|
|
||||||
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
func SyncPolicies(casbinAdapter *CasbinAdapter) []*xormadapter.CasbinRule {
|
|
||||||
// init Adapter
|
// init Adapter
|
||||||
if casbinAdapter.Adapter == nil {
|
if casbinAdapter.Adapter == nil {
|
||||||
var dataSourceName string
|
var dataSourceName string
|
||||||
@ -191,20 +164,60 @@ func SyncPolicies(casbinAdapter *CasbinAdapter) []*xormadapter.CasbinRule {
|
|||||||
dataSourceName = strings.ReplaceAll(dataSourceName, "dbi.", "db.")
|
dataSourceName = strings.ReplaceAll(dataSourceName, "dbi.", "db.")
|
||||||
}
|
}
|
||||||
|
|
||||||
casbinAdapter.Adapter, _ = xormadapter.NewAdapterByEngineWithTableName(NewAdapter(casbinAdapter.DatabaseType, dataSourceName, casbinAdapter.Database).Engine, casbinAdapter.getTable(), "")
|
var err error
|
||||||
|
casbinAdapter.Adapter, err = xormadapter.NewAdapterByEngineWithTableName(NewAdapter(casbinAdapter.DatabaseType, dataSourceName, casbinAdapter.Database).Engine, casbinAdapter.getTable(), "")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// init Model
|
// init Model
|
||||||
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
|
||||||
m, err := model.NewModelFromString(modelObj.ModelText)
|
m, err := model.NewModelFromString(modelObj.ModelText)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// init Enforcer
|
// init Enforcer
|
||||||
enforcer, err := casbin.NewEnforcer(m, casbinAdapter.Adapter)
|
enforcer, err := casbin.NewEnforcer(m, casbinAdapter.Adapter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return enforcer, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func safeReturn(policy []string, i int) string {
|
||||||
|
if len(policy) > i {
|
||||||
|
return policy[i]
|
||||||
|
} else {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func matrixToCasbinRules(Ptype string, policies [][]string) []*xormadapter.CasbinRule {
|
||||||
|
res := []*xormadapter.CasbinRule{}
|
||||||
|
|
||||||
|
for _, policy := range policies {
|
||||||
|
line := xormadapter.CasbinRule{
|
||||||
|
Ptype: Ptype,
|
||||||
|
V0: safeReturn(policy, 0),
|
||||||
|
V1: safeReturn(policy, 1),
|
||||||
|
V2: safeReturn(policy, 2),
|
||||||
|
V3: safeReturn(policy, 3),
|
||||||
|
V4: safeReturn(policy, 4),
|
||||||
|
V5: safeReturn(policy, 5),
|
||||||
|
}
|
||||||
|
res = append(res, &line)
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func SyncPolicies(casbinAdapter *CasbinAdapter) ([]*xormadapter.CasbinRule, error) {
|
||||||
|
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
||||||
|
enforcer, err := initEnforcer(modelObj, casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
policies := matrixToCasbinRules("p", enforcer.GetPolicy())
|
policies := matrixToCasbinRules("p", enforcer.GetPolicy())
|
||||||
@ -212,5 +225,48 @@ func SyncPolicies(casbinAdapter *CasbinAdapter) []*xormadapter.CasbinRule {
|
|||||||
policies = append(policies, matrixToCasbinRules("g", enforcer.GetGroupingPolicy())...)
|
policies = append(policies, matrixToCasbinRules("g", enforcer.GetGroupingPolicy())...)
|
||||||
}
|
}
|
||||||
|
|
||||||
return policies
|
return policies, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdatePolicy(oldPolicy, newPolicy []string, casbinAdapter *CasbinAdapter) (bool, error) {
|
||||||
|
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
||||||
|
enforcer, err := initEnforcer(modelObj, casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := enforcer.UpdatePolicy(oldPolicy, newPolicy)
|
||||||
|
if err != nil {
|
||||||
|
return affected, err
|
||||||
|
}
|
||||||
|
return affected, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func AddPolicy(policy []string, casbinAdapter *CasbinAdapter) (bool, error) {
|
||||||
|
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
||||||
|
enforcer, err := initEnforcer(modelObj, casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := enforcer.AddPolicy(policy)
|
||||||
|
if err != nil {
|
||||||
|
return affected, err
|
||||||
|
}
|
||||||
|
return affected, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func RemovePolicy(policy []string, casbinAdapter *CasbinAdapter) (bool, error) {
|
||||||
|
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
||||||
|
enforcer, err := initEnforcer(modelObj, casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := enforcer.RemovePolicy(policy)
|
||||||
|
if err != nil {
|
||||||
|
return affected, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return affected, nil
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Cert struct {
|
type Cert struct {
|
||||||
|
116
object/check.go
116
object/check.go
@ -42,89 +42,91 @@ func init() {
|
|||||||
reFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
|
reFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckUserSignup(application *Application, organization *Organization, username string, password string, displayName string, firstName string, lastName string, email string, phone string, affiliation string, lang string) string {
|
func CheckUserSignup(application *Application, organization *Organization, username string, password string, displayName string, firstName string, lastName string, email string, phone string, countryCode string, affiliation string, lang string) string {
|
||||||
if organization == nil {
|
if organization == nil {
|
||||||
return i18n.Translate(lang, "OrgErr.DoNotExist")
|
return i18n.Translate(lang, "check:Organization does not exist")
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Username") {
|
if application.IsSignupItemVisible("Username") {
|
||||||
if len(username) <= 1 {
|
if len(username) <= 1 {
|
||||||
return i18n.Translate(lang, "UserErr.NameLessThanTwoCharacters")
|
return i18n.Translate(lang, "check:Username must have at least 2 characters")
|
||||||
}
|
}
|
||||||
if unicode.IsDigit(rune(username[0])) {
|
if unicode.IsDigit(rune(username[0])) {
|
||||||
return i18n.Translate(lang, "UserErr.NameStartWithADigitErr")
|
return i18n.Translate(lang, "check:Username cannot start with a digit")
|
||||||
}
|
}
|
||||||
if util.IsEmailValid(username) {
|
if util.IsEmailValid(username) {
|
||||||
return i18n.Translate(lang, "UserErr.NameIsEmailErr")
|
return i18n.Translate(lang, "check:Username cannot be an email address")
|
||||||
}
|
}
|
||||||
if reWhiteSpace.MatchString(username) {
|
if reWhiteSpace.MatchString(username) {
|
||||||
return i18n.Translate(lang, "UserErr.NameCantainWhitSpaceErr")
|
return i18n.Translate(lang, "check:Username cannot contain white spaces")
|
||||||
}
|
}
|
||||||
msg := CheckUsername(username, lang)
|
|
||||||
if msg != "" {
|
if msg := CheckUsername(username, lang); msg != "" {
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "name", username) {
|
if HasUserByField(organization.Name, "name", username) {
|
||||||
return i18n.Translate(lang, "UserErr.NameExistedErr")
|
return i18n.Translate(lang, "check:Username already exists")
|
||||||
}
|
}
|
||||||
if HasUserByField(organization.Name, "email", email) {
|
if HasUserByField(organization.Name, "email", email) {
|
||||||
return i18n.Translate(lang, "EmailErr.ExistedErr")
|
return i18n.Translate(lang, "check:Email already exists")
|
||||||
}
|
}
|
||||||
if HasUserByField(organization.Name, "phone", phone) {
|
if HasUserByField(organization.Name, "phone", phone) {
|
||||||
return i18n.Translate(lang, "PhoneErr.ExistedErr")
|
return i18n.Translate(lang, "check:Phone already exists")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(password) <= 5 {
|
if len(password) <= 5 {
|
||||||
return i18n.Translate(lang, "UserErr.PasswordLessThanSixCharacters")
|
return i18n.Translate(lang, "check:Password must have at least 6 characters")
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Email") {
|
if application.IsSignupItemVisible("Email") {
|
||||||
if email == "" {
|
if email == "" {
|
||||||
if application.IsSignupItemRequired("Email") {
|
if application.IsSignupItemRequired("Email") {
|
||||||
return i18n.Translate(lang, "EmailErr.EmptyErr")
|
return i18n.Translate(lang, "check:Email cannot be empty")
|
||||||
} else {
|
} else {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "email", email) {
|
if HasUserByField(organization.Name, "email", email) {
|
||||||
return i18n.Translate(lang, "EmailErr.ExistedErr")
|
return i18n.Translate(lang, "check:Email already exists")
|
||||||
} else if !util.IsEmailValid(email) {
|
} else if !util.IsEmailValid(email) {
|
||||||
return i18n.Translate(lang, "EmailErr.EmailInvalid")
|
return i18n.Translate(lang, "check:Email is invalid")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Phone") {
|
if application.IsSignupItemVisible("Phone") {
|
||||||
if phone == "" {
|
if phone == "" {
|
||||||
if application.IsSignupItemRequired("Phone") {
|
if application.IsSignupItemRequired("Phone") {
|
||||||
return i18n.Translate(lang, "PhoneErr.EmptyErr")
|
return i18n.Translate(lang, "check:Phone cannot be empty")
|
||||||
} else {
|
} else {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "phone", phone) {
|
if HasUserByField(organization.Name, "phone", phone) {
|
||||||
return i18n.Translate(lang, "PhoneErr.ExistedErr")
|
return i18n.Translate(lang, "check:Phone already exists")
|
||||||
} else if organization.PhonePrefix == "86" && !util.IsPhoneCnValid(phone) {
|
} else if !util.IsPhoneAllowInRegin(countryCode, organization.CountryCodes) {
|
||||||
return i18n.Translate(lang, "PhoneErr.NumberInvalid")
|
return i18n.Translate(lang, "check:Your region is not allow to signup by phone")
|
||||||
|
} else if !util.IsPhoneValid(phone, countryCode) {
|
||||||
|
return i18n.Translate(lang, "check:Phone number is invalid")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Display name") {
|
if application.IsSignupItemVisible("Display name") {
|
||||||
if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
|
if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
|
||||||
if firstName == "" {
|
if firstName == "" {
|
||||||
return i18n.Translate(lang, "UserErr.FirstNameBlankErr")
|
return i18n.Translate(lang, "check:FirstName cannot be blank")
|
||||||
} else if lastName == "" {
|
} else if lastName == "" {
|
||||||
return i18n.Translate(lang, "UserErr.LastNameBlankErr")
|
return i18n.Translate(lang, "check:LastName cannot be blank")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if displayName == "" {
|
if displayName == "" {
|
||||||
return i18n.Translate(lang, "UserErr.DisplayNameBlankErr")
|
return i18n.Translate(lang, "check:DisplayName cannot be blank")
|
||||||
} else if application.GetSignupItemRule("Display name") == "Real name" {
|
} else if application.GetSignupItemRule("Display name") == "Real name" {
|
||||||
if !isValidRealName(displayName) {
|
if !isValidRealName(displayName) {
|
||||||
return i18n.Translate(lang, "UserErr.DisplayNameInvalid")
|
return i18n.Translate(lang, "check:DisplayName is not valid real name")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -132,7 +134,7 @@ func CheckUserSignup(application *Application, organization *Organization, usern
|
|||||||
|
|
||||||
if application.IsSignupItemVisible("Affiliation") {
|
if application.IsSignupItemVisible("Affiliation") {
|
||||||
if affiliation == "" {
|
if affiliation == "" {
|
||||||
return i18n.Translate(lang, "UserErr.AffiliationBlankErr")
|
return i18n.Translate(lang, "check:Affiliation cannot be blank")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,11 +145,11 @@ func checkSigninErrorTimes(user *User, lang string) string {
|
|||||||
if user.SigninWrongTimes >= SigninWrongTimesLimit {
|
if user.SigninWrongTimes >= SigninWrongTimesLimit {
|
||||||
lastSignWrongTime, _ := time.Parse(time.RFC3339, user.LastSigninWrongTime)
|
lastSignWrongTime, _ := time.Parse(time.RFC3339, user.LastSigninWrongTime)
|
||||||
passedTime := time.Now().UTC().Sub(lastSignWrongTime)
|
passedTime := time.Now().UTC().Sub(lastSignWrongTime)
|
||||||
seconds := int(LastSignWrongTimeDuration.Seconds() - passedTime.Seconds())
|
minutes := int(LastSignWrongTimeDuration.Minutes() - passedTime.Minutes())
|
||||||
|
|
||||||
// deny the login if the error times is greater than the limit and the last login time is less than the duration
|
// deny the login if the error times is greater than the limit and the last login time is less than the duration
|
||||||
if seconds > 0 {
|
if minutes > 0 {
|
||||||
return fmt.Sprintf(i18n.Translate(lang, "AuthErr.WrongPasswordManyTimes"), seconds/60, seconds%60)
|
return fmt.Sprintf(i18n.Translate(lang, "check:You have entered the wrong password or code too many times, please wait for %d minutes and try again"), minutes)
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset the error times
|
// reset the error times
|
||||||
@ -167,7 +169,7 @@ func CheckPassword(user *User, password string, lang string) string {
|
|||||||
|
|
||||||
organization := GetOrganizationByUser(user)
|
organization := GetOrganizationByUser(user)
|
||||||
if organization == nil {
|
if organization == nil {
|
||||||
return i18n.Translate(lang, "OrgErr.DoNotExist")
|
return i18n.Translate(lang, "check:Organization does not exist")
|
||||||
}
|
}
|
||||||
|
|
||||||
credManager := cred.GetCredManager(organization.PasswordType)
|
credManager := cred.GetCredManager(organization.PasswordType)
|
||||||
@ -184,9 +186,9 @@ func CheckPassword(user *User, password string, lang string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
return recordSigninErrorInfo(user)
|
return recordSigninErrorInfo(user, lang)
|
||||||
} else {
|
} else {
|
||||||
return fmt.Sprintf(i18n.Translate(lang, "LoginErr.UnsupportedPasswordType"), organization.PasswordType)
|
return fmt.Sprintf(i18n.Translate(lang, "check:unsupported password type: %s"), organization.PasswordType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -210,7 +212,7 @@ func checkLdapUserPassword(user *User, password string, lang string) (*User, str
|
|||||||
if len(searchResult.Entries) == 0 {
|
if len(searchResult.Entries) == 0 {
|
||||||
continue
|
continue
|
||||||
} else if len(searchResult.Entries) > 1 {
|
} else if len(searchResult.Entries) > 1 {
|
||||||
return nil, i18n.Translate(lang, "LdapErr.MultipleAccounts")
|
return nil, i18n.Translate(lang, "check:Multiple accounts with same uid, please check your ldap server")
|
||||||
}
|
}
|
||||||
|
|
||||||
dn := searchResult.Entries[0].DN
|
dn := searchResult.Entries[0].DN
|
||||||
@ -221,7 +223,7 @@ func checkLdapUserPassword(user *User, password string, lang string) (*User, str
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !ldapLoginSuccess {
|
if !ldapLoginSuccess {
|
||||||
return nil, i18n.Translate(lang, "LdapErr.PasswordWrong")
|
return nil, i18n.Translate(lang, "check:Ldap user name or password incorrect")
|
||||||
}
|
}
|
||||||
return user, ""
|
return user, ""
|
||||||
}
|
}
|
||||||
@ -229,11 +231,11 @@ func checkLdapUserPassword(user *User, password string, lang string) (*User, str
|
|||||||
func CheckUserPassword(organization string, username string, password string, lang string) (*User, string) {
|
func CheckUserPassword(organization string, username string, password string, lang string) (*User, string) {
|
||||||
user := GetUserByFields(organization, username)
|
user := GetUserByFields(organization, username)
|
||||||
if user == nil || user.IsDeleted == true {
|
if user == nil || user.IsDeleted == true {
|
||||||
return nil, i18n.Translate(lang, "UserErr.DoNotExistSignUp")
|
return nil, fmt.Sprintf(i18n.Translate(lang, "general:The user: %s doesn't exist"), util.GetId(organization, username))
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.IsForbidden {
|
if user.IsForbidden {
|
||||||
return nil, i18n.Translate(lang, "LoginErr.UserIsForbidden")
|
return nil, i18n.Translate(lang, "check:The user is forbidden to sign in, please contact the administrator")
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.Ldap != "" {
|
if user.Ldap != "" {
|
||||||
@ -254,13 +256,13 @@ func filterField(field string) bool {
|
|||||||
|
|
||||||
func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, lang string) (bool, error) {
|
func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, lang string) (bool, error) {
|
||||||
if requestUserId == "" {
|
if requestUserId == "" {
|
||||||
return false, fmt.Errorf(i18n.Translate(lang, "LoginErr.LoginFirst"))
|
return false, fmt.Errorf(i18n.Translate(lang, "general:Please login first"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if userId != "" {
|
if userId != "" {
|
||||||
targetUser := GetUser(userId)
|
targetUser := GetUser(userId)
|
||||||
if targetUser == nil {
|
if targetUser == nil {
|
||||||
return false, fmt.Errorf(i18n.Translate(lang, "UserErr.DoNotExist"), userId)
|
return false, fmt.Errorf(i18n.Translate(lang, "general:The user: %s doesn't exist"), userId)
|
||||||
}
|
}
|
||||||
|
|
||||||
userOwner = targetUser.Owner
|
userOwner = targetUser.Owner
|
||||||
@ -272,7 +274,7 @@ func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, l
|
|||||||
} else {
|
} else {
|
||||||
requestUser := GetUser(requestUserId)
|
requestUser := GetUser(requestUserId)
|
||||||
if requestUser == nil {
|
if requestUser == nil {
|
||||||
return false, fmt.Errorf(i18n.Translate(lang, "LoginErr.SessionOutdated"))
|
return false, fmt.Errorf(i18n.Translate(lang, "check:Session outdated, please login again"))
|
||||||
}
|
}
|
||||||
if requestUser.IsGlobalAdmin {
|
if requestUser.IsGlobalAdmin {
|
||||||
hasPermission = true
|
hasPermission = true
|
||||||
@ -287,7 +289,7 @@ func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, l
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return hasPermission, fmt.Errorf(i18n.Translate(lang, "LoginErr.NoPermission"))
|
return hasPermission, fmt.Errorf(i18n.Translate(lang, "auth:Unauthorized operation"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckAccessPermission(userId string, application *Application) (bool, error) {
|
func CheckAccessPermission(userId string, application *Application) (bool, error) {
|
||||||
@ -313,8 +315,9 @@ func CheckAccessPermission(userId string, application *Application) (bool, error
|
|||||||
return true, err
|
return true, err
|
||||||
}
|
}
|
||||||
enforcer := getEnforcer(permission)
|
enforcer := getEnforcer(permission)
|
||||||
allowed, err = enforcer.Enforce(userId, application.Name, "read")
|
if allowed, err = enforcer.Enforce(userId, application.Name, "read"); allowed {
|
||||||
break
|
return allowed, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return allowed, err
|
return allowed, err
|
||||||
@ -322,9 +325,9 @@ func CheckAccessPermission(userId string, application *Application) (bool, error
|
|||||||
|
|
||||||
func CheckUsername(username string, lang string) string {
|
func CheckUsername(username string, lang string) string {
|
||||||
if username == "" {
|
if username == "" {
|
||||||
return i18n.Translate(lang, "UserErr.NameEmptyErr")
|
return i18n.Translate(lang, "check:Empty username.")
|
||||||
} else if len(username) > 39 {
|
} else if len(username) > 39 {
|
||||||
return i18n.Translate(lang, "UserErr.NameTooLang")
|
return i18n.Translate(lang, "check:Username is too long (maximum is 39 characters).")
|
||||||
}
|
}
|
||||||
|
|
||||||
exclude, _ := regexp.Compile("^[\u0021-\u007E]+$")
|
exclude, _ := regexp.Compile("^[\u0021-\u007E]+$")
|
||||||
@ -335,7 +338,34 @@ func CheckUsername(username string, lang string) string {
|
|||||||
// https://stackoverflow.com/questions/58726546/github-username-convention-using-regex
|
// https://stackoverflow.com/questions/58726546/github-username-convention-using-regex
|
||||||
re, _ := regexp.Compile("^[a-zA-Z0-9]+((?:-[a-zA-Z0-9]+)|(?:_[a-zA-Z0-9]+))*$")
|
re, _ := regexp.Compile("^[a-zA-Z0-9]+((?:-[a-zA-Z0-9]+)|(?:_[a-zA-Z0-9]+))*$")
|
||||||
if !re.MatchString(username) {
|
if !re.MatchString(username) {
|
||||||
return i18n.Translate(lang, "UserErr.NameFormatErr")
|
return i18n.Translate(lang, "check:The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.")
|
||||||
|
}
|
||||||
|
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func CheckUpdateUser(oldUser *User, user *User, lang string) string {
|
||||||
|
if user.DisplayName == "" {
|
||||||
|
return i18n.Translate(lang, "user:Display name cannot be empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
if oldUser.Name != user.Name {
|
||||||
|
if msg := CheckUsername(user.Name, lang); msg != "" {
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
if HasUserByField(user.Owner, "name", user.Name) {
|
||||||
|
return i18n.Translate(lang, "check:Username already exists")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if oldUser.Email != user.Email {
|
||||||
|
if HasUserByField(user.Name, "email", user.Email) {
|
||||||
|
return i18n.Translate(lang, "check:Email already exists")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if oldUser.Phone != user.Phone {
|
||||||
|
if HasUserByField(user.Owner, "phone", user.Phone) {
|
||||||
|
return i18n.Translate(lang, "check:Phone already exists")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
|
@ -18,6 +18,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"regexp"
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
)
|
)
|
||||||
|
|
||||||
var reRealName *regexp.Regexp
|
var reRealName *regexp.Regexp
|
||||||
@ -43,7 +45,7 @@ func resetUserSigninErrorTimes(user *User) {
|
|||||||
UpdateUser(user.GetId(), user, []string{"signin_wrong_times", "last_signin_wrong_time"}, user.IsGlobalAdmin)
|
UpdateUser(user.GetId(), user, []string{"signin_wrong_times", "last_signin_wrong_time"}, user.IsGlobalAdmin)
|
||||||
}
|
}
|
||||||
|
|
||||||
func recordSigninErrorInfo(user *User) string {
|
func recordSigninErrorInfo(user *User, lang string) string {
|
||||||
// increase failed login count
|
// increase failed login count
|
||||||
user.SigninWrongTimes++
|
user.SigninWrongTimes++
|
||||||
|
|
||||||
@ -56,9 +58,9 @@ func recordSigninErrorInfo(user *User) string {
|
|||||||
UpdateUser(user.GetId(), user, []string{"signin_wrong_times", "last_signin_wrong_time"}, user.IsGlobalAdmin)
|
UpdateUser(user.GetId(), user, []string{"signin_wrong_times", "last_signin_wrong_time"}, user.IsGlobalAdmin)
|
||||||
leftChances := SigninWrongTimesLimit - user.SigninWrongTimes
|
leftChances := SigninWrongTimesLimit - user.SigninWrongTimes
|
||||||
if leftChances > 0 {
|
if leftChances > 0 {
|
||||||
return fmt.Sprintf("password is incorrect, you have %d remaining chances", leftChances)
|
return fmt.Sprintf(i18n.Translate(lang, "check:password or code is incorrect, you have %d remaining chances"), leftChances)
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't show the chance error message if the user has no chance left
|
// don't show the chance error message if the user has no chance left
|
||||||
return fmt.Sprintf("You have entered the wrong password too many times, please wait for %d minutes and try again", int(LastSignWrongTimeDuration.Minutes()))
|
return fmt.Sprintf(i18n.Translate(lang, "check:You have entered the wrong password or code too many times, please wait for %d minutes and try again"), int(LastSignWrongTimeDuration.Minutes()))
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ package object
|
|||||||
import (
|
import (
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
|
||||||
"github.com/go-gomail/gomail"
|
"github.com/casdoor/gomail/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getDialer(provider *Provider) *gomail.Dialer {
|
func getDialer(provider *Provider) *gomail.Dialer {
|
||||||
@ -45,6 +45,10 @@ func SendEmail(provider *Provider, title string, content string, dest string, se
|
|||||||
message.SetHeader("Subject", title)
|
message.SetHeader("Subject", title)
|
||||||
message.SetBody("text/html", content)
|
message.SetBody("text/html", content)
|
||||||
|
|
||||||
|
if provider.Type == "Mailtrap" {
|
||||||
|
message.SkipUsernameCheck = true
|
||||||
|
}
|
||||||
|
|
||||||
return dialer.DialAndSend(message)
|
return dialer.DialAndSend(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,8 +25,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func InitDb() {
|
func InitDb() {
|
||||||
MigratePermissionRule()
|
|
||||||
|
|
||||||
existed := initBuiltInOrganization()
|
existed := initBuiltInOrganization()
|
||||||
if !existed {
|
if !existed {
|
||||||
initBuiltInModel()
|
initBuiltInModel()
|
||||||
@ -55,9 +53,11 @@ func initBuiltInOrganization() bool {
|
|||||||
WebsiteUrl: "https://example.com",
|
WebsiteUrl: "https://example.com",
|
||||||
Favicon: fmt.Sprintf("%s/img/casbin/favicon.ico", conf.GetConfigString("staticBaseUrl")),
|
Favicon: fmt.Sprintf("%s/img/casbin/favicon.ico", conf.GetConfigString("staticBaseUrl")),
|
||||||
PasswordType: "plain",
|
PasswordType: "plain",
|
||||||
PhonePrefix: "86",
|
CountryCodes: []string{"CN"},
|
||||||
DefaultAvatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
|
DefaultAvatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
|
||||||
Tags: []string{},
|
Tags: []string{},
|
||||||
|
Languages: []string{"en", "zh", "es", "fr", "de", "ja", "ko", "ru"},
|
||||||
|
InitScore: 2000,
|
||||||
AccountItems: []*AccountItem{
|
AccountItems: []*AccountItem{
|
||||||
{Name: "Organization", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
{Name: "Organization", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
{Name: "ID", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},
|
{Name: "ID", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},
|
||||||
@ -68,6 +68,7 @@ func initBuiltInOrganization() bool {
|
|||||||
{Name: "Password", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
{Name: "Password", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
{Name: "Email", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Email", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Phone", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Phone", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "CountryCode", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
{Name: "Country/Region", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Country/Region", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Location", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Location", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Affiliation", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Affiliation", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
@ -109,6 +110,7 @@ func initBuiltInUser() {
|
|||||||
Avatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
|
Avatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
|
||||||
Email: "admin@example.com",
|
Email: "admin@example.com",
|
||||||
Phone: "12345678910",
|
Phone: "12345678910",
|
||||||
|
CountryCode: "CN",
|
||||||
Address: []string{},
|
Address: []string{},
|
||||||
Affiliation: "Example Inc.",
|
Affiliation: "Example Inc.",
|
||||||
Tag: "staff",
|
Tag: "staff",
|
||||||
@ -157,7 +159,7 @@ func initBuiltInApplication() {
|
|||||||
},
|
},
|
||||||
RedirectUris: []string{},
|
RedirectUris: []string{},
|
||||||
ExpireInHours: 168,
|
ExpireInHours: 168,
|
||||||
FormOffset: 8,
|
FormOffset: 2,
|
||||||
}
|
}
|
||||||
AddApplication(application)
|
AddApplication(application)
|
||||||
}
|
}
|
||||||
@ -221,7 +223,7 @@ func initBuiltInLdap() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func initBuiltInProvider() {
|
func initBuiltInProvider() {
|
||||||
provider := GetProvider("admin/provider_captcha_default")
|
provider := GetProvider(util.GetId("admin", "provider_captcha_default"))
|
||||||
if provider != nil {
|
if provider != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,15 @@ type InitData struct {
|
|||||||
Certs []*Cert `json:"certs"`
|
Certs []*Cert `json:"certs"`
|
||||||
Providers []*Provider `json:"providers"`
|
Providers []*Provider `json:"providers"`
|
||||||
Ldaps []*Ldap `json:"ldaps"`
|
Ldaps []*Ldap `json:"ldaps"`
|
||||||
|
Models []*Model `json:"models"`
|
||||||
|
Permissions []*Permission `json:"permissions"`
|
||||||
|
Payments []*Payment `json:"payments"`
|
||||||
|
Products []*Product `json:"products"`
|
||||||
|
Resources []*Resource `json:"resources"`
|
||||||
|
Roles []*Role `json:"roles"`
|
||||||
|
Syncers []*Syncer `json:"syncers"`
|
||||||
|
Tokens []*Token `json:"tokens"`
|
||||||
|
Webhooks []*Webhook `json:"webhooks"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitFromFile() {
|
func InitFromFile() {
|
||||||
@ -46,6 +55,33 @@ func InitFromFile() {
|
|||||||
for _, ldap := range initData.Ldaps {
|
for _, ldap := range initData.Ldaps {
|
||||||
initDefinedLdap(ldap)
|
initDefinedLdap(ldap)
|
||||||
}
|
}
|
||||||
|
for _, model := range initData.Models {
|
||||||
|
initDefinedModel(model)
|
||||||
|
}
|
||||||
|
for _, permission := range initData.Permissions {
|
||||||
|
initDefinedPermission(permission)
|
||||||
|
}
|
||||||
|
for _, payment := range initData.Payments {
|
||||||
|
initDefinedPayment(payment)
|
||||||
|
}
|
||||||
|
for _, product := range initData.Products {
|
||||||
|
initDefinedProduct(product)
|
||||||
|
}
|
||||||
|
for _, resource := range initData.Resources {
|
||||||
|
initDefinedResource(resource)
|
||||||
|
}
|
||||||
|
for _, role := range initData.Roles {
|
||||||
|
initDefinedRole(role)
|
||||||
|
}
|
||||||
|
for _, syncer := range initData.Syncers {
|
||||||
|
initDefinedSyncer(syncer)
|
||||||
|
}
|
||||||
|
for _, token := range initData.Tokens {
|
||||||
|
initDefinedToken(token)
|
||||||
|
}
|
||||||
|
for _, webhook := range initData.Webhooks {
|
||||||
|
initDefinedWebhook(webhook)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,6 +99,15 @@ func readInitDataFromFile(filePath string) *InitData {
|
|||||||
Certs: []*Cert{},
|
Certs: []*Cert{},
|
||||||
Providers: []*Provider{},
|
Providers: []*Provider{},
|
||||||
Ldaps: []*Ldap{},
|
Ldaps: []*Ldap{},
|
||||||
|
Models: []*Model{},
|
||||||
|
Permissions: []*Permission{},
|
||||||
|
Payments: []*Payment{},
|
||||||
|
Products: []*Product{},
|
||||||
|
Resources: []*Resource{},
|
||||||
|
Roles: []*Role{},
|
||||||
|
Syncers: []*Syncer{},
|
||||||
|
Tokens: []*Token{},
|
||||||
|
Webhooks: []*Webhook{},
|
||||||
}
|
}
|
||||||
err := util.JsonToStruct(s, data)
|
err := util.JsonToStruct(s, data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -89,6 +134,41 @@ func readInitDataFromFile(filePath string) *InitData {
|
|||||||
application.RedirectUris = []string{}
|
application.RedirectUris = []string{}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for _, permission := range data.Permissions {
|
||||||
|
if permission.Actions == nil {
|
||||||
|
permission.Actions = []string{}
|
||||||
|
}
|
||||||
|
if permission.Resources == nil {
|
||||||
|
permission.Resources = []string{}
|
||||||
|
}
|
||||||
|
if permission.Roles == nil {
|
||||||
|
permission.Roles = []string{}
|
||||||
|
}
|
||||||
|
if permission.Users == nil {
|
||||||
|
permission.Users = []string{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, role := range data.Roles {
|
||||||
|
if role.Roles == nil {
|
||||||
|
role.Roles = []string{}
|
||||||
|
}
|
||||||
|
if role.Users == nil {
|
||||||
|
role.Users = []string{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, syncer := range data.Syncers {
|
||||||
|
if syncer.TableColumns == nil {
|
||||||
|
syncer.TableColumns = []*TableColumn{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, webhook := range data.Webhooks {
|
||||||
|
if webhook.Events == nil {
|
||||||
|
webhook.Events = []string{}
|
||||||
|
}
|
||||||
|
if webhook.Headers == nil {
|
||||||
|
webhook.Headers = []*Header{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
@ -109,6 +189,7 @@ func initDefinedOrganization(organization *Organization) {
|
|||||||
{Name: "Password", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
{Name: "Password", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
{Name: "Email", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Email", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Phone", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Phone", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "CountryCode", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
{Name: "Country/Region", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Country/Region", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Location", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Location", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
{Name: "Affiliation", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
{Name: "Affiliation", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
@ -168,9 +249,90 @@ func initDefinedLdap(ldap *Ldap) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func initDefinedProvider(provider *Provider) {
|
func initDefinedProvider(provider *Provider) {
|
||||||
existed := GetProvider(provider.GetId())
|
existed := GetProvider(util.GetId("admin", provider.Name))
|
||||||
if existed != nil {
|
if existed != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
AddProvider(provider)
|
AddProvider(provider)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func initDefinedModel(model *Model) {
|
||||||
|
existed := GetModel(model.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
model.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddModel(model)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedPermission(permission *Permission) {
|
||||||
|
existed := GetPermission(permission.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
permission.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddPermission(permission)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedPayment(payment *Payment) {
|
||||||
|
existed := GetPayment(payment.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payment.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddPayment(payment)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedProduct(product *Product) {
|
||||||
|
existed := GetProduct(product.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
product.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddProduct(product)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedResource(resource *Resource) {
|
||||||
|
existed := GetResource(resource.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resource.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddResource(resource)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedRole(role *Role) {
|
||||||
|
existed := GetRole(role.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
role.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddRole(role)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedSyncer(syncer *Syncer) {
|
||||||
|
existed := GetSyncer(syncer.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
syncer.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddSyncer(syncer)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedToken(token *Token) {
|
||||||
|
existed := GetToken(token.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
token.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddToken(token)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initDefinedWebhook(webhook *Webhook) {
|
||||||
|
existed := GetWebhook(webhook.GetId())
|
||||||
|
if existed != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
webhook.CreatedTime = util.GetCurrentTime()
|
||||||
|
AddWebhook(webhook)
|
||||||
|
}
|
||||||
|
@ -329,7 +329,7 @@ func GetLdaps(owner string) []*Ldap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetLdap(id string) *Ldap {
|
func GetLdap(id string) *Ldap {
|
||||||
if util.IsStrsEmpty(id) {
|
if util.IsStringsEmpty(id) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
48
object/migrator.go
Normal file
48
object/migrator.go
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import "github.com/xorm-io/xorm/migrate"
|
||||||
|
|
||||||
|
type Migrator interface {
|
||||||
|
IsMigrationNeeded() bool
|
||||||
|
DoMigration() *migrate.Migration
|
||||||
|
}
|
||||||
|
|
||||||
|
func DoMigration() {
|
||||||
|
migrators := []Migrator{
|
||||||
|
&Migrator_1_101_0_PR_1083{},
|
||||||
|
&Migrator_1_235_0_PR_1530{},
|
||||||
|
&Migrator_1_240_0_PR_1539{},
|
||||||
|
&Migrator_1_245_0_PR_1557{},
|
||||||
|
// more migrators add here in chronological order...
|
||||||
|
}
|
||||||
|
|
||||||
|
migrations := []*migrate.Migration{}
|
||||||
|
|
||||||
|
for _, migrator := range migrators {
|
||||||
|
if migrator.IsMigrationNeeded() {
|
||||||
|
migrations = append(migrations, migrator.DoMigration())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
options := &migrate.Options{
|
||||||
|
TableName: "migration",
|
||||||
|
IDColumnName: "id",
|
||||||
|
}
|
||||||
|
|
||||||
|
m := migrate.New(adapter.Engine, options, migrations)
|
||||||
|
m.Migrate()
|
||||||
|
}
|
70
object/migrator_1_101_0_PR_1083.go
Normal file
70
object/migrator_1_101_0_PR_1083.go
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/xorm-io/xorm"
|
||||||
|
"github.com/xorm-io/xorm/migrate"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Migrator_1_101_0_PR_1083 struct{}
|
||||||
|
|
||||||
|
func (*Migrator_1_101_0_PR_1083) IsMigrationNeeded() bool {
|
||||||
|
exist1, _ := adapter.Engine.IsTableExist("model")
|
||||||
|
exist2, _ := adapter.Engine.IsTableExist("permission")
|
||||||
|
exist3, _ := adapter.Engine.IsTableExist("permission_rule")
|
||||||
|
|
||||||
|
if exist1 && exist2 && exist3 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*Migrator_1_101_0_PR_1083) DoMigration() *migrate.Migration {
|
||||||
|
migration := migrate.Migration{
|
||||||
|
ID: "20230209MigratePermissionRule--Use V5 instead of V1 to store permissionID",
|
||||||
|
Migrate: func(engine *xorm.Engine) error {
|
||||||
|
models := []*Model{}
|
||||||
|
err := engine.Table("model").Find(&models, &Model{})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
isHit := false
|
||||||
|
for _, model := range models {
|
||||||
|
if strings.Contains(model.ModelText, "permission") {
|
||||||
|
// update model table
|
||||||
|
model.ModelText = strings.Replace(model.ModelText, "permission,", "", -1)
|
||||||
|
UpdateModel(model.GetId(), model)
|
||||||
|
isHit = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if isHit {
|
||||||
|
// update permission_rule table
|
||||||
|
sql := "UPDATE `permission_rule`SET V0 = V1, V1 = V2, V2 = V3, V3 = V4, V4 = V5 WHERE V0 IN (SELECT CONCAT(owner, '/', name) AS permission_id FROM `permission`)"
|
||||||
|
_, err = engine.Exec(sql)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
return &migration
|
||||||
|
}
|
49
object/migrator_1_235_0_PR_1530.go
Normal file
49
object/migrator_1_235_0_PR_1530.go
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
|
"github.com/xorm-io/xorm"
|
||||||
|
"github.com/xorm-io/xorm/migrate"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Migrator_1_235_0_PR_1530 struct{}
|
||||||
|
|
||||||
|
func (*Migrator_1_235_0_PR_1530) IsMigrationNeeded() bool {
|
||||||
|
exist, _ := adapter.Engine.IsTableExist("casbin_rule")
|
||||||
|
|
||||||
|
if exist {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*Migrator_1_235_0_PR_1530) DoMigration() *migrate.Migration {
|
||||||
|
migration := migrate.Migration{
|
||||||
|
ID: "20221015CasbinRule--fill ptype field with p",
|
||||||
|
Migrate: func(engine *xorm.Engine) error {
|
||||||
|
_, err := engine.Cols("ptype").Update(&xormadapter.CasbinRule{
|
||||||
|
Ptype: "p",
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
Rollback: func(engine *xorm.Engine) error {
|
||||||
|
return engine.DropTables(&xormadapter.CasbinRule{})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
return &migration
|
||||||
|
}
|
141
object/migrator_1_240_0_PR_1539.go
Normal file
141
object/migrator_1_240_0_PR_1539.go
Normal file
@ -0,0 +1,141 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"github.com/xorm-io/xorm"
|
||||||
|
"github.com/xorm-io/xorm/migrate"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Migrator_1_240_0_PR_1539 struct{}
|
||||||
|
|
||||||
|
func (*Migrator_1_240_0_PR_1539) IsMigrationNeeded() bool {
|
||||||
|
exist, _ := adapter.Engine.IsTableExist("session")
|
||||||
|
err := adapter.Engine.Table("session").Find(&[]*Session{})
|
||||||
|
|
||||||
|
if exist && err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*Migrator_1_240_0_PR_1539) DoMigration() *migrate.Migration {
|
||||||
|
migration := migrate.Migration{
|
||||||
|
ID: "20230211MigrateSession--Create a new field 'application' for table `session`",
|
||||||
|
Migrate: func(engine *xorm.Engine) error {
|
||||||
|
if alreadyCreated, _ := engine.IsTableExist("session_tmp"); alreadyCreated {
|
||||||
|
return errors.New("there is already a table called 'session_tmp', please rename or delete it for casdoor version migration and restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
type oldSession struct {
|
||||||
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
|
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
||||||
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
|
|
||||||
|
SessionId []string `json:"sessionId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
tx := engine.NewSession()
|
||||||
|
|
||||||
|
defer tx.Close()
|
||||||
|
|
||||||
|
err := tx.Begin()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = tx.Table("session_tmp").CreateTable(&Session{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
oldSessions := []*oldSession{}
|
||||||
|
newSessions := []*Session{}
|
||||||
|
|
||||||
|
err = tx.Table("session").Find(&oldSessions)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, oldSession := range oldSessions {
|
||||||
|
newApplication := "null"
|
||||||
|
if oldSession.Owner == "built-in" {
|
||||||
|
newApplication = "app-built-in"
|
||||||
|
}
|
||||||
|
newSessions = append(newSessions, &Session{
|
||||||
|
Owner: oldSession.Owner,
|
||||||
|
Name: oldSession.Name,
|
||||||
|
Application: newApplication,
|
||||||
|
CreatedTime: oldSession.CreatedTime,
|
||||||
|
SessionId: oldSession.SessionId,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
rollbackFlag := false
|
||||||
|
_, err = tx.Table("session_tmp").Insert(newSessions)
|
||||||
|
count1, _ := tx.Table("session_tmp").Count()
|
||||||
|
count2, _ := tx.Table("session").Count()
|
||||||
|
|
||||||
|
if err != nil || count1 != count2 {
|
||||||
|
rollbackFlag = true
|
||||||
|
}
|
||||||
|
|
||||||
|
delete := &Session{
|
||||||
|
Application: "null",
|
||||||
|
}
|
||||||
|
_, err = tx.Table("session_tmp").Delete(*delete)
|
||||||
|
if err != nil {
|
||||||
|
rollbackFlag = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if rollbackFlag {
|
||||||
|
tx.DropTable("session_tmp")
|
||||||
|
return errors.New("there is something wrong with data migration for table `session`, if there is a table called `session_tmp` not created by you in casdoor, please drop it, then restart anyhow")
|
||||||
|
}
|
||||||
|
|
||||||
|
err = tx.DropTable("session")
|
||||||
|
if err != nil {
|
||||||
|
return errors.New("fail to drop table `session` for casdoor, please drop it and rename the table `session_tmp` to `session` manually and restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Already drop table `session`
|
||||||
|
// Can't find an api from xorm for altering table name
|
||||||
|
err = tx.Table("session").CreateTable(&Session{})
|
||||||
|
if err != nil {
|
||||||
|
return errors.New("there is something wrong with data migration for table `session`, please restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
sessions := []*Session{}
|
||||||
|
tx.Table("session_tmp").Find(&sessions)
|
||||||
|
_, err = tx.Table("session").Insert(sessions)
|
||||||
|
if err != nil {
|
||||||
|
return errors.New("there is something wrong with data migration for table `session`, please drop table `session` and rename table `session_tmp` to `session` and restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
err = tx.DropTable("session_tmp")
|
||||||
|
if err != nil {
|
||||||
|
return errors.New("fail to drop table `session_tmp` for casdoor, please drop it manually and restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
tx.Commit()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
return &migration
|
||||||
|
}
|
96
object/migrator_1_245_0_PR_1557.go
Normal file
96
object/migrator_1_245_0_PR_1557.go
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
|
"github.com/nyaruka/phonenumbers"
|
||||||
|
"github.com/xorm-io/xorm"
|
||||||
|
"github.com/xorm-io/xorm/migrate"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Migrator_1_245_0_PR_1557 struct{}
|
||||||
|
|
||||||
|
func (*Migrator_1_245_0_PR_1557) IsMigrationNeeded() bool {
|
||||||
|
exist, _ := adapter.Engine.IsTableExist("organization")
|
||||||
|
|
||||||
|
if exist {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*Migrator_1_245_0_PR_1557) DoMigration() *migrate.Migration {
|
||||||
|
migration := migrate.Migration{
|
||||||
|
ID: "20230215organization--transfer phonePrefix to defaultCountryCode, countryCodes",
|
||||||
|
Migrate: func(engine *xorm.Engine) error {
|
||||||
|
err := adapter.Engine.Sync2(new(Organization))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
organizations := []*Organization{}
|
||||||
|
err = engine.Table("organization").Find(&organizations, &Organization{})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, organization := range organizations {
|
||||||
|
organization.AccountItems = []*AccountItem{
|
||||||
|
{Name: "Organization", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "ID", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},
|
||||||
|
{Name: "Name", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "Display name", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Avatar", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "User type", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "Password", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
|
{Name: "Email", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Phone", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Country code", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "Country/Region", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Location", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Affiliation", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Title", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Homepage", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Bio", Visible: true, ViewRule: "Public", ModifyRule: "Self"},
|
||||||
|
{Name: "Tag", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "Signup application", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
|
||||||
|
{Name: "Roles", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},
|
||||||
|
{Name: "Permissions", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},
|
||||||
|
{Name: "3rd-party logins", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
|
{Name: "Properties", Visible: false, ViewRule: "Admin", ModifyRule: "Admin"},
|
||||||
|
{Name: "Is admin", Visible: true, ViewRule: "Admin", ModifyRule: "Admin"},
|
||||||
|
{Name: "Is global admin", Visible: true, ViewRule: "Admin", ModifyRule: "Admin"},
|
||||||
|
{Name: "Is forbidden", Visible: true, ViewRule: "Admin", ModifyRule: "Admin"},
|
||||||
|
{Name: "Is deleted", Visible: true, ViewRule: "Admin", ModifyRule: "Admin"},
|
||||||
|
{Name: "WebAuthn credentials", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
|
{Name: "Managed accounts", Visible: true, ViewRule: "Self", ModifyRule: "Self"},
|
||||||
|
}
|
||||||
|
sql := fmt.Sprintf("select phone_prefix from organization where owner='%s' and name='%s'", organization.Owner, organization.Name)
|
||||||
|
results, _ := engine.Query(sql)
|
||||||
|
|
||||||
|
phonePrefix := util.ParseInt(string(results[0]["phone_prefix"]))
|
||||||
|
organization.CountryCodes = []string{phonenumbers.GetRegionCodeForCountryCode(phonePrefix)}
|
||||||
|
|
||||||
|
UpdateOrganization(util.GetId(organization.Owner, organization.Name), organization)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
return &migration
|
||||||
|
}
|
@ -19,7 +19,7 @@ import (
|
|||||||
|
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Model struct {
|
type Model struct {
|
||||||
@ -68,14 +68,14 @@ func getModel(owner string, name string) *Model {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
model := Model{Owner: owner, Name: name}
|
m := Model{Owner: owner, Name: name}
|
||||||
existed, err := adapter.Engine.Get(&model)
|
existed, err := adapter.Engine.Get(&m)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if existed {
|
if existed {
|
||||||
return &model
|
return &m
|
||||||
} else {
|
} else {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -86,6 +86,17 @@ func GetModel(id string) *Model {
|
|||||||
return getModel(owner, name)
|
return getModel(owner, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func UpdateModelWithCheck(id string, modelObj *Model) error {
|
||||||
|
// check model grammar
|
||||||
|
_, err := model.NewModelFromString(modelObj.ModelText)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
UpdateModel(id, modelObj)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func UpdateModel(id string, modelObj *Model) bool {
|
func UpdateModel(id string, modelObj *Model) bool {
|
||||||
owner, name := util.GetOwnerAndNameFromId(id)
|
owner, name := util.GetOwnerAndNameFromId(id)
|
||||||
if getModel(owner, name) == nil {
|
if getModel(owner, name) == nil {
|
||||||
@ -98,11 +109,6 @@ func UpdateModel(id string, modelObj *Model) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// check model grammar
|
|
||||||
_, err := model.NewModelFromString(modelObj.ModelText)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(modelObj)
|
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(modelObj)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -152,3 +158,7 @@ func modelChangeTrigger(oldName string, newName string) error {
|
|||||||
|
|
||||||
return session.Commit()
|
return session.Commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func HasRoleDefinition(m model.Model) bool {
|
||||||
|
return m["g"] != nil
|
||||||
|
}
|
||||||
|
@ -40,6 +40,7 @@ type OidcDiscovery struct {
|
|||||||
ClaimsSupported []string `json:"claims_supported"`
|
ClaimsSupported []string `json:"claims_supported"`
|
||||||
RequestParameterSupported bool `json:"request_parameter_supported"`
|
RequestParameterSupported bool `json:"request_parameter_supported"`
|
||||||
RequestObjectSigningAlgValuesSupported []string `json:"request_object_signing_alg_values_supported"`
|
RequestObjectSigningAlgValuesSupported []string `json:"request_object_signing_alg_values_supported"`
|
||||||
|
EndSessionEndpoint string `json:"end_session_endpoint"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func getOriginFromHost(host string) (string, string) {
|
func getOriginFromHost(host string) (string, string) {
|
||||||
@ -76,7 +77,7 @@ func GetOidcDiscovery(host string) OidcDiscovery {
|
|||||||
JwksUri: fmt.Sprintf("%s/.well-known/jwks", originBackend),
|
JwksUri: fmt.Sprintf("%s/.well-known/jwks", originBackend),
|
||||||
IntrospectionEndpoint: fmt.Sprintf("%s/api/login/oauth/introspect", originBackend),
|
IntrospectionEndpoint: fmt.Sprintf("%s/api/login/oauth/introspect", originBackend),
|
||||||
ResponseTypesSupported: []string{"code", "token", "id_token", "code token", "code id_token", "token id_token", "code token id_token", "none"},
|
ResponseTypesSupported: []string{"code", "token", "id_token", "code token", "code id_token", "token id_token", "code token id_token", "none"},
|
||||||
ResponseModesSupported: []string{"login", "code", "link"},
|
ResponseModesSupported: []string{"query", "fragment", "login", "code", "link"},
|
||||||
GrantTypesSupported: []string{"password", "authorization_code"},
|
GrantTypesSupported: []string{"password", "authorization_code"},
|
||||||
SubjectTypesSupported: []string{"public"},
|
SubjectTypesSupported: []string{"public"},
|
||||||
IdTokenSigningAlgValuesSupported: []string{"RS256"},
|
IdTokenSigningAlgValuesSupported: []string{"RS256"},
|
||||||
@ -84,6 +85,7 @@ func GetOidcDiscovery(host string) OidcDiscovery {
|
|||||||
ClaimsSupported: []string{"iss", "ver", "sub", "aud", "iat", "exp", "id", "type", "displayName", "avatar", "permanentAvatar", "email", "phone", "location", "affiliation", "title", "homepage", "bio", "tag", "region", "language", "score", "ranking", "isOnline", "isAdmin", "isGlobalAdmin", "isForbidden", "signupApplication", "ldap"},
|
ClaimsSupported: []string{"iss", "ver", "sub", "aud", "iat", "exp", "id", "type", "displayName", "avatar", "permanentAvatar", "email", "phone", "location", "affiliation", "title", "homepage", "bio", "tag", "region", "language", "score", "ranking", "isOnline", "isAdmin", "isGlobalAdmin", "isForbidden", "signupApplication", "ldap"},
|
||||||
RequestParameterSupported: true,
|
RequestParameterSupported: true,
|
||||||
RequestObjectSigningAlgValuesSupported: []string{"HS256", "HS384", "HS512"},
|
RequestObjectSigningAlgValuesSupported: []string{"HS256", "HS384", "HS512"},
|
||||||
|
EndSessionEndpoint: fmt.Sprintf("%s/api/logout", originBackend),
|
||||||
}
|
}
|
||||||
|
|
||||||
return oidcDiscovery
|
return oidcDiscovery
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
"github.com/casdoor/casdoor/cred"
|
"github.com/casdoor/casdoor/cred"
|
||||||
"github.com/casdoor/casdoor/i18n"
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AccountItem struct {
|
type AccountItem struct {
|
||||||
@ -31,23 +31,34 @@ type AccountItem struct {
|
|||||||
ModifyRule string `json:"modifyRule"`
|
ModifyRule string `json:"modifyRule"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ThemeData struct {
|
||||||
|
ThemeType string `xorm:"varchar(30)" json:"themeType"`
|
||||||
|
ColorPrimary string `xorm:"varchar(10)" json:"colorPrimary"`
|
||||||
|
BorderRadius int `xorm:"int" json:"borderRadius"`
|
||||||
|
IsCompact bool `xorm:"bool" json:"isCompact"`
|
||||||
|
IsEnabled bool `xorm:"bool" json:"isEnabled"`
|
||||||
|
}
|
||||||
|
|
||||||
type Organization struct {
|
type Organization struct {
|
||||||
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
||||||
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
|
|
||||||
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
||||||
WebsiteUrl string `xorm:"varchar(100)" json:"websiteUrl"`
|
WebsiteUrl string `xorm:"varchar(100)" json:"websiteUrl"`
|
||||||
Favicon string `xorm:"varchar(100)" json:"favicon"`
|
Favicon string `xorm:"varchar(100)" json:"favicon"`
|
||||||
PasswordType string `xorm:"varchar(100)" json:"passwordType"`
|
PasswordType string `xorm:"varchar(100)" json:"passwordType"`
|
||||||
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
||||||
PhonePrefix string `xorm:"varchar(10)" json:"phonePrefix"`
|
CountryCodes []string `xorm:"varchar(200)" json:"countryCodes"`
|
||||||
DefaultAvatar string `xorm:"varchar(100)" json:"defaultAvatar"`
|
DefaultAvatar string `xorm:"varchar(100)" json:"defaultAvatar"`
|
||||||
DefaultApplication string `xorm:"varchar(100)" json:"defaultApplication"`
|
DefaultApplication string `xorm:"varchar(100)" json:"defaultApplication"`
|
||||||
Tags []string `xorm:"mediumtext" json:"tags"`
|
Tags []string `xorm:"mediumtext" json:"tags"`
|
||||||
MasterPassword string `xorm:"varchar(100)" json:"masterPassword"`
|
Languages []string `xorm:"varchar(255)" json:"languages"`
|
||||||
EnableSoftDeletion bool `json:"enableSoftDeletion"`
|
ThemeData *ThemeData `xorm:"json" json:"themeData"`
|
||||||
IsProfilePublic bool `json:"isProfilePublic"`
|
MasterPassword string `xorm:"varchar(100)" json:"masterPassword"`
|
||||||
|
InitScore int `json:"initScore"`
|
||||||
|
EnableSoftDeletion bool `json:"enableSoftDeletion"`
|
||||||
|
IsProfilePublic bool `json:"isProfilePublic"`
|
||||||
|
|
||||||
AccountItems []*AccountItem `xorm:"varchar(3000)" json:"accountItems"`
|
AccountItems []*AccountItem `xorm:"varchar(3000)" json:"accountItems"`
|
||||||
}
|
}
|
||||||
@ -202,15 +213,15 @@ func GetAccountItemByName(name string, organization *Organization) *AccountItem
|
|||||||
func CheckAccountItemModifyRule(accountItem *AccountItem, user *User, lang string) (bool, string) {
|
func CheckAccountItemModifyRule(accountItem *AccountItem, user *User, lang string) (bool, string) {
|
||||||
switch accountItem.ModifyRule {
|
switch accountItem.ModifyRule {
|
||||||
case "Admin":
|
case "Admin":
|
||||||
if !(user.IsAdmin || user.IsGlobalAdmin) {
|
if user == nil || !user.IsAdmin && !user.IsGlobalAdmin {
|
||||||
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.OnlyAdmin"), accountItem.Name)
|
return false, fmt.Sprintf(i18n.Translate(lang, "organization:Only admin can modify the %s."), accountItem.Name)
|
||||||
}
|
}
|
||||||
case "Immutable":
|
case "Immutable":
|
||||||
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.Immutable"), accountItem.Name)
|
return false, fmt.Sprintf(i18n.Translate(lang, "organization:The %s is immutable."), accountItem.Name)
|
||||||
case "Self":
|
case "Self":
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.UnknownModifyRule"), accountItem.ModifyRule)
|
return false, fmt.Sprintf(i18n.Translate(lang, "organization:Unknown modify rule %s."), accountItem.ModifyRule)
|
||||||
}
|
}
|
||||||
return true, ""
|
return true, ""
|
||||||
}
|
}
|
||||||
@ -222,7 +233,12 @@ func GetDefaultApplication(id string) (*Application, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if organization.DefaultApplication != "" {
|
if organization.DefaultApplication != "" {
|
||||||
return getApplication("admin", organization.DefaultApplication), fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication)
|
defaultApplication := getApplication("admin", organization.DefaultApplication)
|
||||||
|
if defaultApplication == nil {
|
||||||
|
return nil, fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication)
|
||||||
|
} else {
|
||||||
|
return defaultApplication, nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
applications := []*Application{}
|
applications := []*Application{}
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Payment struct {
|
type Payment struct {
|
||||||
@ -35,7 +35,7 @@ type Payment struct {
|
|||||||
ProductName string `xorm:"varchar(100)" json:"productName"`
|
ProductName string `xorm:"varchar(100)" json:"productName"`
|
||||||
ProductDisplayName string `xorm:"varchar(100)" json:"productDisplayName"`
|
ProductDisplayName string `xorm:"varchar(100)" json:"productDisplayName"`
|
||||||
|
|
||||||
Detail string `xorm:"varchar(100)" json:"detail"`
|
Detail string `xorm:"varchar(255)" json:"detail"`
|
||||||
Tag string `xorm:"varchar(100)" json:"tag"`
|
Tag string `xorm:"varchar(100)" json:"tag"`
|
||||||
Currency string `xorm:"varchar(100)" json:"currency"`
|
Currency string `xorm:"varchar(100)" json:"currency"`
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
|
@ -16,10 +16,9 @@ package object
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Permission struct {
|
type Permission struct {
|
||||||
@ -57,6 +56,40 @@ type PermissionRule struct {
|
|||||||
Id string `xorm:"varchar(100) index not null default ''" json:"id"`
|
Id string `xorm:"varchar(100) index not null default ''" json:"id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
builtInAvailableField = 5 // Casdoor built-in adapter, use V5 to filter permission, so has 5 available field
|
||||||
|
builtInAdapter = "permission_rule"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (p *Permission) GetId() string {
|
||||||
|
return util.GetId(p.Owner, p.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PermissionRule) GetRequest(adapterName string, permissionId string) ([]interface{}, error) {
|
||||||
|
request := []interface{}{p.V0, p.V1, p.V2}
|
||||||
|
|
||||||
|
if p.V3 != "" {
|
||||||
|
request = append(request, p.V3)
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.V4 != "" {
|
||||||
|
request = append(request, p.V4)
|
||||||
|
}
|
||||||
|
|
||||||
|
if adapterName == builtInAdapter {
|
||||||
|
if p.V5 != "" {
|
||||||
|
return nil, fmt.Errorf("too many parameters. The maximum parameter number cannot exceed %d", builtInAvailableField)
|
||||||
|
}
|
||||||
|
request = append(request, permissionId)
|
||||||
|
return request, nil
|
||||||
|
} else {
|
||||||
|
if p.V5 != "" {
|
||||||
|
request = append(request, p.V5)
|
||||||
|
}
|
||||||
|
return request, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func GetPermissionCount(owner, field, value string) int {
|
func GetPermissionCount(owner, field, value string) int {
|
||||||
session := GetSession(owner, -1, -1, field, value, "", "")
|
session := GetSession(owner, -1, -1, field, value, "", "")
|
||||||
count, err := session.Count(&Permission{})
|
count, err := session.Count(&Permission{})
|
||||||
@ -111,7 +144,33 @@ func GetPermission(id string) *Permission {
|
|||||||
return getPermission(owner, name)
|
return getPermission(owner, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// checkPermissionValid verifies if the permission is valid
|
||||||
|
func checkPermissionValid(permission *Permission) {
|
||||||
|
enforcer := getEnforcer(permission)
|
||||||
|
enforcer.EnableAutoSave(false)
|
||||||
|
|
||||||
|
policies := getPolicies(permission)
|
||||||
|
_, err := enforcer.AddPolicies(policies)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !HasRoleDefinition(enforcer.GetModel()) {
|
||||||
|
permission.Roles = []string{}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
groupingPolicies := getGroupingPolicies(permission)
|
||||||
|
if len(groupingPolicies) > 0 {
|
||||||
|
_, err := enforcer.AddGroupingPolicies(groupingPolicies)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func UpdatePermission(id string, permission *Permission) bool {
|
func UpdatePermission(id string, permission *Permission) bool {
|
||||||
|
checkPermissionValid(permission)
|
||||||
owner, name := util.GetOwnerAndNameFromId(id)
|
owner, name := util.GetOwnerAndNameFromId(id)
|
||||||
oldPermission := getPermission(owner, name)
|
oldPermission := getPermission(owner, name)
|
||||||
if oldPermission == nil {
|
if oldPermission == nil {
|
||||||
@ -124,6 +183,7 @@ func UpdatePermission(id string, permission *Permission) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if affected != 0 {
|
if affected != 0 {
|
||||||
|
removeGroupingPolicies(oldPermission)
|
||||||
removePolicies(oldPermission)
|
removePolicies(oldPermission)
|
||||||
if oldPermission.Adapter != "" && oldPermission.Adapter != permission.Adapter {
|
if oldPermission.Adapter != "" && oldPermission.Adapter != permission.Adapter {
|
||||||
isEmpty, _ := adapter.Engine.IsTableEmpty(oldPermission.Adapter)
|
isEmpty, _ := adapter.Engine.IsTableEmpty(oldPermission.Adapter)
|
||||||
@ -134,6 +194,7 @@ func UpdatePermission(id string, permission *Permission) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
addGroupingPolicies(permission)
|
||||||
addPolicies(permission)
|
addPolicies(permission)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,6 +208,7 @@ func AddPermission(permission *Permission) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if affected != 0 {
|
if affected != 0 {
|
||||||
|
addGroupingPolicies(permission)
|
||||||
addPolicies(permission)
|
addPolicies(permission)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,6 +222,7 @@ func DeletePermission(permission *Permission) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if affected != 0 {
|
if affected != 0 {
|
||||||
|
removeGroupingPolicies(permission)
|
||||||
removePolicies(permission)
|
removePolicies(permission)
|
||||||
if permission.Adapter != "" && permission.Adapter != "permission_rule" {
|
if permission.Adapter != "" && permission.Adapter != "permission_rule" {
|
||||||
isEmpty, _ := adapter.Engine.IsTableEmpty(permission.Adapter)
|
isEmpty, _ := adapter.Engine.IsTableEmpty(permission.Adapter)
|
||||||
@ -175,10 +238,6 @@ func DeletePermission(permission *Permission) bool {
|
|||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (permission *Permission) GetId() string {
|
|
||||||
return fmt.Sprintf("%s/%s", permission.Owner, permission.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetPermissionsByUser(userId string) []*Permission {
|
func GetPermissionsByUser(userId string) []*Permission {
|
||||||
permissions := []*Permission{}
|
permissions := []*Permission{}
|
||||||
err := adapter.Engine.Where("users like ?", "%"+userId+"%").Find(&permissions)
|
err := adapter.Engine.Where("users like ?", "%"+userId+"%").Find(&permissions)
|
||||||
@ -209,33 +268,6 @@ func GetPermissionsBySubmitter(owner string, submitter string) []*Permission {
|
|||||||
return permissions
|
return permissions
|
||||||
}
|
}
|
||||||
|
|
||||||
func MigratePermissionRule() {
|
|
||||||
models := []*Model{}
|
|
||||||
err := adapter.Engine.Find(&models, &Model{})
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
isHit := false
|
|
||||||
for _, model := range models {
|
|
||||||
if strings.Contains(model.ModelText, "permission") {
|
|
||||||
// update model table
|
|
||||||
model.ModelText = strings.Replace(model.ModelText, "permission,", "", -1)
|
|
||||||
UpdateModel(model.GetId(), model)
|
|
||||||
isHit = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if isHit {
|
|
||||||
// update permission_rule table
|
|
||||||
sql := "UPDATE `permission_rule`SET V0 = V1, V1 = V2, V2 = V3, V3 = V4, V4 = V5 WHERE V0 IN (SELECT CONCAT(owner, '/', name) AS permission_id FROM `permission`)"
|
|
||||||
_, err = adapter.Engine.Exec(sql)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func ContainsAsterisk(userId string, users []string) bool {
|
func ContainsAsterisk(userId string, users []string) bool {
|
||||||
containsAsterisk := false
|
containsAsterisk := false
|
||||||
group, _ := util.GetOwnerAndNameFromId(userId)
|
group, _ := util.GetOwnerAndNameFromId(userId)
|
||||||
@ -249,3 +281,12 @@ func ContainsAsterisk(userId string, users []string) bool {
|
|||||||
|
|
||||||
return containsAsterisk
|
return containsAsterisk
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetMaskedPermissions(permissions []*Permission) []*Permission {
|
||||||
|
for _, permission := range permissions {
|
||||||
|
permission.Users = nil
|
||||||
|
permission.Submitter = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return permissions
|
||||||
|
}
|
||||||
|
@ -15,12 +15,14 @@
|
|||||||
package object
|
package object
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
|
"github.com/casbin/casbin/v2/config"
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v3"
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
xormadapter "github.com/casdoor/xorm-adapter/v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getEnforcer(permission *Permission) *casbin.Enforcer {
|
func getEnforcer(permission *Permission) *casbin.Enforcer {
|
||||||
@ -29,105 +31,125 @@ func getEnforcer(permission *Permission) *casbin.Enforcer {
|
|||||||
tableName = permission.Adapter
|
tableName = permission.Adapter
|
||||||
}
|
}
|
||||||
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
||||||
adapter, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), tableName, tableNamePrefix, true)
|
driverName := conf.GetConfigString("driverName")
|
||||||
|
dataSourceName := conf.GetConfigRealDataSourceName(driverName)
|
||||||
|
adapter, err := xormadapter.NewAdapterWithTableName(driverName, dataSourceName, tableName, tableNamePrefix, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
modelText := `
|
|
||||||
[request_definition]
|
|
||||||
r = sub, obj, act
|
|
||||||
|
|
||||||
[policy_definition]
|
|
||||||
p = sub, obj, act
|
|
||||||
|
|
||||||
[role_definition]
|
|
||||||
g = _, _
|
|
||||||
|
|
||||||
[policy_effect]
|
|
||||||
e = some(where (p.eft == allow))
|
|
||||||
|
|
||||||
[matchers]
|
|
||||||
m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act`
|
|
||||||
permissionModel := getModel(permission.Owner, permission.Model)
|
permissionModel := getModel(permission.Owner, permission.Model)
|
||||||
|
m := model.Model{}
|
||||||
if permissionModel != nil {
|
if permissionModel != nil {
|
||||||
modelText = permissionModel.ModelText
|
m, err = GetBuiltInModel(permissionModel.ModelText)
|
||||||
|
} else {
|
||||||
|
m, err = GetBuiltInModel("")
|
||||||
}
|
}
|
||||||
m, err := model.NewModelFromString(modelText)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
policyFilter := xormadapter.Filter{}
|
||||||
|
|
||||||
|
if !HasRoleDefinition(m) {
|
||||||
|
policyFilter.Ptype = []string{"p"}
|
||||||
|
err = adapter.LoadFilteredPolicy(m, policyFilter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
enforcer, err := casbin.NewEnforcer(m, adapter)
|
enforcer, err := casbin.NewEnforcer(m, adapter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// load Policy with a specific Permission
|
||||||
|
policyFilter.V5 = []string{permission.GetId()}
|
||||||
|
err = enforcer.LoadFilteredPolicy(policyFilter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
return enforcer
|
return enforcer
|
||||||
}
|
}
|
||||||
|
|
||||||
func getPolicies(permission *Permission) ([][]string, [][]string) {
|
func getPolicies(permission *Permission) [][]string {
|
||||||
var policies [][]string
|
var policies [][]string
|
||||||
var groupingPolicies [][]string
|
|
||||||
|
permissionId := permission.GetId()
|
||||||
domainExist := len(permission.Domains) > 0
|
domainExist := len(permission.Domains) > 0
|
||||||
|
|
||||||
for _, user := range permission.Users {
|
for _, user := range permission.Users {
|
||||||
for _, resource := range permission.Resources {
|
for _, resource := range permission.Resources {
|
||||||
for _, action := range permission.Actions {
|
for _, action := range permission.Actions {
|
||||||
if domainExist {
|
if domainExist {
|
||||||
for _, domain := range permission.Domains {
|
for _, domain := range permission.Domains {
|
||||||
policies = append(policies, []string{user, domain, resource, strings.ToLower(action)})
|
policies = append(policies, []string{user, domain, resource, strings.ToLower(action), "", permissionId})
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
policies = append(policies, []string{user, resource, strings.ToLower(action)})
|
policies = append(policies, []string{user, resource, strings.ToLower(action), "", "", permissionId})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, role := range permission.Roles {
|
for _, role := range permission.Roles {
|
||||||
roleObj := GetRole(role)
|
|
||||||
for _, subUser := range roleObj.Users {
|
|
||||||
if domainExist {
|
|
||||||
for _, domain := range permission.Domains {
|
|
||||||
groupingPolicies = append(groupingPolicies, []string{subUser, domain, role})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
groupingPolicies = append(groupingPolicies, []string{subUser, role})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, subRole := range roleObj.Roles {
|
|
||||||
if domainExist {
|
|
||||||
for _, domain := range permission.Domains {
|
|
||||||
groupingPolicies = append(groupingPolicies, []string{subRole, domain, role})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
groupingPolicies = append(groupingPolicies, []string{subRole, role})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, resource := range permission.Resources {
|
for _, resource := range permission.Resources {
|
||||||
for _, action := range permission.Actions {
|
for _, action := range permission.Actions {
|
||||||
if domainExist {
|
if domainExist {
|
||||||
for _, domain := range permission.Domains {
|
for _, domain := range permission.Domains {
|
||||||
policies = append(policies, []string{role, domain, resource, strings.ToLower(action)})
|
policies = append(policies, []string{role, domain, resource, strings.ToLower(action), "", permissionId})
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
policies = append(policies, []string{role, resource, strings.ToLower(action)})
|
policies = append(policies, []string{role, resource, strings.ToLower(action), "", "", permissionId})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return policies, groupingPolicies
|
|
||||||
|
return policies
|
||||||
|
}
|
||||||
|
|
||||||
|
func getGroupingPolicies(permission *Permission) [][]string {
|
||||||
|
var groupingPolicies [][]string
|
||||||
|
|
||||||
|
domainExist := len(permission.Domains) > 0
|
||||||
|
permissionId := permission.GetId()
|
||||||
|
|
||||||
|
for _, role := range permission.Roles {
|
||||||
|
roleObj := GetRole(role)
|
||||||
|
if roleObj == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, subUser := range roleObj.Users {
|
||||||
|
if domainExist {
|
||||||
|
for _, domain := range permission.Domains {
|
||||||
|
groupingPolicies = append(groupingPolicies, []string{subUser, domain, role, "", "", permissionId})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
groupingPolicies = append(groupingPolicies, []string{subUser, role, "", "", "", permissionId})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, subRole := range roleObj.Roles {
|
||||||
|
if domainExist {
|
||||||
|
for _, domain := range permission.Domains {
|
||||||
|
groupingPolicies = append(groupingPolicies, []string{subRole, domain, role, "", "", permissionId})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
groupingPolicies = append(groupingPolicies, []string{subRole, role, "", "", "", permissionId})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return groupingPolicies
|
||||||
}
|
}
|
||||||
|
|
||||||
func addPolicies(permission *Permission) {
|
func addPolicies(permission *Permission) {
|
||||||
enforcer := getEnforcer(permission)
|
enforcer := getEnforcer(permission)
|
||||||
policies, groupingPolicies := getPolicies(permission)
|
policies := getPolicies(permission)
|
||||||
|
|
||||||
if len(groupingPolicies) > 0 {
|
|
||||||
_, err := enforcer.AddGroupingPolicies(groupingPolicies)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := enforcer.AddPolicies(policies)
|
_, err := enforcer.AddPolicies(policies)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -135,9 +157,21 @@ func addPolicies(permission *Permission) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func removePolicies(permission *Permission) {
|
func addGroupingPolicies(permission *Permission) {
|
||||||
enforcer := getEnforcer(permission)
|
enforcer := getEnforcer(permission)
|
||||||
policies, groupingPolicies := getPolicies(permission)
|
groupingPolicies := getGroupingPolicies(permission)
|
||||||
|
|
||||||
|
if len(groupingPolicies) > 0 {
|
||||||
|
_, err := enforcer.AddGroupingPolicies(groupingPolicies)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func removeGroupingPolicies(permission *Permission) {
|
||||||
|
enforcer := getEnforcer(permission)
|
||||||
|
groupingPolicies := getGroupingPolicies(permission)
|
||||||
|
|
||||||
if len(groupingPolicies) > 0 {
|
if len(groupingPolicies) > 0 {
|
||||||
_, err := enforcer.RemoveGroupingPolicies(groupingPolicies)
|
_, err := enforcer.RemoveGroupingPolicies(groupingPolicies)
|
||||||
@ -145,6 +179,11 @@ func removePolicies(permission *Permission) {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func removePolicies(permission *Permission) {
|
||||||
|
enforcer := getEnforcer(permission)
|
||||||
|
policies := getPolicies(permission)
|
||||||
|
|
||||||
_, err := enforcer.RemovePolicies(policies)
|
_, err := enforcer.RemovePolicies(policies)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -152,20 +191,24 @@ func removePolicies(permission *Permission) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Enforce(userId string, permissionRule *PermissionRule) bool {
|
func Enforce(permissionRule *PermissionRule) bool {
|
||||||
permission := GetPermission(permissionRule.Id)
|
permission := GetPermission(permissionRule.Id)
|
||||||
enforcer := getEnforcer(permission)
|
enforcer := getEnforcer(permission)
|
||||||
allow, err := enforcer.Enforce(userId, permissionRule.V1, permissionRule.V2)
|
|
||||||
|
request, _ := permissionRule.GetRequest(builtInAdapter, permissionRule.Id)
|
||||||
|
|
||||||
|
allow, err := enforcer.Enforce(request...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
return allow
|
return allow
|
||||||
}
|
}
|
||||||
|
|
||||||
func BatchEnforce(userId string, permissionRules []PermissionRule) []bool {
|
func BatchEnforce(permissionRules []PermissionRule) []bool {
|
||||||
var requests [][]interface{}
|
var requests [][]interface{}
|
||||||
for _, permissionRule := range permissionRules {
|
for _, permissionRule := range permissionRules {
|
||||||
requests = append(requests, []interface{}{userId, permissionRule.V1, permissionRule.V2})
|
request, _ := permissionRule.GetRequest(builtInAdapter, permissionRule.Id)
|
||||||
|
requests = append(requests, request)
|
||||||
}
|
}
|
||||||
permission := GetPermission(permissionRules[0].Id)
|
permission := GetPermission(permissionRules[0].Id)
|
||||||
enforcer := getEnforcer(permission)
|
enforcer := getEnforcer(permission)
|
||||||
@ -210,3 +253,46 @@ func GetAllRoles(userId string) []string {
|
|||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetBuiltInModel(modelText string) (model.Model, error) {
|
||||||
|
if modelText == "" {
|
||||||
|
modelText = `
|
||||||
|
[request_definition]
|
||||||
|
r = sub, obj, act
|
||||||
|
|
||||||
|
[policy_definition]
|
||||||
|
p = sub, obj, act, "", "", permissionId
|
||||||
|
|
||||||
|
[role_definition]
|
||||||
|
g = _, _
|
||||||
|
|
||||||
|
[policy_effect]
|
||||||
|
e = some(where (p.eft == allow))
|
||||||
|
|
||||||
|
[matchers]
|
||||||
|
m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act`
|
||||||
|
return model.NewModelFromString(modelText)
|
||||||
|
} else {
|
||||||
|
cfg, err := config.NewConfigFromText(modelText)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// load [policy_definition]
|
||||||
|
policyDefinition := strings.Split(cfg.String("policy_definition::p"), ",")
|
||||||
|
fieldsNum := len(policyDefinition)
|
||||||
|
if fieldsNum > builtInAvailableField {
|
||||||
|
panic(fmt.Errorf("the maximum policy_definition field number cannot exceed %d", builtInAvailableField))
|
||||||
|
}
|
||||||
|
// filled empty field with "" and V5 with "permissionId"
|
||||||
|
for i := builtInAvailableField - fieldsNum; i > 0; i-- {
|
||||||
|
policyDefinition = append(policyDefinition, "")
|
||||||
|
}
|
||||||
|
policyDefinition = append(policyDefinition, "permissionId")
|
||||||
|
|
||||||
|
m, _ := model.NewModelFromString(modelText)
|
||||||
|
m.AddDef("p", "p", strings.Join(policyDefinition, ","))
|
||||||
|
|
||||||
|
return m, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Product struct {
|
type Product struct {
|
||||||
@ -27,15 +27,16 @@ type Product struct {
|
|||||||
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
||||||
|
|
||||||
Image string `xorm:"varchar(100)" json:"image"`
|
Image string `xorm:"varchar(100)" json:"image"`
|
||||||
Detail string `xorm:"varchar(100)" json:"detail"`
|
Detail string `xorm:"varchar(255)" json:"detail"`
|
||||||
Tag string `xorm:"varchar(100)" json:"tag"`
|
Description string `xorm:"varchar(100)" json:"description"`
|
||||||
Currency string `xorm:"varchar(100)" json:"currency"`
|
Tag string `xorm:"varchar(100)" json:"tag"`
|
||||||
Price float64 `json:"price"`
|
Currency string `xorm:"varchar(100)" json:"currency"`
|
||||||
Quantity int `json:"quantity"`
|
Price float64 `json:"price"`
|
||||||
Sold int `json:"sold"`
|
Quantity int `json:"quantity"`
|
||||||
Providers []string `xorm:"varchar(100)" json:"providers"`
|
Sold int `json:"sold"`
|
||||||
ReturnUrl string `xorm:"varchar(1000)" json:"returnUrl"`
|
Providers []string `xorm:"varchar(100)" json:"providers"`
|
||||||
|
ReturnUrl string `xorm:"varchar(1000)" json:"returnUrl"`
|
||||||
|
|
||||||
State string `xorm:"varchar(100)" json:"state"`
|
State string `xorm:"varchar(100)" json:"state"`
|
||||||
|
|
||||||
@ -213,6 +214,10 @@ func BuyProduct(id string, providerName string, user *User, host string) (string
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ExtendProductWithProviders(product *Product) {
|
func ExtendProductWithProviders(product *Product) {
|
||||||
|
if product == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
product.ProviderObjs = []*Provider{}
|
product.ProviderObjs = []*Provider{}
|
||||||
|
|
||||||
m := getProviderMap(product.Owner)
|
m := getProviderMap(product.Owner)
|
||||||
|
@ -20,12 +20,12 @@ import (
|
|||||||
"github.com/casdoor/casdoor/i18n"
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/pp"
|
"github.com/casdoor/casdoor/pp"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Provider struct {
|
type Provider struct {
|
||||||
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
Name string `xorm:"varchar(100) notnull pk unique" json:"name"`
|
||||||
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
|
|
||||||
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
||||||
@ -46,9 +46,9 @@ type Provider struct {
|
|||||||
|
|
||||||
Host string `xorm:"varchar(100)" json:"host"`
|
Host string `xorm:"varchar(100)" json:"host"`
|
||||||
Port int `json:"port"`
|
Port int `json:"port"`
|
||||||
DisableSsl bool `json:"disableSsl"`
|
DisableSsl bool `json:"disableSsl"` // If the provider type is WeChat, DisableSsl means EnableQRCode
|
||||||
Title string `xorm:"varchar(100)" json:"title"`
|
Title string `xorm:"varchar(100)" json:"title"`
|
||||||
Content string `xorm:"varchar(1000)" json:"content"`
|
Content string `xorm:"varchar(1000)" json:"content"` // If provider type is WeChat, Content means QRCode string by Base64 encoding
|
||||||
Receiver string `xorm:"varchar(100)" json:"receiver"`
|
Receiver string `xorm:"varchar(100)" json:"receiver"`
|
||||||
|
|
||||||
RegionId string `xorm:"varchar(100)" json:"regionId"`
|
RegionId string `xorm:"varchar(100)" json:"regionId"`
|
||||||
@ -93,8 +93,8 @@ func GetMaskedProviders(providers []*Provider) []*Provider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetProviderCount(owner, field, value string) int {
|
func GetProviderCount(owner, field, value string) int {
|
||||||
session := GetSession(owner, -1, -1, field, value, "", "")
|
session := GetSession("", -1, -1, field, value, "", "")
|
||||||
count, err := session.Count(&Provider{})
|
count, err := session.Where("owner = ? or owner = ? ", "admin", owner).Count(&Provider{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -114,7 +114,7 @@ func GetGlobalProviderCount(field, value string) int {
|
|||||||
|
|
||||||
func GetProviders(owner string) []*Provider {
|
func GetProviders(owner string) []*Provider {
|
||||||
providers := []*Provider{}
|
providers := []*Provider{}
|
||||||
err := adapter.Engine.Desc("created_time").Find(&providers, &Provider{Owner: owner})
|
err := adapter.Engine.Where("owner = ? or owner = ? ", "admin", owner).Desc("created_time").Find(&providers, &Provider{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -133,9 +133,9 @@ func GetGlobalProviders() []*Provider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetPaginationProviders(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Provider {
|
func GetPaginationProviders(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Provider {
|
||||||
var providers []*Provider
|
providers := []*Provider{}
|
||||||
session := GetSession(owner, offset, limit, field, value, sortField, sortOrder)
|
session := GetSession("", offset, limit, field, value, sortField, sortOrder)
|
||||||
err := session.Find(&providers)
|
err := session.Where("owner = ? or owner = ? ", "admin", owner).Find(&providers)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -144,7 +144,7 @@ func GetPaginationProviders(owner string, offset, limit int, field, value, sortF
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetPaginationGlobalProviders(offset, limit int, field, value, sortField, sortOrder string) []*Provider {
|
func GetPaginationGlobalProviders(offset, limit int, field, value, sortField, sortOrder string) []*Provider {
|
||||||
var providers []*Provider
|
providers := []*Provider{}
|
||||||
session := GetSession("", offset, limit, field, value, sortField, sortOrder)
|
session := GetSession("", offset, limit, field, value, sortField, sortOrder)
|
||||||
err := session.Find(&providers)
|
err := session.Find(&providers)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -159,7 +159,7 @@ func getProvider(owner string, name string) *Provider {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := Provider{Owner: owner, Name: name}
|
provider := Provider{Name: name}
|
||||||
existed, err := adapter.Engine.Get(&provider)
|
existed, err := adapter.Engine.Get(&provider)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -277,7 +277,7 @@ func GetCaptchaProviderByOwnerName(applicationId, lang string) (*Provider, error
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !existed {
|
if !existed {
|
||||||
return nil, fmt.Errorf(i18n.Translate(lang, "ProviderErr.DoNotExist"), applicationId)
|
return nil, fmt.Errorf(i18n.Translate(lang, "provider:the provider: %s does not exist"), applicationId)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &provider, nil
|
return &provider, nil
|
||||||
@ -289,7 +289,7 @@ func GetCaptchaProviderByApplication(applicationId, isCurrentProvider, lang stri
|
|||||||
}
|
}
|
||||||
application := GetApplication(applicationId)
|
application := GetApplication(applicationId)
|
||||||
if application == nil || len(application.Providers) == 0 {
|
if application == nil || len(application.Providers) == 0 {
|
||||||
return nil, fmt.Errorf(i18n.Translate(lang, "ApplicationErr.InvalidID"))
|
return nil, fmt.Errorf(i18n.Translate(lang, "provider:Invalid application id"))
|
||||||
}
|
}
|
||||||
for _, provider := range application.Providers {
|
for _, provider := range application.Providers {
|
||||||
if provider.Provider == nil {
|
if provider.Provider == nil {
|
||||||
|
@ -15,7 +15,9 @@
|
|||||||
package object
|
package object
|
||||||
|
|
||||||
type ProviderItem struct {
|
type ProviderItem struct {
|
||||||
Name string `json:"name"`
|
Owner string `json:"owner"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
CanSignUp bool `json:"canSignUp"`
|
CanSignUp bool `json:"canSignUp"`
|
||||||
CanSignIn bool `json:"canSignIn"`
|
CanSignIn bool `json:"canSignIn"`
|
||||||
CanUnlink bool `json:"canUnlink"`
|
CanUnlink bool `json:"canUnlink"`
|
||||||
|
@ -18,12 +18,12 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Resource struct {
|
type Resource struct {
|
||||||
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
Name string `xorm:"varchar(250) notnull pk" json:"name"`
|
Name string `xorm:"varchar(180) notnull pk" json:"name"`
|
||||||
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
|
|
||||||
User string `xorm:"varchar(100)" json:"user"`
|
User string `xorm:"varchar(100)" json:"user"`
|
||||||
@ -31,12 +31,12 @@ type Resource struct {
|
|||||||
Application string `xorm:"varchar(100)" json:"application"`
|
Application string `xorm:"varchar(100)" json:"application"`
|
||||||
Tag string `xorm:"varchar(100)" json:"tag"`
|
Tag string `xorm:"varchar(100)" json:"tag"`
|
||||||
Parent string `xorm:"varchar(100)" json:"parent"`
|
Parent string `xorm:"varchar(100)" json:"parent"`
|
||||||
FileName string `xorm:"varchar(1000)" json:"fileName"`
|
FileName string `xorm:"varchar(255)" json:"fileName"`
|
||||||
FileType string `xorm:"varchar(100)" json:"fileType"`
|
FileType string `xorm:"varchar(100)" json:"fileType"`
|
||||||
FileFormat string `xorm:"varchar(100)" json:"fileFormat"`
|
FileFormat string `xorm:"varchar(100)" json:"fileFormat"`
|
||||||
FileSize int `json:"fileSize"`
|
FileSize int `json:"fileSize"`
|
||||||
Url string `xorm:"varchar(1000)" json:"url"`
|
Url string `xorm:"varchar(255)" json:"url"`
|
||||||
Description string `xorm:"varchar(1000)" json:"description"`
|
Description string `xorm:"varchar(255)" json:"description"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetResourceCount(owner, user, field, value string) int {
|
func GetResourceCount(owner, user, field, value string) int {
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"github.com/xorm-io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Role struct {
|
type Role struct {
|
||||||
@ -95,6 +95,12 @@ func UpdateRole(id string, role *Role) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
permissions := GetPermissionsByRole(id)
|
||||||
|
for _, permission := range permissions {
|
||||||
|
removeGroupingPolicies(permission)
|
||||||
|
removePolicies(permission)
|
||||||
|
}
|
||||||
|
|
||||||
if name != role.Name {
|
if name != role.Name {
|
||||||
err := roleChangeTrigger(name, role.Name)
|
err := roleChangeTrigger(name, role.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -107,6 +113,13 @@ func UpdateRole(id string, role *Role) bool {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
newRoleID := role.GetId()
|
||||||
|
permissions = GetPermissionsByRole(newRoleID)
|
||||||
|
for _, permission := range permissions {
|
||||||
|
addGroupingPolicies(permission)
|
||||||
|
addPolicies(permission)
|
||||||
|
}
|
||||||
|
|
||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,6 +133,13 @@ func AddRole(role *Role) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DeleteRole(role *Role) bool {
|
func DeleteRole(role *Role) bool {
|
||||||
|
roleId := role.GetId()
|
||||||
|
permissions := GetPermissionsByRole(roleId)
|
||||||
|
for _, permission := range permissions {
|
||||||
|
permission.Roles = util.DeleteVal(permission.Roles, roleId)
|
||||||
|
UpdatePermission(permission.GetId(), permission)
|
||||||
|
}
|
||||||
|
|
||||||
affected, err := adapter.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
|
affected, err := adapter.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -192,3 +212,11 @@ func roleChangeTrigger(oldName string, newName string) error {
|
|||||||
|
|
||||||
return session.Commit()
|
return session.Commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetMaskedRoles(roles []*Role) []*Role {
|
||||||
|
for _, role := range roles {
|
||||||
|
role.Users = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return roles
|
||||||
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user