Merge remote-tracking branch 'refs/remotes/origin/master'

beetcb · Feb 20, 2021 · a1e824f · a1e824f
2 parents dadb701 + 0fdb490
commit a1e824f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/campusphere/app.js b/campusphere/app.js
@@ -108,7 +108,7 @@ exports.signApp = class signApp extends campusphereApp {
     const logInfo = {
       签到结果: res.message,
       签到地址: form.position,
-      真实信息: signedStuInfo.userNamdd,
+      真实信息: signedStuInfo.userName,
     }
 
     // Hide sensitive info on github actions, cause it's public by default
@@ -125,7 +125,8 @@ exports.signApp = class signApp extends campusphereApp {
     // Hard coded position info
     // Randomly generated from http://api.map.baidu.com/lbsapi
     const userAddr = this.user.addr
-    const posGenFromCitys = userAddr
+    const noRandom = !(typeof userAddr === 'string')
+    const posGenFromCitys = noRandom
       ? [userAddr]
       : [
           ['116.622631', '40.204822', '北京市顺义区X012'],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beetcb/cea",
-  "version": "1.1.9",
+  "version": "2.0.2",
   "description": "campusphere-elegant-auth: login to swms/campusphere at ease",
   "main": "dist/api.js",
   "bin": "dist/cli.js",

diff --git a/serverless/cea/package.json b/serverless/cea/package.json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beetcb/cea": "^1.1.9"
+    "@beetcb/cea": "^2.0.1"
   }
 }
diff --git a/src/api.js b/src/api.js
@@ -213,7 +213,7 @@ class School {
 
   async loadSchoolFromToml(toml) {
     if (!this.conf.get('school')) {
-      const isSignAtHome = toml.addr
+      const isSignAtHome = toml.users[0].addr
       const school = await this.schoolApi(toml.school, isSignAtHome)
       if (!isSignAtHome) school.addr = await this.schoolAddr(school.name)
       this.conf.set('school', school)