fix: default bookadmin with authing id & _Session init when server start

projects/textbook/src/app/app.component.ts

@@ -16,7 +16,8 @@ export class AppComponent {
   }
   initParseService(){
     Parse.initialize("edu-textbook");
-    (Parse as any).serverURL = ("http://8.140.98.43/parse");
+    (Parse as any).serverURL = ("http://127.0.0.1:61337/parse");
+    // (Parse as any).serverURL = ("http://8.140.98.43/parse");
     localStorage.setItem('company','RbIKpmuaMC')
   }
 

server/.gitignore

@@ -2,4 +2,5 @@ node_modules/
 logs/
 database/
 bin/
-dist/
+dist/
+temp*

server/cloud/authing/func-authing-session-sync.js

@@ -61,7 +61,7 @@ async function syncSessionWithIdToken(token){
     "expiresAt"=excluded."expiresAt",
     "updatedAt"=excluded."updatedAt";
     `
-    let params = [sessionObjectId,user?.id,user?.token,user?.expiresAt,new Date(),new Date(),username,user?.phone]
+    let params = [sessionObjectId,user?.id,user?.token,user?.tokenExpiredAt,new Date(),new Date(),username,user?.phone]
     if(user?.id&&user?.token){
         try {
             // 查询：数据库版本信息
@@ -74,7 +74,7 @@ async function syncSessionWithIdToken(token){
             };
         } catch (error) {
             console.error('Error executing query:', error);
-            return null;
+            return error;
         }
     }
 }

server/cloud/authing/test/test-authing-session-sync.js

@@ -5,5 +5,5 @@ syncSessionWithIdToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cGRhdGVkX2F0Ijo
 
 /**
  * Cloud Code test
- curl -X POST -H "Content-Type: application/json" -H 'X-Parse-Application-Id: edu-textbook' -d '{ "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cGRhdGVkX2F0IjoiMjAyNC0wNy0wMVQxNToxMDowMy45ODlaIiwiYWRkcmVzcyI6eyJjb3VudHJ5IjpudWxsLCJwb3N0YWxfY29kZSI6bnVsbCwicmVnaW9uIjpudWxsLCJmb3JtYXR0ZWQiOm51bGx9LCJwaG9uZV9udW1iZXJfdmVyaWZpZWQiOnRydWUsInBob25lX251bWJlciI6IjE4NjkxNzcwMzQzIiwibG9jYWxlIjpudWxsLCJ6b25laW5mbyI6bnVsbCwiYmlydGhkYXRlIjpudWxsLCJnZW5kZXIiOiJVIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJlbWFpbCI6bnVsbCwid2Vic2l0ZSI6bnVsbCwicGljdHVyZSI6Imh0dHBzOi8vZmlsZXMuYXV0aGluZy5jby9hdXRoaW5nLWNvbnNvbGUvZGVmYXVsdC11c2VyLWF2YXRhci5wbmciLCJwcm9maWxlIjpudWxsLCJwcmVmZXJyZWRfdXNlcm5hbWUiOm51bGwsIm5pY2tuYW1lIjpudWxsLCJtaWRkbGVfbmFtZSI6bnVsbCwiZmFtaWx5X25hbWUiOm51bGwsImdpdmVuX25hbWUiOm51bGwsIm5hbWUiOm51bGwsInN1YiI6IjY2ODJiZmU4MzcxNWIzYmIwNmM4ZGNiMiIsImV4dGVybmFsX2lkIjpudWxsLCJ1bmlvbmlkIjpudWxsLCJ1c2VybmFtZSI6bnVsbCwic2Vjb25kYXJ5VXNlcklkcyI6bnVsbCwiZGF0YSI6eyJ0eXBlIjoidXNlciIsInVzZXJQb29sSWQiOiI2NjcyNTQwZDg3NTZhNTAzYzZmNmYwM2UiLCJhcHBJZCI6IjY2ODJhYjk2YjdiZDVkYjU5ZDY3ODVhMCIsImlkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwidXNlcklkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwiX2lkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwicGhvbmUiOiIxODY5MTc3MDM0MyIsImVtYWlsIjpudWxsLCJ1c2VybmFtZSI6bnVsbCwidW5pb25pZCI6bnVsbCwib3BlbmlkIjpudWxsLCJjbGllbnRJZCI6IjY2NzI1NDBkODc1NmE1MDNjNmY2ZjAzZSJ9LCJ1c2VycG9vbF9pZCI6IjY2NzI1NDBkODc1NmE1MDNjNmY2ZjAzZSIsImF1ZCI6IjY2ODJhYjk2YjdiZDVkYjU5ZDY3ODVhMCIsImV4cCI6MTcyMTA5MzIxNSwiaWF0IjoxNzE5ODgzNjE1LCJpc3MiOiJodHRwczovL3RleHRib29rLnUyLWRldi5oZXAuY29tLmNuL29pZGMifQ.LiAB91Gm3FgJ8tnB1lCON-Q2C8Wr510JhA5Fu8JhPe4" }' http://localhost:61337/parse/functions/authingLogin
+ curl -X POST -H "Content-Type: application/json" -H 'X-Parse-Application-Id: edu-textbook' -d '{ "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1cGRhdGVkX2F0IjoiMjAyNC0wNy0wM1QwMjoxMTo1Ny44NDJaIiwiYWRkcmVzcyI6eyJjb3VudHJ5IjpudWxsLCJwb3N0YWxfY29kZSI6bnVsbCwicmVnaW9uIjpudWxsLCJmb3JtYXR0ZWQiOm51bGx9LCJwaG9uZV9udW1iZXJfdmVyaWZpZWQiOnRydWUsInBob25lX251bWJlciI6IjE4NjkxNzcwMzQzIiwibG9jYWxlIjpudWxsLCJ6b25laW5mbyI6bnVsbCwiYmlydGhkYXRlIjpudWxsLCJnZW5kZXIiOiJVIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJlbWFpbCI6bnVsbCwid2Vic2l0ZSI6bnVsbCwicGljdHVyZSI6Imh0dHBzOi8vZmlsZXMuYXV0aGluZy5jby9hdXRoaW5nLWNvbnNvbGUvZGVmYXVsdC11c2VyLWF2YXRhci5wbmciLCJwcm9maWxlIjpudWxsLCJwcmVmZXJyZWRfdXNlcm5hbWUiOm51bGwsIm5pY2tuYW1lIjpudWxsLCJtaWRkbGVfbmFtZSI6bnVsbCwiZmFtaWx5X25hbWUiOm51bGwsImdpdmVuX25hbWUiOm51bGwsIm5hbWUiOm51bGwsInN1YiI6IjY2ODJiZmU4MzcxNWIzYmIwNmM4ZGNiMiIsImV4dGVybmFsX2lkIjpudWxsLCJ1bmlvbmlkIjpudWxsLCJ1c2VybmFtZSI6bnVsbCwic2Vjb25kYXJ5VXNlcklkcyI6bnVsbCwiZGF0YSI6eyJ0eXBlIjoidXNlciIsInVzZXJQb29sSWQiOiI2NjcyNTQwZDg3NTZhNTAzYzZmNmYwM2UiLCJhcHBJZCI6IjY2ODJhYjk2YjdiZDVkYjU5ZDY3ODVhMCIsImlkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwidXNlcklkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwiX2lkIjoiNjY4MmJmZTgzNzE1YjNiYjA2YzhkY2IyIiwicGhvbmUiOiIxODY5MTc3MDM0MyIsImVtYWlsIjpudWxsLCJ1c2VybmFtZSI6bnVsbCwidW5pb25pZCI6bnVsbCwib3BlbmlkIjpudWxsLCJjbGllbnRJZCI6IjY2NzI1NDBkODc1NmE1MDNjNmY2ZjAzZSJ9LCJ1c2VycG9vbF9pZCI6IjY2NzI1NDBkODc1NmE1MDNjNmY2ZjAzZSIsImF1ZCI6IjY2ODJhYjk2YjdiZDVkYjU5ZDY3ODVhMCIsImV4cCI6MTcyMTE4MzI0NCwiaWF0IjoxNzE5OTczNjQ0LCJpc3MiOiJodHRwczovL3RleHRib29rLnUyLWRldi5oZXAuY29tLmNuL29pZGMifQ.AH-rjp1RYBZy5VrOeZPLoX2vOjtfIy7dPKS5R7WorNk" }' http://8.140.98.43/parse/functions/authingLogin
  */

server/db/data/init-data.sql.js

@@ -8,9 +8,10 @@ SET "title" = excluded."title","createdAt"=excluded."createdAt","updatedAt"=excl
 
 
 -- 初始超级管理员 bookadmin bk2024
+-- Authing同步用户ID 6684b5464b9206e48dbcf67c
 INSERT INTO "_User" ("objectId", "username", "_hashed_password", "company", "createdAt", "updatedAt")
 VALUES
-('BOOKADMINI', 'bookadmin','$2y$10$diWXn9Sksms/neufGnphU.4wKUXF0CivkRltz4.NMEF9f4MJu2aX6','RbIKpmuaMC','2024-06-16 12:00:00','2024-06-16 12:00:00')
+('6684b5464b9206e48dbcf67c', 'bookadmin','$2y$10$diWXn9Sksms/neufGnphU.4wKUXF0CivkRltz4.NMEF9f4MJu2aX6','RbIKpmuaMC','2024-06-16 12:00:00','2024-06-16 12:00:00')
 ON conflict("objectId") DO UPDATE
 SET 
 "username" = excluded."username",
@@ -21,7 +22,7 @@ SET
 -- 初始化超级管理员角色
 INSERT INTO "_Role" ("objectId","title", "name", "_rperm", "_wperm", "company", "createdAt", "updatedAt")
 VALUES
-('ZQOwyoDteL','超级管理员', 'superadmin','{*,BOOKADMINI}','{BOOKADMINI}','RbIKpmuaMC','2024-06-16 12:00:00','2024-06-16 12:00:00')
+('ZQOwyoDteL','超级管理员', 'superadmin','{*,6684b5464b9206e48dbcf67c}','{6684b5464b9206e48dbcf67c}','RbIKpmuaMC','2024-06-16 12:00:00','2024-06-16 12:00:00')
 ON conflict("objectId") DO UPDATE
 SET 
 "title" = excluded."title",
@@ -32,7 +33,7 @@ SET
 -- 超级管理员帐号，添加至超管用户组
 INSERT INTO "_Join:users:_Role" ("relatedId", "owningId")
 VALUES
-('BOOKADMINI', 'ZQOwyoDteL')
+('6684b5464b9206e48dbcf67c', 'ZQOwyoDteL')
 ON conflict("relatedId","owningId") DO UPDATE
 SET 
 "relatedId" = excluded."relatedId",

server/db/index.js

@@ -4,24 +4,17 @@ import {Profile} from "./schemas/Profile"
 import {EduCollection} from "./schemas/EduCollection"
 import {_User} from "./schemas/_User"
 import {_Role} from "./schemas/_Role"
+import {_Session} from "./schemas/_Session"
+import {Submitted} from "./schemas/Submitted"
 
-<<<<<<< HEAD
-const EduSchemas = [
-    require("./schemas/Company").Company,
-    require("./schemas/EduTextbook").EduTextbook,
-    require("./schemas/Profile").Profile,
-    require("./schemas/EduCollection").EduCollection,
-    require("./schemas/Submitted").Submitted,
-    require("./schemas/_User")._User,
-    require("./schemas/_Role")._Role,
-=======
 export const EduSchemas = [
+    _User,
+    _Role,
+    _Session,
     Company,
     EduTextbook,
     Profile,
     EduCollection,
-    _User,
-    _Role,
->>>>>>> 22cff7817c2cdc9d131492ef56da8b5f640cfd5a
+    Submitted,
 ]
 module.exports.EduSchemas = EduSchemas

server/db/schemas/Submitted.js

@@ -1,4 +1,4 @@
-const Submitted = {
+export const Submitted = {
   "className": "Submitted",
   "fields": {
     "eduCollection": { //指向报送合集

server/db/schemas/_Session.js

@@ -0,0 +1,25 @@
+export const _Session = {
+    "className": "_Session",
+    "fields": {
+        "sessionToken": {
+            "type": "String"
+        },
+        "expiresAt": {
+            "type": "String"
+        },
+        "installationId": {
+            "type": "String"
+        },
+        "user": {
+            "type": "Pointer",
+            "targetClass":"_User",
+            "required": false
+        },
+        "createdWith": {
+            "type": "Pointer",
+            "targetClass":"_User",
+            "required": false
+        }
+    }
+}
+module.exports._Role = _Role