netless-io
diff --git a/‎.gitlab-ci.yml‎
Lines changed: 23 additions & 10 deletions b/‎.gitlab-ci.yml‎
Lines changed: 23 additions & 10 deletions
diff --git a/‎.node-version‎
Lines changed: 1 addition & 0 deletions b/‎.node-version‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎config/defaults.yaml‎
Lines changed: 24 additions & 0 deletions b/‎config/defaults.yaml‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎config/test.yaml‎
Lines changed: 26 additions & 0 deletions b/‎config/test.yaml‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 3 additions & 0 deletions b/‎package.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/ErrorCode.ts‎
Lines changed: 8 additions & 0 deletions b/‎src/ErrorCode.ts‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/abstract/login/index.ts‎
Lines changed: 20 additions & 36 deletions b/‎src/abstract/login/index.ts‎
Lines changed: 20 additions & 36 deletions
@@ -23,12 +23,12 @@ stages:
     HOST_NAME: $HOST_NAME_CHINA
     KUBE_CONFIG: $KUBE_CONFIG_CHINA
 
-.us:
+.sg:
   before_script:
-    - cp $PROJECT_CONFIG_UNITED_STATES ./helm/files/production.yaml
+    - cp $PROJECT_CONFIG_SG ./helm/files/production.yaml
   variables:
-    HOST_NAME: $HOST_NAME_UNITED_STATES
-    KUBE_CONFIG: $KUBE_CONFIG_UNITED_STATES
+    HOST_NAME: $HOST_NAME_SG
+    KUBE_CONFIG: $KUBE_CONFIG_SG
 
 .docker_build: &DOCKER_BUILD
   stage: build_image
@@ -109,33 +109,46 @@ docker_build_prod:
         helm install stakater-reloader stakater/reloader --set reloader.watchGlobally=false --namespace $KUBE_NAMESPACE
       fi
 
-    - helm upgrade --install flat-server-$CI_ENVIRONMENT_SLUG helm
+    - helm upgrade --install $HELM_NAME helm --namespace $KUBE_NAMESPACE --set replicaCount=$REPLICA_COUNT
 
 deploy_dev_cn:
   <<: *DEPLOY
   variables:
     DOCKER_TAG: dev-$CI_COMMIT_SHA
+    KUBE_NAMESPACE: default
+    REPLICA_COUNT: 2
+    HELM_NAME: flat-server-development
   extends: .cn
   <<: *DEV
 
-deploy_dev_us:
+deploy_dev_sg:
   <<: *DEPLOY
-  extends: .us
+  extends: .sg
   variables:
     DOCKER_TAG: dev-$CI_COMMIT_SHA
+    KUBE_NAMESPACE: sg
+    REPLICA_COUNT: 2
+    HELM_NAME: flat-server-sg-development
   <<: *DEV
 
 deploy_prod_cn:
   <<: *DEPLOY
   extends: .cn
   variables:
     DOCKER_TAG: $CI_COMMIT_SHA
+    KUBE_NAMESPACE: default
+    REPLICA_COUNT: 3
+    HELM_NAME: flat-server-production
   <<: *PROD
+  when: manual
 
-deploy_prod_us:
+deploy_prod_sg:
   <<: *DEPLOY
-  extends: .us
+  extends: .sg
   variables:
     DOCKER_TAG: $CI_COMMIT_SHA
+    KUBE_NAMESPACE: default
+    REPLICA_COUNT: 3
+    HELM_NAME: flat-server-production
   <<: *PROD
-
+  when: manual
@@ -0,0 +1 @@
+18.17.0
@@ -23,6 +23,8 @@ jwt:
 
 website: https://flat-web-dev.whiteboard.agora.io
 
+default_avatar: https://flat-storage.oss-cn-hangzhou.aliyuncs.com/flat-resources/avatar/[index].png
+
 # flag see: https://github.com/netless-io/flat-server/blob/main/src/utils/EnvVariable.ts
 log:
   pathname: "{{PROJECT_DIR}}/logs"
@@ -79,6 +81,7 @@ oauth:
       - jpeg
 
 login:
+  salt:
   wechat:
     web:
       enable: false
@@ -97,6 +100,8 @@ login:
     client_id:
     client_secret:
     redirect_uri:
+      login:
+      bind:
   apple:
     enable: false
   agora:
@@ -125,6 +130,23 @@ login:
       access_secret:
       template_code:
       sign_name:
+  email:
+    enable: true
+    test_emails:
+      - email:
+        code:
+    type: smtp
+    smtp:
+      host: smtpdm.aliyun.com
+      port: 465
+      secure: true
+      auth:
+        user:
+        pass:
+    aliCloud:
+      access_id:
+      access_secret:
+      account_name: test@test.test
 
 agora:
   app:
@@ -159,8 +181,10 @@ agora:
         secret:
 
 whiteboard:
+  app_id:
   access_key:
   secret_access_key:
+  region:
   convert_region:
 
 storage_service:
 
@@ -1,6 +1,8 @@
 server:
   port: 8761
   env: dev
+  region: CN
+  region_code: 1
 
 redis:
   host: 127.0.0.1
@@ -23,6 +25,8 @@ jwt:
 
 website: https://flat-web-dev.whiteboard.agora.io
 
+default_avatar: https://flat-storage.oss-cn-hangzhou.aliyuncs.com/flat-resources/avatar/[index].png
+
 log:
   pathname: "{{PROJECT_DIR}}/logs"
   filename: "{{DAY_DATE}}"
@@ -72,6 +76,7 @@ oauth:
       - jpeg
 
 login:
+  salt: test
   wechat:
     web:
       enable: true
@@ -90,6 +95,8 @@ login:
     client_id:
     client_secret:
     redirect_uri:
+      login:
+      bind:
   apple:
     enable: true
   agora:
@@ -118,6 +125,23 @@ login:
       access_secret:
       template_code:
       sign_name:
+  email:
+    enable: true
+    test_emails:
+      - email:
+        code:
+    type: smtp
+    smtp:
+      host: smtpdm.aliyun.com
+      port: 465
+      secure: true
+      auth:
+        user:
+        pass:
+    aliCloud:
+      access_id:
+      access_secret:
+      account_name: test@test.test
 
 agora:
   app:
@@ -152,8 +176,10 @@ agora:
         secret:
 
 whiteboard:
+  app_id: "test/flat-server"
   access_key: "test"
   secret_access_key: "test"
+  region: "cn-hz"
   convert_region: "cn-hz"
 
 storage_service:
 
@@ -23,6 +23,7 @@
     "@types/lodash": "^4.14.170",
     "@types/node": "^18.0.0",
     "@types/node-rsa": "^1.1.1",
+    "@types/nodemailer": "^6.4.9",
     "@types/qs": "^6.9.7",
     "@types/query-string": "^6.3.0",
     "@types/sinon": "^10.0.12",
@@ -58,6 +59,7 @@
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
+    "@alicloud/dm20151123": "^1.0.6",
     "@alicloud/dysmsapi20170525": "^2.0.9",
     "@alicloud/openapi-client": "^0.4.1",
     "@fastify-userland/request-id": "^2.0.1",
@@ -89,6 +91,7 @@
     "mysql2": "^2.2.5",
     "nanoid": "^3.1.31",
     "node-rsa": "^1.1.1",
+    "nodemailer": "^6.9.4",
     "prom-client": "^14.0.0",
     "qs": "^6.10.3",
     "reflect-metadata": "^0.1.13",
 
@@ -25,6 +25,8 @@ export enum ErrorCode {
     UserNotFound = 400000, // user not found
     UserRoomListNotEmpty, // user room list is not empty.
     UserAlreadyBinding, // user already binding
+    UserPasswordIncorrect, // user password (for update) incorrect
+    UserOrPasswordIncorrect, // user or password (for login) incorrect
 
     RecordNotFound = 500000, // record info not found
 
@@ -50,6 +52,12 @@ export enum ErrorCode {
     SMSVerificationCodeInvalid = 110000, // verification code invalid
     SMSAlreadyExist, // phone already exist by current user
     SMSAlreadyBinding, // phone are binding by other users
+    SMSFailedToSendCode, // failed to send verification code
+
+    EmailVerificationCodeInvalid = 115000, // verification code invalid
+    EmailAlreadyExist, // email already exist by current user
+    EmailAlreadyBinding, // email are binding by other users
+    EmailFailedToSendCode, // failed to send verification code
 
     CensorshipFailed = 120000, // censorship failed
 
 
@@ -5,7 +5,6 @@ import { ErrorCode } from "../../ErrorCode";
 import { ControllerError } from "../../error/ControllerError";
 import { Logger, LoggerAPI } from "../../logger";
 import { getDisposition, ossClient } from "../../v1/controller/cloudStorage/alibabaCloud/Utils";
-import { Region } from "../../constants/Project";
 import {
     getFilePath,
     getOSSFileURLPath,
@@ -17,6 +16,8 @@ import { v4 } from "uuid";
 import { ServiceCloudStorageUserFiles } from "../../v1/service/cloudStorage/CloudStorageUserFiles";
 import { ServiceUserPhone } from "../../v1/service/user/UserPhone";
 import { FileConvertStep, FileResourceType } from "../../model/cloudStorage/Constants";
+import { ServiceUser } from "../../v1/service/user/User";
+import { Whiteboard } from "../../constants/Config";
 
 export abstract class AbstractLogin {
     protected readonly userUUID: string;
@@ -49,6 +50,7 @@ export abstract class AbstractLogin {
                 ...userInfo,
                 userUUID: this.userUUID,
                 hasPhone: await ServiceUserPhone.exist(this.userUUID),
+                hasPassword: await ServiceUser.hasPassword(this.userUUID),
             }),
             60 * 60,
         );
@@ -62,53 +64,35 @@ export abstract class AbstractLogin {
         },
         t: EntityManager,
     ): Promise<any> {
-        const [cnFileUUID, enFileUUID] = [v4(), v4()];
-        const [cnName, enName] = ["开始使用 Flat.pptx", "Get Started with Flat.pptx"];
-        const [cnPPTXPath, enPPTXPath] = [
-            getFilePath(cnName, cnFileUUID),
-            getFilePath(enName, enFileUUID),
-        ];
-        const [cnFileSize, enFileSize] = [5027927, 5141265];
+        const CN = Whiteboard.convertRegion === "cn-hz";
 
-        await Promise.all([
-            ossClient.copy(cnPPTXPath, AbstractLogin.guidePPTX, {
-                headers: { "Content-Disposition": getDisposition(cnName) },
-            }),
-            ossClient.copy(enPPTXPath, AbstractLogin.guidePPTX, {
-                headers: { "Content-Disposition": getDisposition(enName) },
-            }),
-        ]);
+        const fileUUID = v4();
+        const name = CN ? "开始使用 Flat.pptx" : "Get Started with Flat.pptx";
+        const pptxPath = getFilePath(name, fileUUID);
+        const fileSize = CN ? 5027927 : 5141265;
+
+        await ossClient.copy(pptxPath, AbstractLogin.guidePPTX, {
+            headers: { "Content-Disposition": getDisposition(name) },
+        });
 
         return Promise.all([
-            svc.cloudStorageConfigs.createOrUpdate(cnFileSize + enFileSize, t),
-            svc.cloudStorageFiles.create({
-                payload: {
-                    region: Region.CN_HZ,
-                    convertStep: FileConvertStep.None,
-                },
-                fileURL: getOSSFileURLPath(cnPPTXPath),
-                fileSize: cnFileSize,
-                fileUUID: cnFileUUID,
-                fileName: cnName,
-                resourceType: FileResourceType.WhiteboardProjector,
-            }),
+            svc.cloudStorageConfigs.createOrUpdate(fileSize, t),
             svc.cloudStorageFiles.create({
                 payload: {
-                    region: Region.US_SV,
+                    region: Whiteboard.convertRegion,
                     convertStep: FileConvertStep.None,
                 },
-                fileURL: getOSSFileURLPath(enPPTXPath),
-                fileSize: enFileSize,
-                fileUUID: enFileUUID,
-                fileName: enName,
+                fileURL: getOSSFileURLPath(pptxPath),
+                fileSize: fileSize,
+                fileUUID: fileUUID,
+                fileName: name,
                 resourceType: FileResourceType.WhiteboardProjector,
             }),
-            svc.cloudStorageUserFiles.create(cnFileUUID),
-            svc.cloudStorageUserFiles.create(enFileUUID),
+            svc.cloudStorageUserFiles.create(fileUUID),
         ]);
     }
 
-    private static get guidePPTX(): string {
+    public static get guidePPTX(): string {
         return "guide-pptx/guide.pptx";
     }
 }