Compare commits

..

4 Commits

Author SHA1 Message Date
fengxsong
d21ae8a478 feat: support making configs in values.yaml (#1595)
Signed-off-by: fengxsong <fengxsong@outlook.com>
2023-03-01 20:17:04 +08:00
Zayn Xie
db401b2046 ci: add migration ci test (#1600)
* feat: add migration ci test

* feat: add migration ci test

* feat: add migration ci test

---------

Co-authored-by: Zayn Xie <84443886+xiaoniuren99@users.noreply.github.com>
2023-03-01 17:30:08 +08:00
Shenyz
7181489da0 fix: OIDC Userinfo API response for scope profile (#1598) 2023-03-01 16:56:39 +08:00
Yaodong Yu
e21087aa50 feat: refactor reset password api and forgetPage.js (#1601) 2023-03-01 15:57:42 +08:00
14 changed files with 654 additions and 375 deletions

61
.github/workflows/migrate.yml vendored Normal file
View File

@@ -0,0 +1,61 @@
name: Migration Test
on:
push:
paths:
- 'object/migrator**'
pull_request:
paths:
- 'object/migrator**'
jobs:
db-migrator-test:
name: db-migrator-test
runs-on: ubuntu-latest
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: pull casdoor-master-latest
run: |
sudo apt update
sudo apt install git
sudo apt install net-tools
sudo mkdir tmp
cd tmp
sudo git clone https://github.com/casdoor/casdoor.git
cd ..
working-directory: ./
- name: run casdoor-master-latest
run: |
sudo nohup go run main.go &
sudo sleep 2m
working-directory: ./tmp/casdoor
- name: stop casdoor-master-latest
run: |
sudo kill -9 `sudo netstat -anltp | grep 8000 | awk '{print $7}' | cut -d / -f 1`
working-directory: ./
- name: run casdoor-current-version
run: |
sudo nohup go run ./main.go &
sudo sleep 2m
working-directory: ./
- name: test port-8000
run: |
if [[ `sudo netstat -anltp | grep 8000 | awk '{print $7}'` == "" ]];then echo 'db-migrator-test fail' && exit 1;fi;
echo 'db-migrator-test pass'
working-directory: ./

View File

@@ -80,7 +80,7 @@ m = (r.subOwner == p.subOwner || p.subOwner == "*") && \
p, built-in, *, *, *, *, *
p, app, *, *, *, *, *
p, *, *, POST, /api/signup, *, *
p, *, *, POST, /api/get-email-and-phone, *, *
p, *, *, GET, /api/get-email-and-phone, *, *
p, *, *, POST, /api/login, *, *
p, *, *, GET, /api/get-app-login, *, *
p, *, *, POST, /api/logout, *, *

View File

@@ -231,24 +231,20 @@ func (c *ApiController) DeleteUser() {
// @Param username formData string true "The username of the user"
// @Param organization formData string true "The organization of the user"
// @Success 200 {object} controllers.Response The Response object
// @router /get-email-and-phone [post]
// @router /get-email-and-phone [get]
func (c *ApiController) GetEmailAndPhone() {
var form RequestForm
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
if err != nil {
c.ResponseError(err.Error())
return
}
organization := c.Ctx.Request.Form.Get("organization")
username := c.Ctx.Request.Form.Get("username")
user := object.GetUserByFields(form.Organization, form.Username)
user := object.GetUserByFields(organization, username)
if user == nil {
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(form.Organization, form.Username)))
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(organization, username)))
return
}
respUser := object.User{Name: user.Name}
var contentType string
switch form.Username {
switch username {
case user.Email:
contentType = "email"
respUser.Email = user.Email
@@ -281,7 +277,7 @@ func (c *ApiController) SetPassword() {
newPassword := c.Ctx.Request.Form.Get("newPassword")
requestUserId := c.GetSessionUsername()
userId := fmt.Sprintf("%s/%s", userOwner, userName)
userId := util.GetId(userOwner, userName)
hasPermission, err := object.CheckUserPermission(requestUserId, userId, userOwner, true, c.GetAcceptLanguage())
if !hasPermission {
@@ -311,8 +307,7 @@ func (c *ApiController) SetPassword() {
targetUser.Password = newPassword
object.SetUserField(targetUser, "password", targetUser.Password)
c.Data["json"] = Response{Status: "ok"}
c.ServeJSON()
c.ResponseOk()
}
// CheckUserPassword

View File

@@ -1,23 +1,8 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: casdoor-config
name: {{ printf "%s-config" (include "casdoor.fullname" .) }}
labels:
{{- include "casdoor.labels" . | nindent 4 }}
data:
app.conf: |
appname = casdoor
httpport = 80
runmode = dev
SessionOn = true
copyrequestbody = true
driverName = mysql
dataSourceName = root:123456@tcp(localhost:3306)/
dbName = casdoor
redisEndpoint =
defaultStorageProvider =
isCloudIntranet = false
authState = "casdoor"
socks5Proxy = "127.0.0.1:10808"
verificationCodeTimeout = 10
initScore = 2000
logPostOnly = true
origin = "https://door.casbin.com"
app.conf: {{ tpl .Values.config . | toYaml | nindent 4 }}

View File

@@ -13,10 +13,11 @@ spec:
{{- include "casdoor.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
checksum/config: {{ tpl .Values.config . | toYaml | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
labels:
{{- include "casdoor.selectorLabels" . | nindent 8 }}
spec:
@@ -34,18 +35,25 @@ spec:
image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
# command: ["sleep", "100000000"]
env:
- name: RUNNING_IN_DOCKER
value: "true"
ports:
- name: http
containerPort: 80
containerPort: {{ .Values.service.port }}
protocol: TCP
# livenessProbe:
# httpGet:
# path: /
# port: http
# readinessProbe:
# httpGet:
# path: /
# port: http
{{ if .Values.probe.liveness.enabled }}
livenessProbe:
httpGet:
path: /
port: http
{{ end }}
{{ if .Values.probe.readiness.enabled }}
readinessProbe:
httpGet:
path: /
port: http
{{ end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
@@ -60,7 +68,7 @@ spec:
items:
- key: app.conf
path: app.conf
name: casdoor-config
name: {{ printf "%s-config" (include "casdoor.fullname" .) }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}

View File

@@ -6,11 +6,31 @@ replicaCount: 1
image:
repository: casbin
name: casdoor-all-in-one
name: casdoor
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
# ref: https://casdoor.org/docs/basic/server-installation#via-ini-file
config: |
appname = casdoor
httpport = {{ .Values.service.port }}
runmode = dev
SessionOn = true
copyrequestbody = true
driverName = sqlite
dataSourceName = "file:ent?mode=memory&cache=shared&_fk=1"
dbName = casdoor
redisEndpoint =
defaultStorageProvider =
isCloudIntranet = false
authState = "casdoor"
socks5Proxy = ""
verificationCodeTimeout = 10
initScore = 2000
logPostOnly = true
origin = "https://door.casbin.com"
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
@@ -37,9 +57,15 @@ securityContext: {}
# runAsNonRoot: true
# runAsUser: 1000
probe:
readiness:
enabled: true
liveness:
enabled: true
service:
type: ClusterIP
port: 80
port: 8000
ingress:
enabled: false

View File

@@ -172,8 +172,8 @@ type Userinfo struct {
Sub string `json:"sub"`
Iss string `json:"iss"`
Aud string `json:"aud"`
Name string `json:"name,omitempty"`
DisplayName string `json:"preferred_username,omitempty"`
Name string `json:"preferred_username,omitempty"`
DisplayName string `json:"name,omitempty"`
Email string `json:"email,omitempty"`
Avatar string `json:"picture,omitempty"`
Address string `json:"address,omitempty"`

View File

@@ -53,9 +53,11 @@ func GetUserByFields(organization string, field string) *User {
}
// check email
user = GetUserByField(organization, "email", field)
if user != nil {
return user
if strings.Contains(field, "@") {
user = GetUserByField(organization, "email", field)
if user != nil {
return user
}
}
// check phone

View File

@@ -112,7 +112,7 @@ func initAPI() {
beego.Router("/api/set-password", &controllers.ApiController{}, "POST:SetPassword")
beego.Router("/api/check-user-password", &controllers.ApiController{}, "POST:CheckUserPassword")
beego.Router("/api/get-email-and-phone", &controllers.ApiController{}, "POST:GetEmailAndPhone")
beego.Router("/api/get-email-and-phone", &controllers.ApiController{}, "GET:GetEmailAndPhone")
beego.Router("/api/send-verification-code", &controllers.ApiController{}, "POST:SendVerificationCode")
beego.Router("/api/verify-captcha", &controllers.ApiController{}, "POST:VerifyCaptcha")
beego.Router("/api/reset-email-or-phone", &controllers.ApiController{}, "POST:ResetEmailOrPhone")

View File

@@ -339,6 +339,42 @@
}
}
},
"/api/add-session": {
"post": {
"tags": [
"Session API"
],
"description": "Add session for one user in one application. If there are other existing sessions, join the session into the list.",
"operationId": "ApiController.AddSession",
"parameters": [
{
"in": "query",
"name": "id",
"description": "The id(organization/application/user) of session",
"required": true,
"type": "string"
},
{
"in": "query",
"name": "sessionId",
"description": "sessionId to be added",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "The Response object",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
},
"/api/add-syncer": {
"post": {
"tags": [
@@ -889,13 +925,13 @@
"tags": [
"Session API"
],
"description": "Delete session by userId",
"description": "Delete session for one user in one application.",
"operationId": "ApiController.DeleteSession",
"parameters": [
{
"in": "query",
"name": "id",
"description": "The id ( owner/name )(owner/name) of user.",
"description": "The id(organization/application/user) of session",
"required": true,
"type": "string"
}
@@ -1233,7 +1269,7 @@
}
},
"/api/get-email-and-phone": {
"post": {
"get": {
"tags": [
"User API"
],
@@ -1306,7 +1342,7 @@
}
},
"/api/get-ldap": {
"post": {
"get": {
"tags": [
"Account API"
],
@@ -1322,7 +1358,7 @@
}
},
"/api/get-ldaps": {
"post": {
"get": {
"tags": [
"Account API"
],
@@ -1884,12 +1920,41 @@
}
}
},
"/api/get-session": {
"get": {
"tags": [
"Session API"
],
"description": "Get session for one user in one application.",
"operationId": "ApiController.GetSingleSession",
"parameters": [
{
"in": "query",
"name": "id",
"description": "The id(organization/application/user) of session",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "The Response object",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
},
"/api/get-sessions": {
"get": {
"tags": [
"Session API"
],
"description": "Get organization user sessions",
"description": "Get organization user sessions.",
"operationId": "ApiController.GetSessions",
"parameters": [
{
@@ -2356,6 +2421,42 @@
}
}
},
"/api/is-session-duplicated": {
"get": {
"tags": [
"Session API"
],
"description": "Check if there are other different sessions for one user in one application.",
"operationId": "ApiController.IsSessionDuplicated",
"parameters": [
{
"in": "query",
"name": "id",
"description": "The id(organization/application/user) of session",
"required": true,
"type": "string"
},
{
"in": "query",
"name": "sessionId",
"description": "sessionId to be checked",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "The Response object",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
},
"/api/login": {
"post": {
"tags": [
@@ -3224,6 +3325,35 @@
}
}
},
"/api/update-session": {
"post": {
"tags": [
"Session API"
],
"description": "Update session for one user in one application.",
"operationId": "ApiController.UpdateSession",
"parameters": [
{
"in": "query",
"name": "id",
"description": "The id(organization/application/user) of session",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "The Response object",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
},
"/api/update-syncer": {
"post": {
"tags": [
@@ -3505,11 +3635,11 @@
}
},
"definitions": {
"2346.0xc0001ce990.false": {
"2346.0xc000278ab0.false": {
"title": "false",
"type": "object"
},
"2381.0xc0001ce9c0.false": {
"2381.0xc000278ae0.false": {
"title": "false",
"type": "object"
},
@@ -3566,6 +3696,9 @@
"code": {
"type": "string"
},
"countryCode": {
"type": "string"
},
"email": {
"type": "string"
},
@@ -3599,9 +3732,6 @@
"phoneCode": {
"type": "string"
},
"phonePrefix": {
"type": "string"
},
"provider": {
"type": "string"
},
@@ -3636,10 +3766,10 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/2346.0xc0001ce990.false"
"$ref": "#/definitions/2346.0xc000278ab0.false"
},
"data2": {
"$ref": "#/definitions/2381.0xc0001ce9c0.false"
"$ref": "#/definitions/2381.0xc000278ae0.false"
},
"msg": {
"type": "string"
@@ -4091,6 +4221,12 @@
"$ref": "#/definitions/object.AccountItem"
}
},
"countryCodes": {
"type": "array",
"items": {
"type": "string"
}
},
"createdTime": {
"type": "string"
},
@@ -4137,9 +4273,6 @@
"passwordType": {
"type": "string"
},
"phonePrefix": {
"type": "string"
},
"tags": {
"type": "array",
"items": {
@@ -4906,6 +5039,9 @@
"cloudfoundry": {
"type": "string"
},
"countryCode": {
"type": "string"
},
"createdIp": {
"type": "string"
},

View File

@@ -218,6 +218,30 @@ paths:
description: The Response object
schema:
$ref: '#/definitions/controllers.Response'
/api/add-session:
post:
tags:
- Session API
description: Add session for one user in one application. If there are other existing sessions, join the session into the list.
operationId: ApiController.AddSession
parameters:
- in: query
name: id
description: The id(organization/application/user) of session
required: true
type: string
- in: query
name: sessionId
description: sessionId to be added
required: true
type: string
responses:
"200":
description: The Response object
schema:
type: array
items:
type: string
/api/add-syncer:
post:
tags:
@@ -574,12 +598,12 @@ paths:
post:
tags:
- Session API
description: Delete session by userId
description: Delete session for one user in one application.
operationId: ApiController.DeleteSession
parameters:
- in: query
name: id
description: The id ( owner/name )(owner/name) of user.
description: The id(organization/application/user) of session
required: true
type: string
responses:
@@ -799,7 +823,7 @@ paths:
schema:
$ref: '#/definitions/Response'
/api/get-email-and-phone:
post:
get:
tags:
- User API
description: get email and phone by username
@@ -847,7 +871,7 @@ paths:
items:
$ref: '#/definitions/object.User'
/api/get-ldap:
post:
get:
tags:
- Account API
operationId: ApiController.GetLdap
@@ -857,7 +881,7 @@ paths:
- Account API
operationId: ApiController.GetLdapser
/api/get-ldaps:
post:
get:
tags:
- Account API
operationId: ApiController.GetLdaps
@@ -1224,11 +1248,30 @@ paths:
type: array
items:
$ref: '#/definitions/object.Role'
/api/get-session:
get:
tags:
- Session API
description: Get session for one user in one application.
operationId: ApiController.GetSingleSession
parameters:
- in: query
name: id
description: The id(organization/application/user) of session
required: true
type: string
responses:
"200":
description: The Response object
schema:
type: array
items:
type: string
/api/get-sessions:
get:
tags:
- Session API
description: Get organization user sessions
description: Get organization user sessions.
operationId: ApiController.GetSessions
parameters:
- in: query
@@ -1535,6 +1578,30 @@ paths:
description: The Response object
schema:
$ref: '#/definitions/controllers.Response'
/api/is-session-duplicated:
get:
tags:
- Session API
description: Check if there are other different sessions for one user in one application.
operationId: ApiController.IsSessionDuplicated
parameters:
- in: query
name: id
description: The id(organization/application/user) of session
required: true
type: string
- in: query
name: sessionId
description: sessionId to be checked
required: true
type: string
responses:
"200":
description: The Response object
schema:
type: array
items:
type: string
/api/login:
post:
tags:
@@ -2110,6 +2177,25 @@ paths:
description: The Response object
schema:
$ref: '#/definitions/controllers.Response'
/api/update-session:
post:
tags:
- Session API
description: Update session for one user in one application.
operationId: ApiController.UpdateSession
parameters:
- in: query
name: id
description: The id(organization/application/user) of session
required: true
type: string
responses:
"200":
description: The Response object
schema:
type: array
items:
type: string
/api/update-syncer:
post:
tags:
@@ -2293,10 +2379,10 @@ paths:
schema:
$ref: '#/definitions/Response'
definitions:
2346.0xc0001ce990.false:
2346.0xc000278ab0.false:
title: "false"
type: object
2381.0xc0001ce9c0.false:
2381.0xc000278ae0.false:
title: "false"
type: object
Response:
@@ -2336,6 +2422,8 @@ definitions:
type: string
code:
type: string
countryCode:
type: string
email:
type: string
emailCode:
@@ -2358,8 +2446,6 @@ definitions:
type: string
phoneCode:
type: string
phonePrefix:
type: string
provider:
type: string
redirectUri:
@@ -2383,9 +2469,9 @@ definitions:
type: object
properties:
data:
$ref: '#/definitions/2346.0xc0001ce990.false'
$ref: '#/definitions/2346.0xc000278ab0.false'
data2:
$ref: '#/definitions/2381.0xc0001ce9c0.false'
$ref: '#/definitions/2381.0xc000278ae0.false'
msg:
type: string
name:
@@ -2689,6 +2775,10 @@ definitions:
type: array
items:
$ref: '#/definitions/object.AccountItem'
countryCodes:
type: array
items:
type: string
createdTime:
type: string
defaultApplication:
@@ -2720,8 +2810,6 @@ definitions:
type: string
passwordType:
type: string
phonePrefix:
type: string
tags:
type: array
items:
@@ -3237,6 +3325,8 @@ definitions:
type: string
cloudfoundry:
type: string
countryCode:
type: string
createdIp:
type: string
createdTime:

View File

@@ -36,11 +36,10 @@ export function signup(values) {
}).then(res => res.json());
}
export function getEmailAndPhone(values) {
return fetch(`${authConfig.serverUrl}/api/get-email-and-phone`, {
method: "POST",
export function getEmailAndPhone(organization, username) {
return fetch(`${authConfig.serverUrl}/api/get-email-and-phone?organization=${organization}&username=${username}`, {
method: "GET",
credentials: "include",
body: JSON.stringify(values),
headers: {
"Accept-Language": Setting.getAcceptLanguage(),
},

View File

@@ -24,8 +24,6 @@ import * as UserBackend from "../backend/UserBackend";
import {CheckCircleOutlined, KeyOutlined, LockOutlined, SolutionOutlined, UserOutlined} from "@ant-design/icons";
import CustomGithubCorner from "../CustomGithubCorner";
import {withRouter} from "react-router-dom";
const {Step} = Steps;
const {Option} = Select;
class ForgetPage extends React.Component {
@@ -33,23 +31,21 @@ class ForgetPage extends React.Component {
super(props);
this.state = {
classes: props,
account: props.account,
applicationName: props.applicationName ?? props.match.params?.applicationName,
application: null,
msg: null,
userId: "",
username: "",
name: "",
email: "",
isFixed: false,
fixedContent: "",
token: "",
phone: "",
emailCode: "",
phoneCode: "",
verifyType: null, // "email" or "phone"
email: "",
dest: "",
isVerifyTypeFixed: false,
verifyType: "", // "email", "phone"
current: 0,
};
this.form = React.createRef();
}
componentDidMount() {
@@ -88,72 +84,67 @@ class ForgetPage extends React.Component {
switch (name) {
case "step1":
const username = forms.step1.getFieldValue("username");
AuthBackend.getEmailAndPhone({
application: forms.step1.getFieldValue("application"),
organization: forms.step1.getFieldValue("organization"),
username: username,
}).then((res) => {
if (res.status === "ok") {
const phone = res.data.phone;
const email = res.data.email;
const saveFields = () => {
if (this.state.isFixed) {
forms.step2.setFieldsValue({email: this.state.fixedContent});
this.setState({username: this.state.fixedContent});
AuthBackend.getEmailAndPhone(forms.step1.getFieldValue("organization"), username)
.then((res) => {
if (res.status === "ok") {
const phone = res.data.phone;
const email = res.data.email;
if (phone === "" && email === "") {
Setting.showMessage("error", "no verification method!");
} else {
this.setState({
name: res.data.name,
phone: phone,
email: email,
});
const saveFields = (type, dest, fixed) => {
this.setState({
verifyType: type,
isVerifyTypeFixed: fixed,
dest: dest,
});
};
switch (res.data2) {
case "email":
saveFields("email", email, true);
break;
case "phone":
saveFields("phone", phone, true);
break;
case "username":
phone !== "" ? saveFields("phone", phone, false) : saveFields("email", email, false);
}
this.setState({
current: 1,
});
}
this.setState({current: 1});
};
this.setState({phone: phone, email: email, username: res.data.name, name: res.data.name});
if (phone !== "" && email === "") {
this.setState({
verifyType: "phone",
});
} else if (phone === "" && email !== "") {
this.setState({
verifyType: "email",
});
} else {
Setting.showMessage("error", res.msg);
}
switch (res.data2) {
case "email":
this.setState({isFixed: true, fixedContent: email, verifyType: "email"}, () => {saveFields();});
break;
case "phone":
this.setState({isFixed: true, fixedContent: phone, verifyType: "phone"}, () => {saveFields();});
break;
default:
saveFields();
break;
}
} else {
Setting.showMessage("error", i18next.t(`signup:${res.msg}`));
}
});
});
break;
case "step2":
const oAuthParams = Util.getOAuthGetParameters();
const login = () => {
AuthBackend.login({
application: forms.step2.getFieldValue("application"),
organization: forms.step2.getFieldValue("organization"),
username: this.state.username,
name: this.state.name,
code: forms.step2.getFieldValue("emailCode"),
type: "login",
}, oAuthParams).then(res => {
if (res.status === "ok") {
this.setState({current: 2, userId: res.data, username: res.data.split("/")[1]});
} else {
Setting.showMessage("error", i18next.t(`signup:${res.msg}`));
}
});
};
if (this.state.verifyType === "email") {
this.setState({username: this.state.email}, () => {login();});
} else if (this.state.verifyType === "phone") {
this.setState({username: this.state.phone}, () => {login();});
}
AuthBackend.login({
application: forms.step2.getFieldValue("application"),
organization: forms.step2.getFieldValue("organization"),
username: forms.step2.getFieldValue("dest"),
name: this.state.name,
code: forms.step2.getFieldValue("code"),
type: "login",
}, oAuthParams).then(res => {
if (res.status === "ok") {
this.setState({current: 2, userId: res.data});
} else {
Setting.showMessage("error", res.msg);
}
});
break;
default:
break;
@@ -161,13 +152,13 @@ class ForgetPage extends React.Component {
}
onFinish(values) {
values.username = this.state.username;
values.username = this.state.name;
values.userOwner = this.getApplicationObj()?.organizationObj.name;
UserBackend.setPassword(values.userOwner, values.username, "", values?.newPassword).then(res => {
if (res.status === "ok") {
Setting.redirectToLoginPage(this.getApplicationObj(), this.props.history);
} else {
Setting.showMessage("error", i18next.t(`signup:${res.msg}`));
Setting.showMessage("error", res.msg);
}
});
}
@@ -179,7 +170,7 @@ class ForgetPage extends React.Component {
if (this.state.phone !== "") {
options.push(
<Option key={"phone"} value={"phone"}>
<Option key={"phone"} value={this.state.phone} >
&nbsp;&nbsp;{this.state.phone}
</Option>
);
@@ -187,7 +178,7 @@ class ForgetPage extends React.Component {
if (this.state.email !== "") {
options.push(
<Option key={"email"} value={"email"}>
<Option key={"email"} value={this.state.email} >
&nbsp;&nbsp;{this.state.email}
</Option>
);
@@ -202,76 +193,70 @@ class ForgetPage extends React.Component {
this.onFormFinish(name, info, forms);
}}>
{/* STEP 1: input username -> get email & phone */}
<Form
hidden={this.state.current !== 0}
ref={this.form}
name="step1"
// eslint-disable-next-line no-console
onFinishFailed={(errorInfo) => console.log(errorInfo)}
initialValues={{
application: application.name,
organization: application.organization,
}}
style={{width: "300px"}}
size="large"
>
<Form.Item
style={{height: 0, visibility: "hidden"}}
name="application"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your application!"
),
},
]}
/>
<Form.Item
style={{height: 0, visibility: "hidden"}}
name="organization"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your organization!"
),
},
]}
/>
<Form.Item
name="username"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your username!"
),
whitespace: true,
},
]}
{this.state.current === 0 ?
<Form
ref={this.form}
name="step1"
// eslint-disable-next-line no-console
onFinishFailed={(errorInfo) => console.log(errorInfo)}
initialValues={{
application: application.name,
organization: application.organization,
}}
style={{width: "300px"}}
size="large"
>
<Input
onChange={(e) => {
this.setState({
username: e.target.value,
});
}}
prefix={<UserOutlined />}
placeholder={i18next.t("login:username, Email or phone")}
<Form.Item
hidden
name="application"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your application!"
),
},
]}
/>
</Form.Item>
<br />
<Form.Item>
<Button block type="primary" htmlType="submit">
{i18next.t("forget:Next Step")}
</Button>
</Form.Item>
</Form>
<Form.Item
hidden
name="organization"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your organization!"
),
},
]}
/>
<Form.Item
name="username"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your username!"
),
whitespace: true,
},
]}
>
<Input
prefix={<UserOutlined />}
placeholder={i18next.t("login:username, Email or phone")}
/>
</Form.Item>
<br />
<Form.Item>
<Button block type="primary" htmlType="submit">
{i18next.t("forget:Next Step")}
</Button>
</Form.Item>
</Form> : null}
{/* STEP 2: verify email or phone */}
<Form
hidden={this.state.current !== 1}
{this.state.current === 1 ? <Form
ref={this.form}
name="step2"
onFinishFailed={(errorInfo) =>
@@ -281,9 +266,17 @@ class ForgetPage extends React.Component {
errorInfo.outOfDate
)
}
onValuesChange={(changedValues, allValues) => {
const verifyType = changedValues.dest?.indexOf("@") === -1 ? "phone" : "email";
this.setState({
dest: changedValues.dest,
verifyType: verifyType,
});
}}
initialValues={{
application: application.name,
organization: application.organization,
dest: this.state.dest,
}}
style={{width: "300px"}}
size="large"
@@ -301,7 +294,7 @@ class ForgetPage extends React.Component {
]}
/>
<Form.Item
style={{height: 0, visibility: "hidden"}}
hidden
name="organization"
rules={[
{
@@ -313,32 +306,24 @@ class ForgetPage extends React.Component {
]}
/>
<Form.Item
name="email" // use email instead of email/phone to adapt to RequestForm in account.go
name="dest"
validateFirst
hasFeedback
>
{
this.state.isFixed ? <Input disabled /> :
<Select virtual={false}
key={this.state.verifyType}
style={{textAlign: "left"}}
defaultValue={this.state.verifyType}
disabled={this.state.username === ""}
placeholder={i18next.t("forget:Choose email or phone")}
onChange={(value) => {
this.setState({
verifyType: value,
});
}}
>
{
this.renderOptions()
}
</Select>
<Select virtual={false}
disabled={this.state.isVerifyTypeFixed}
style={{textAlign: "left"}}
placeholder={i18next.t("forget:Choose email or phone")}
>
{
this.renderOptions()
}
</Select>
}
</Form.Item>
<Form.Item
name="emailCode" // use emailCode instead of email/phoneCode to adapt to RequestForm in account.go
name="code"
rules={[
{
required: true,
@@ -348,21 +333,11 @@ class ForgetPage extends React.Component {
},
]}
>
{this.state.verifyType === "email" ? (
<SendCodeInput
disabled={this.state.username === "" || this.state.verifyType === ""}
method={"forget"}
onButtonClickArgs={[this.state.email, "email", Setting.getApplicationName(this.getApplicationObj()), this.state.name]}
application={application}
/>
) : (
<SendCodeInput
disabled={this.state.username === "" || this.state.verifyType === ""}
method={"forget"}
onButtonClickArgs={[this.state.phone, "phone", Setting.getApplicationName(this.getApplicationObj()), this.state.name]}
application={application}
/>
)}
<SendCodeInput disabled={this.state.dest === ""}
method={"forget"}
onButtonClickArgs={[this.state.dest, this.state.verifyType, Setting.getApplicationName(this.getApplicationObj()), this.state.name]}
application={application}
/>
</Form.Item>
<br />
<Form.Item>
@@ -374,109 +349,109 @@ class ForgetPage extends React.Component {
{i18next.t("forget:Next Step")}
</Button>
</Form.Item>
</Form>
</Form> : null}
{/* STEP 3 */}
<Form
hidden={this.state.current !== 2}
ref={this.form}
name="step3"
onFinish={(values) => this.onFinish(values)}
onFinishFailed={(errorInfo) =>
this.onFinishFailed(
errorInfo.values,
errorInfo.errorFields,
errorInfo.outOfDate
)
}
initialValues={{
application: application.name,
organization: application.organization,
}}
style={{width: "300px"}}
size="large"
>
<Form.Item
style={{height: 0, visibility: "hidden"}}
name="application"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your application!"
),
},
]}
/>
<Form.Item
style={{height: 0, visibility: "hidden"}}
name="organization"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your organization!"
),
},
]}
/>
<Form.Item
name="newPassword"
hidden={this.state.current !== 2}
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your password!"
),
},
]}
hasFeedback
{this.state.current === 2 ?
<Form
ref={this.form}
name="step3"
onFinish={(values) => this.onFinish(values)}
onFinishFailed={(errorInfo) =>
this.onFinishFailed(
errorInfo.values,
errorInfo.errorFields,
errorInfo.outOfDate
)
}
initialValues={{
application: application.name,
organization: application.organization,
}}
style={{width: "300px"}}
size="large"
>
<Input.Password
disabled={this.state.userId === ""}
prefix={<LockOutlined />}
placeholder={i18next.t("forget:Password")}
/>
</Form.Item>
<Form.Item
name="confirm"
dependencies={["newPassword"]}
hasFeedback
rules={[
{
required: true,
message: i18next.t(
"forget:Please confirm your password!"
),
},
({getFieldValue}) => ({
validator(rule, value) {
if (!value || getFieldValue("newPassword") === value) {
return Promise.resolve();
}
return Promise.reject(
i18next.t(
"forget:Your confirmed password is inconsistent with the password!"
)
);
<Form.Item
hidden
name="application"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your application!"
),
},
}),
]}
>
<Input.Password
disabled={this.state.userId === ""}
prefix={<CheckCircleOutlined />}
placeholder={i18next.t("forget:Confirm")}
]}
/>
</Form.Item>
<br />
<Form.Item hidden={this.state.current !== 2}>
<Button block type="primary" htmlType="submit" disabled={this.state.userId === ""}>
{i18next.t("forget:Change Password")}
</Button>
</Form.Item>
</Form>
<Form.Item
hidden
name="organization"
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your organization!"
),
},
]}
/>
<Form.Item
name="newPassword"
hidden={this.state.current !== 2}
rules={[
{
required: true,
message: i18next.t(
"forget:Please input your password!"
),
},
]}
hasFeedback
>
<Input.Password
disabled={this.state.userId === ""}
prefix={<LockOutlined />}
placeholder={i18next.t("forget:Password")}
/>
</Form.Item>
<Form.Item
name="confirm"
dependencies={["newPassword"]}
hasFeedback
rules={[
{
required: true,
message: i18next.t(
"forget:Please confirm your password!"
),
},
({getFieldValue}) => ({
validator(rule, value) {
if (!value || getFieldValue("newPassword") === value) {
return Promise.resolve();
}
return Promise.reject(
i18next.t(
"forget:Your confirmed password is inconsistent with the password!"
)
);
},
}),
]}
>
<Input.Password
disabled={this.state.userId === ""}
prefix={<CheckCircleOutlined />}
placeholder={i18next.t("forget:Confirm")}
/>
</Form.Item>
<br />
<Form.Item hidden={this.state.current !== 2}>
<Button block type="primary" htmlType="submit" disabled={this.state.userId === ""}>
{i18next.t("forget:Change Password")}
</Button>
</Form.Item>
</Form> : null}
</Form.Provider>
);
}
@@ -516,6 +491,20 @@ class ForgetPage extends React.Component {
<Col span={24}>
<Steps
current={this.state.current}
items={[
{
title: i18next.t("forget:Account"),
icon: <UserOutlined />,
},
{
title: i18next.t("forget:Account"),
icon: <SolutionOutlined />,
},
{
title: i18next.t("forget:Account"),
icon: <KeyOutlined />,
},
]}
style={{
width: "90%",
maxWidth: "500px",
@@ -523,24 +512,12 @@ class ForgetPage extends React.Component {
marginTop: "80px",
}}
>
<Step
title={i18next.t("forget:Account")}
icon={<UserOutlined />}
/>
<Step
title={i18next.t("forget:Verify")}
icon={<SolutionOutlined />}
/>
<Step
title={i18next.t("forget:Reset")}
icon={<KeyOutlined />}
/>
</Steps>
</Col>
</Row>
</Col>
<Col span={24} style={{display: "flex", justifyContent: "center"}}>
<div style={{marginTop: "10px", textAlign: "center"}}>
<div style={{marginTop: "40px", textAlign: "center"}}>
{this.renderForm(application)}
</div>
</Col>

View File

@@ -109,7 +109,7 @@ export function setPassword(userOwner, userName, oldPassword, newPassword) {
}).then(res => res.json());
}
export function sendCode(checkType, checkId, checkKey, method, countryCode, dest, type, applicationId, checkUser = "") {
export function sendCode(checkType, checkId, checkKey, method, countryCode = "", dest, type, applicationId, checkUser = "") {
const formData = new FormData();
formData.append("checkType", checkType);
formData.append("checkId", checkId);