From 7a0ed4ebaf213ca815acd36fc3f5a3c54cf086ad Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Tue, 27 Apr 2021 22:47:44 +0800 Subject: [PATCH] Replace "register" with "sign up". --- authz/authz.go | 2 +- controllers/account.go | 16 ++++++++-------- controllers/auth.go | 4 ++-- object/check.go | 2 +- routers/router.go | 2 +- web/src/App.js | 12 ++++++------ web/src/auth/AuthBackend.js | 4 ++-- web/src/auth/LoginPage.js | 4 ++-- web/src/auth/ResultPage.js | 2 +- web/src/auth/{RegisterPage.js => SignupPage.js} | 10 +++++----- web/src/auth/Util.js | 4 ++-- web/src/locales/en.json | 2 +- web/src/locales/zh.json | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) rename web/src/auth/{RegisterPage.js => SignupPage.js} (96%) diff --git a/authz/authz.go b/authz/authz.go index 762c5f8a..a615b2f9 100644 --- a/authz/authz.go +++ b/authz/authz.go @@ -69,7 +69,7 @@ m = (r.subOwner == p.subOwner || p.subOwner == "*") && \ if true { ruleText := ` p, built-in, *, *, *, *, * -p, *, *, POST, /api/register, *, * +p, *, *, POST, /api/signup, *, * p, *, *, POST, /api/login, *, * p, *, *, GET, /api/get-app-login, *, * p, *, *, POST, /api/logout, *, * diff --git a/controllers/account.go b/controllers/account.go index 933f725e..66dc6ffe 100644 --- a/controllers/account.go +++ b/controllers/account.go @@ -54,13 +54,13 @@ type Response struct { Data interface{} `json:"data"` } -// @Title Register -// @Description register a new user -// @Param username formData string true "The username to register" +// @Title Signup +// @Description sign up a new user +// @Param username formData string true "The username to sign up" // @Param password formData string true "The password" // @Success 200 {object} controllers.Response The Response object -// @router /register [post] -func (c *ApiController) Register() { +// @router /signup [post] +func (c *ApiController) Signup() { var resp Response if c.GetSessionUser() != "" { @@ -76,7 +76,7 @@ func (c *ApiController) Register() { panic(err) } - msg := object.CheckUserRegister(form.Username, form.Password) + msg := object.CheckUserSignup(form.Username, form.Password) if msg != "" { resp = Response{Status: "error", Msg: msg, Data: ""} } else { @@ -94,7 +94,7 @@ func (c *ApiController) Register() { //c.SetSessionUser(user) - util.LogInfo(c.Ctx, "API: [%s] is registered as new user", user) + util.LogInfo(c.Ctx, "API: [%s] is signed up as new user", user) resp = Response{Status: "ok", Msg: "", Data: user} } @@ -143,7 +143,7 @@ func (c *ApiController) GetAccount() { } // @Title UploadAvatar -// @Description register a new user +// @Description upload avatar // @Param avatarfile formData string true "The base64 encode of avatarfile" // @Param password formData string true "The password" // @Success 200 {object} controllers.Response The Response object diff --git a/controllers/auth.go b/controllers/auth.go index 856e9ed6..97b38a96 100644 --- a/controllers/auth.go +++ b/controllers/auth.go @@ -174,12 +174,12 @@ func (c *ApiController) Login() { //} if !application.EnableSignUp { - resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s does not exist and is not allowed to register as new account, please contact your IT support", provider.Type, userInfo.Username)} + resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s does not exist and is not allowed to sign up as new account, please contact your IT support", provider.Type, userInfo.Username)} c.Data["json"] = resp c.ServeJSON() return } else { - resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s does not exist, please register an account first", provider.Type, userInfo.Username)} + resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s does not exist, please create an account first", provider.Type, userInfo.Username)} c.Data["json"] = resp c.ServeJSON() return diff --git a/object/check.go b/object/check.go index 582d2380..71f7f47d 100644 --- a/object/check.go +++ b/object/check.go @@ -16,7 +16,7 @@ package object import "fmt" -func CheckUserRegister(userId string, password string) string { +func CheckUserSignup(userId string, password string) string { if len(userId) == 0 || len(password) == 0 { return "username and password cannot be blank" } else if HasUser(userId) { diff --git a/routers/router.go b/routers/router.go index fc2229a5..a489d3cb 100644 --- a/routers/router.go +++ b/routers/router.go @@ -39,7 +39,7 @@ func initAPI() { ) beego.AddNamespace(ns) - beego.Router("/api/register", &controllers.ApiController{}, "POST:Register") + beego.Router("/api/signup", &controllers.ApiController{}, "POST:Signup") beego.Router("/api/login", &controllers.ApiController{}, "POST:Login") beego.Router("/api/get-app-login", &controllers.ApiController{}, "GET:GetApplicationLogin") beego.Router("/api/logout", &controllers.ApiController{}, "POST:Logout") diff --git a/web/src/App.js b/web/src/App.js index 96aae672..287d0a89 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -33,7 +33,7 @@ import HomePage from "./basic/HomePage"; import CustomGithubCorner from "./CustomGithubCorner"; import * as Auth from "./auth/Auth"; -import RegisterPage from "./auth/RegisterPage"; +import SignupPage from "./auth/SignupPage"; import ResultPage from "./auth/ResultPage"; import LoginPage from "./auth/LoginPage"; import SelfLoginPage from "./auth/SelfLoginPage"; @@ -94,7 +94,7 @@ class App extends Component { this.setState({ selectedMenuKey: 4 }); } else if (uri.includes('tokens')) { this.setState({ selectedMenuKey: 5 }); - } else if (uri.includes('register')) { + } else if (uri.includes('signup')) { this.setState({ selectedMenuKey: 100 }); } else if (uri.includes('login')) { this.setState({ selectedMenuKey: 101 }); @@ -214,8 +214,8 @@ class App extends Component { } else if (this.state.account === null) { res.push( - - {i18next.t("account:Register")} + + {i18next.t("account:Sign Up")} ); @@ -314,7 +314,7 @@ class App extends Component { isStartPages() { return window.location.pathname.startsWith('/login') || - window.location.pathname.startsWith('/register') || + window.location.pathname.startsWith('/signup') || window.location.pathname === '/'; } @@ -344,7 +344,7 @@ class App extends Component { - this.renderHomeIfLoggedIn()}/> + this.renderHomeIfLoggedIn()}/> this.renderHomeIfLoggedIn()}/> this.renderHomeIfLoggedIn()}/> diff --git a/web/src/auth/AuthBackend.js b/web/src/auth/AuthBackend.js index 4d783ba7..a4a846d7 100644 --- a/web/src/auth/AuthBackend.js +++ b/web/src/auth/AuthBackend.js @@ -22,8 +22,8 @@ export function getAccount(accessToken) { }).then(res => res.json()); } -export function register(values) { - return fetch(`${authConfig.serverUrl}/api/register`, { +export function signup(values) { + return fetch(`${authConfig.serverUrl}/api/signup`, { method: 'POST', credentials: "include", body: JSON.stringify(values), diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index a3be6454..c0c36876 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -210,7 +210,7 @@ class LoginPage extends React.Component { !application.enableSignUp ? null : (
{i18next.t("login:No account yet?")}  - + {i18next.t("login:sign up now")}
@@ -250,7 +250,7 @@ class LoginPage extends React.Component {
No account yet?  - + sign up now
diff --git a/web/src/auth/ResultPage.js b/web/src/auth/ResultPage.js index 8df74682..ff1885df 100644 --- a/web/src/auth/ResultPage.js +++ b/web/src/auth/ResultPage.js @@ -29,7 +29,7 @@ class ResultPage extends React.Component {
diff --git a/web/src/auth/RegisterPage.js b/web/src/auth/SignupPage.js similarity index 96% rename from web/src/auth/RegisterPage.js rename to web/src/auth/SignupPage.js index 7450c5ca..d6428c9d 100644 --- a/web/src/auth/RegisterPage.js +++ b/web/src/auth/SignupPage.js @@ -52,7 +52,7 @@ const tailFormItemLayout = { }, }; -class RegisterPage extends React.Component { +class SignupPage extends React.Component { constructor(props) { super(props); this.state = { @@ -63,12 +63,12 @@ class RegisterPage extends React.Component { } onFinish(values) { - AuthBackend.register(values) + AuthBackend.signup(values) .then((res) => { if (res.status === 'ok') { this.props.history.push('/result'); } else { - Setting.showMessage("error", `Failed to register: ${res.msg}`); + Setting.showMessage("error", `Failed to sign up: ${res.msg}`); } }); } @@ -95,7 +95,7 @@ class RegisterPage extends React.Component {
this.onFinish(values)} onFinishFailed={(errorInfo) => this.onFinishFailed(errorInfo.values, errorInfo.errorFields, errorInfo.outOfDate)} initialValues={{ @@ -249,4 +249,4 @@ class RegisterPage extends React.Component { } } -export default RegisterPage; +export default SignupPage; diff --git a/web/src/auth/Util.js b/web/src/auth/Util.js index a4f8f724..6f27f83f 100644 --- a/web/src/auth/Util.js +++ b/web/src/auth/Util.js @@ -58,8 +58,8 @@ export function renderMessageLarge(ths, msg) { , - , ]} > diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 8550e34b..d93b61f4 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -48,7 +48,7 @@ "Settings for your account": "Settings for your account", "Login": "Login", "Logout": "Logout", - "Register": "Register" + "Sign Up": "Sign Up" }, "organization": { diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json index 2e255004..31cfb714 100644 --- a/web/src/locales/zh.json +++ b/web/src/locales/zh.json @@ -48,7 +48,7 @@ "Settings for your account": "账户设置选项", "Login": "登录", "Logout": "登出", - "Register": "注册" + "Sign Up": "注册" }, "organization": {