From 35e482f24e19191973b24f368551bff5cd24b5d1 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Wed, 28 Apr 2021 21:25:58 +0800
Subject: [PATCH] Fix the signup.

---
 controllers/account.go     | 32 +++++++++++++++++++++-----------
 web/src/auth/LoginPage.js  | 30 ++++++++++++++++++++----------
 web/src/auth/ResultPage.js |  7 ++++---
 web/src/auth/SignupPage.js | 19 +++++++++++++++----
 web/src/locales/en.json    |  4 +++-
 web/src/locales/zh.json    |  4 +++-
 6 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/controllers/account.go b/controllers/account.go
index bac576e5..a5d1efbf 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -37,7 +37,9 @@ type RequestForm struct {
 	Password     string `json:"password"`
 	Name         string `json:"name"`
 	Email        string `json:"email"`
+	PhonePrefix  string `json:"phonePrefix"`
 	Phone        string `json:"phone"`
+	Affiliation  string `json:"affiliation"`
 
 	Application string `json:"application"`
 	Provider    string `json:"provider"`
@@ -75,26 +77,34 @@ func (c *ApiController) Signup() {
 		panic(err)
 	}
 
-	msg := object.CheckUserSignup(form.Username, form.Password)
+	userId := fmt.Sprintf("%s/%s", form.Organization, form.Username)
+	msg := object.CheckUserSignup(userId, form.Password)
 	if msg != "" {
 		resp = Response{Status: "error", Msg: msg, Data: ""}
 	} else {
 		user := &object.User{
-			Owner:        form.Organization,
-			Name:         form.Username,
-			CreatedTime:  util.GetCurrentTime(),
-			Password:     form.Password,
-			PasswordType: "plain",
-			DisplayName:  form.Name,
-			Email:        form.Email,
-			Phone:        form.Phone,
+			Owner:         form.Organization,
+			Name:          form.Username,
+			CreatedTime:   util.GetCurrentTime(),
+			Id:            util.GenerateId(),
+			Type:          "normal-user",
+			Password:      form.Password,
+			PasswordType:  "plain",
+			DisplayName:   form.Name,
+			Avatar:        "https://casbin.org/img/casbin.svg",
+			Email:         form.Email,
+			PhonePrefix:   form.PhonePrefix,
+			Phone:         form.Phone,
+			Affiliation:   form.Affiliation,
+			IsAdmin:       false,
+			IsGlobalAdmin: false,
 		}
 		object.AddUser(user)
 
 		//c.SetSessionUser(user)
 
-		util.LogInfo(c.Ctx, "API: [%s] is signed up as new user", user)
-		resp = Response{Status: "ok", Msg: "", Data: user}
+		util.LogInfo(c.Ctx, "API: [%s] is signed up as new user", userId)
+		resp = Response{Status: "ok", Msg: "", Data: userId}
 	}
 
 	c.Data["json"] = resp
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index d1006ef4..28f7e14f 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -24,6 +24,7 @@ import * as Setting from "../Setting";
 import {GithubLoginButton, GoogleLoginButton} from "react-social-login-buttons";
 import QqLoginButton from "./QqLoginButton";
 import i18next from "i18next";
+import {authConfig} from "./Auth";
 
 class LoginPage extends React.Component {
   constructor(props) {
@@ -139,6 +140,14 @@ class LoginPage extends React.Component {
     }
   }
 
+  getSignupPath(application) {
+    if (authConfig.appName === application.name) {
+      return "/signup";
+    } else {
+      return `/signup/${application.name}`;
+    }
+  }
+
   renderForm(application) {
     if (this.state.msg !== null) {
       return Util.renderMessage(this.state.msg)
@@ -156,15 +165,16 @@ class LoginPage extends React.Component {
           style={{width: "250px"}}
           size="large"
         >
-          <Form.Item style={{height: 0, visibility: "hidden"}}
-                     name="organization"
-                     rules={[{ required: true, message: 'Please input your organization!' }]}
+          <Form.Item
+            style={{height: 0, visibility: "hidden"}}
+            name="organization"
+            rules={[
+              {
+                required: true,
+                message: 'Please input your organization!',
+              },
+            ]}
           >
-            <Input
-              prefix={<UserOutlined className="site-form-item-icon" />}
-              placeholder="organization"
-              disabled={!application.enablePassword}
-            />
           </Form.Item>
           <Form.Item
             name="username"
@@ -210,7 +220,7 @@ class LoginPage extends React.Component {
               !application.enableSignUp ? null : (
                 <div style={{float: "right"}}>
                   {i18next.t("login:No account yet?")}&nbsp;
-                  <Link to={"/signup"}>
+                  <Link to={this.getSignupPath(application)}>
                     {i18next.t("login:sign up now")}
                   </Link>
                 </div>
@@ -250,7 +260,7 @@ class LoginPage extends React.Component {
                 <br/>
                 <div style={{float: "right"}}>
                   No account yet?&nbsp;
-                  <Link to={"/signup"}>
+                  <Link to={this.getSignupPath(application)}>
                     sign up now
                   </Link>
                 </div>
diff --git a/web/src/auth/ResultPage.js b/web/src/auth/ResultPage.js
index ff1885df..e4aaba75 100644
--- a/web/src/auth/ResultPage.js
+++ b/web/src/auth/ResultPage.js
@@ -15,6 +15,7 @@
 import React from "react";
 import {Link} from "react-router-dom";
 import {Result, Button} from 'antd';
+import i18next from "i18next";
 
 class ResultPage extends React.Component {
   constructor(props) {
@@ -29,12 +30,12 @@ class ResultPage extends React.Component {
       <div>
         <Result
           status="success"
-          title="Your account is created"
-          subTitle="Please click the below button to login"
+          title={i18next.t("signup:Your account has been created!")}
+          subTitle={i18next.t("signup:Please click the below button to sign in")}
           extra={[
             <Link to="/login">
               <Button type="primary" key="login">
-                Login
+                {i18next.t("login:Sign In")}
               </Button>
             </Link>
           ]}
diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js
index 05418232..b46eead9 100644
--- a/web/src/auth/SignupPage.js
+++ b/web/src/auth/SignupPage.js
@@ -106,7 +106,7 @@ class SignupPage extends React.Component {
 
   renderForm(application) {
     const prefixSelector = (
-      <Form.Item name="prefix" noStyle>
+      <Form.Item name="phonePrefix" noStyle>
         <Select
           style={{
             width: 80,
@@ -126,12 +126,23 @@ class SignupPage extends React.Component {
         onFinish={(values) => this.onFinish(values)}
         onFinishFailed={(errorInfo) => this.onFinishFailed(errorInfo.values, errorInfo.errorFields, errorInfo.outOfDate)}
         initialValues={{
-          application: application.name,
-          prefix: '86',
+          organization: application.organization,
+          phonePrefix: '86',
         }}
         style={{width: !Setting.isMobile() ? "400px" : "250px"}}
         size="large"
       >
+        <Form.Item
+          style={{height: 0, visibility: "hidden"}}
+          name="organization"
+          rules={[
+            {
+              required: true,
+              message: 'Please input your organization!',
+            },
+          ]}
+        >
+        </Form.Item>
         <Form.Item
           name="username"
           label={i18next.t("signup:Username")}
@@ -146,7 +157,7 @@ class SignupPage extends React.Component {
           <Input />
         </Form.Item>
         <Form.Item
-          name="displayName"
+          name="name"
           label={i18next.t("general:Display name")}
           rules={[
             {
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index c77d7208..9b2e82e9 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -44,7 +44,9 @@
     "Accept": "Accept",
     "Terms of Use": "Terms of Use",
     "Have account?": "Have account?",
-    "sign in now": "sign in now"
+    "sign in now": "sign in now",
+    "Your account has been created!": "Your account has been created!",
+    "Please click the below button to sign in": "Please click the below button to sign in"
   },
   "login":
   {
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index 48d75f13..99318222 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -44,7 +44,9 @@
     "Accept": "阅读并接受",
     "Terms of Use": "《用户协议》",
     "Have account?": "已有账号？",
-    "sign in now": "立即登录"
+    "sign in now": "立即登录",
+    "Your account has been created!": "您的账号已创建！",
+    "Please click the below button to sign in": "请点击下方按钮登录"
   },
   "login":
   {