@norcy/react-native-toolkit 0.3.30 → 0.3.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/Auth.js +3 -3
- package/lib/commonjs/Auth.js.map +1 -1
- package/lib/commonjs/CloudBaseAuth.js +90 -148
- package/lib/commonjs/CloudBaseAuth.js.map +1 -1
- package/lib/commonjs/LeanCloudAuth.js +2 -6
- package/lib/commonjs/LeanCloudAuth.js.map +1 -1
- package/lib/commonjs/LoginManager.js +1 -1
- package/lib/commonjs/LoginManager.js.map +1 -1
- package/lib/module/Auth.js +3 -3
- package/lib/module/Auth.js.map +1 -1
- package/lib/module/CloudBaseAuth.js +90 -148
- package/lib/module/CloudBaseAuth.js.map +1 -1
- package/lib/module/LeanCloudAuth.js +2 -6
- package/lib/module/LeanCloudAuth.js.map +1 -1
- package/lib/module/LoginManager.js +1 -1
- package/lib/module/LoginManager.js.map +1 -1
- package/lib/typescript/Auth.d.ts +1 -1
- package/lib/typescript/Auth.d.ts.map +1 -1
- package/lib/typescript/CloudBaseAuth.d.ts +3 -3
- package/lib/typescript/CloudBaseAuth.d.ts.map +1 -1
- package/lib/typescript/LeanCloudAuth.d.ts +2 -2
- package/lib/typescript/LeanCloudAuth.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/Auth.ts +3 -3
- package/src/CloudBaseAuth.ts +112 -153
- package/src/LeanCloudAuth.ts +2 -6
- package/src/LoginManager.ts +1 -1
package/lib/commonjs/Auth.js
CHANGED
|
@@ -12,15 +12,15 @@ const backend = useCloudBase ? _CloudBaseAuth.CloudBaseAuth : _LeanCloudAuth.Lea
|
|
|
12
12
|
let CURRENT_USER = null;
|
|
13
13
|
const Auth = exports.Auth = {
|
|
14
14
|
autoLogin: async () => {
|
|
15
|
-
const user = await backend.
|
|
15
|
+
const user = await backend.getLocalUser();
|
|
16
16
|
if (!user) {
|
|
17
17
|
throw new Error('User Not Login Yet');
|
|
18
18
|
}
|
|
19
19
|
CURRENT_USER = user;
|
|
20
20
|
return user;
|
|
21
21
|
},
|
|
22
|
-
|
|
23
|
-
const user = await backend.
|
|
22
|
+
login: async (authData, userData) => {
|
|
23
|
+
const user = await backend.login(authData, userData);
|
|
24
24
|
if (user.isNew) {
|
|
25
25
|
// 标记为当前用户是在本机注册的 TODO
|
|
26
26
|
_PrefData.PrefData.setValue(_PrefData.BuildInPrefs.RegisterInThisDevice, true);
|
package/lib/commonjs/Auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_CloudBaseAuth","require","_LeanCloudAuth","_PrefData","useCloudBase","backend","CloudBaseAuth","LeanCloudAuth","CURRENT_USER","Auth","exports","autoLogin","user","
|
|
1
|
+
{"version":3,"names":["_CloudBaseAuth","require","_LeanCloudAuth","_PrefData","useCloudBase","backend","CloudBaseAuth","LeanCloudAuth","CURRENT_USER","Auth","exports","autoLogin","user","getLocalUser","Error","login","authData","userData","isNew","PrefData","setValue","BuildInPrefs","RegisterInThisDevice","logOut","logout","currentUser","batchUpdateUser","keys","values","updateUser","deleteUser","destroyUser"],"sourceRoot":"../../src","sources":["Auth.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAEA,MAAMG,YAAY,GAAG,KAAK;AAE1B,MAAMC,OAAO,GAAGD,YAAY,GAAGE,4BAAa,GAAGC,4BAAa;AAE5D,IAAIC,YAA6B,GAAG,IAAI;AAEjC,MAAMC,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClBE,SAAS,EAAE,MAAAA,CAAA,KAA+B;IACxC,MAAMC,IAAI,GAAG,MAAMP,OAAO,CAACQ,YAAY,CAAC,CAAC;IACzC,IAAI,CAACD,IAAI,EAAE;MACT,MAAM,IAAIE,KAAK,CAAC,oBAAoB,CAAC;IACvC;IACAN,YAAY,GAAGI,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDG,KAAK,EAAE,MAAAA,CACLC,QAA2B,EAC3BC,QAA4B,KACN;IACtB,MAAML,IAAI,GAAG,MAAMP,OAAO,CAACU,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC;IACpD,IAAIL,IAAI,CAACM,KAAK,EAAE;MACd;MACAC,kBAAQ,CAACC,QAAQ,CAACC,sBAAY,CAACC,oBAAoB,EAAE,IAAI,CAAC;IAC5D;IACAd,YAAY,GAAGI,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDW,MAAM,EAAE,MAAAA,CAAA,KAAY;IAClB,MAAMlB,OAAO,CAACmB,MAAM,CAAC,CAAC;IACtBhB,YAAY,GAAG,IAAI;EACrB,CAAC;EAEDiB,WAAW,EAAEA,CAAA,KAAuB;IAClC,OAAOjB,YAAY;EACrB,CAAC;EAEDkB,eAAe,EAAE,MAAAA,CAAOC,IAAc,EAAEC,MAAa,KAAwB;IAC3E,MAAMhB,IAAI,GAAG,MAAMP,OAAO,CAACwB,UAAU,CAACF,IAAI,EAAEC,MAAM,CAAC;IACnDpB,YAAY,GAAGI,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDkB,UAAU,EAAE,MAAAA,CAAA,KAA2B;IACrC,MAAMzB,OAAO,CAAC0B,WAAW,CAAC,CAAC;IAC3BvB,YAAY,GAAG,IAAI;EACrB;AACF,CAAC","ignoreList":[]}
|
|
@@ -4,32 +4,37 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.CloudBaseAuth = void 0;
|
|
7
|
-
var _jsSdk = _interopRequireDefault(require("@cloudbase/js-sdk"));
|
|
8
7
|
var _adapterRn = _interopRequireDefault(require("@cloudbase/adapter-rn"));
|
|
9
|
-
var
|
|
8
|
+
var _jsSdk = _interopRequireDefault(require("@cloudbase/js-sdk"));
|
|
10
9
|
var _constant = require("./constant");
|
|
10
|
+
var _SyncPrefData = require("./SyncPrefData");
|
|
11
11
|
var _Tool = require("./Tool");
|
|
12
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
13
13
|
_jsSdk.default.useAdapters(_adapterRn.default);
|
|
14
|
-
|
|
15
|
-
/**
|
|
16
|
-
* CloudBase 自定义登录所需的云函数约定(需部署到 CloudBase 并开启 HTTP 访问服务):
|
|
17
|
-
*
|
|
18
|
-
* ### loginWithAuthData(通过 ToolkitConfig.CloudBaseAuthUrl HTTP 调用)
|
|
19
|
-
* 请求体: { action, authData: { openid, unionid?, loginType }, userData?: { nickname, headimgurl, email }, source? }
|
|
20
|
-
* 响应体: { ticket: string, user: UserProfile, isNew: boolean }
|
|
21
|
-
* 逻辑: 根据 openid+loginType 查找 user_profile,不存在则创建用户(CreateUser API + user_profile 文档),
|
|
22
|
-
* 用 app.auth().createTicket(uid) 签发 ticket 并连同 user_profile 一起返回。
|
|
23
|
-
*
|
|
24
|
-
* ### destroyUser(已登录态下通过 callFunction 调用,云函数名 "auth")
|
|
25
|
-
* event: { action: 'destroyUser' }
|
|
26
|
-
* 逻辑: 从 context.auth 获取 uid,删除用户系统记录(DeleteUsers API)及 user_profile 文档。
|
|
27
|
-
*/
|
|
28
|
-
|
|
29
14
|
let app = null;
|
|
30
|
-
let cachedProfile = null;
|
|
31
15
|
let authUrl = '';
|
|
32
|
-
const
|
|
16
|
+
const CACHED_PROFILE_KEY = 'CloudBaseAuth_CachedProfile_v1';
|
|
17
|
+
const LOGIN_TYPE_MAP = {
|
|
18
|
+
wechat: _constant.LoginType.LoginTypeWeChat,
|
|
19
|
+
visitor: _constant.LoginType.LoginTypeVisitor,
|
|
20
|
+
huawei: _constant.LoginType.LoginTypeHuawei,
|
|
21
|
+
apple: _constant.LoginType.LoginTypeApple
|
|
22
|
+
};
|
|
23
|
+
const toLocalUser = profile => {
|
|
24
|
+
return {
|
|
25
|
+
id: profile._id,
|
|
26
|
+
nickname: profile.nickname,
|
|
27
|
+
email: profile.email,
|
|
28
|
+
headimgurl: profile.headimgurl,
|
|
29
|
+
type: LOGIN_TYPE_MAP[profile.loginType],
|
|
30
|
+
vipType: profile.vipType,
|
|
31
|
+
vipEndTime: profile.vipEndTime ? new Date(profile.vipEndTime) : undefined,
|
|
32
|
+
createdAt: profile.createdAt ? new Date(profile.createdAt) : undefined,
|
|
33
|
+
attr: profile.attr,
|
|
34
|
+
webdav: profile.webdav
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
const getApp = () => {
|
|
33
38
|
if (app) return app;
|
|
34
39
|
const {
|
|
35
40
|
CloudBaseEnv,
|
|
@@ -49,160 +54,97 @@ const ensureInit = () => {
|
|
|
49
54
|
authUrl = CloudBaseAuthUrl;
|
|
50
55
|
return app;
|
|
51
56
|
};
|
|
52
|
-
const
|
|
53
|
-
if (
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
return _constant.LoginType.LoginTypeVisitor;
|
|
58
|
-
}
|
|
59
|
-
if (loginType === 'huawei') {
|
|
60
|
-
return _constant.LoginType.LoginTypeHuawei;
|
|
57
|
+
const setCachedProfile = profile => {
|
|
58
|
+
if (!profile) {
|
|
59
|
+
_SyncPrefData.SyncPrefData.delete(CACHED_PROFILE_KEY);
|
|
60
|
+
} else {
|
|
61
|
+
_SyncPrefData.SyncPrefData.set(CACHED_PROFILE_KEY, JSON.stringify(profile));
|
|
61
62
|
}
|
|
62
|
-
return _constant.LoginType.LoginTypeApple;
|
|
63
63
|
};
|
|
64
|
-
const
|
|
65
|
-
return
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
64
|
+
const getUid = () => {
|
|
65
|
+
return getApp().auth.hasLoginState()?.user.uid;
|
|
66
|
+
};
|
|
67
|
+
const requestAuth = async body => {
|
|
68
|
+
getApp();
|
|
69
|
+
const response = await fetch(authUrl, {
|
|
70
|
+
method: 'POST',
|
|
71
|
+
headers: {
|
|
72
|
+
'Content-Type': 'application/json'
|
|
73
|
+
},
|
|
74
|
+
body: JSON.stringify(body)
|
|
75
|
+
});
|
|
76
|
+
if (!response.ok) {
|
|
77
|
+
throw new Error(`CloudBase auth failed: ${response.status}`);
|
|
78
|
+
}
|
|
79
|
+
return response.json();
|
|
77
80
|
};
|
|
78
81
|
const CloudBaseAuth = exports.CloudBaseAuth = {
|
|
79
|
-
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
cachedProfile = null;
|
|
82
|
+
getLocalUser: async () => {
|
|
83
|
+
const uid = getUid();
|
|
84
|
+
if (!uid) {
|
|
85
|
+
setCachedProfile();
|
|
84
86
|
return null;
|
|
85
87
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
if (!uid) return null;
|
|
91
|
-
try {
|
|
92
|
-
const db = cbApp.database();
|
|
93
|
-
const {
|
|
94
|
-
data
|
|
95
|
-
} = await db.collection('user-profile').doc(uid).get();
|
|
96
|
-
if (!data || Array.isArray(data) && data.length === 0) return null;
|
|
97
|
-
cachedProfile = Array.isArray(data) ? data[0] : data;
|
|
98
|
-
return profileToLocalUser(cachedProfile);
|
|
99
|
-
} catch (error) {
|
|
100
|
-
console.log('CloudBase getCurrentUser error', error);
|
|
101
|
-
return null;
|
|
88
|
+
const raw = _SyncPrefData.SyncPrefData.getString(CACHED_PROFILE_KEY);
|
|
89
|
+
const profile = raw ? JSON.parse(raw) : null;
|
|
90
|
+
if (profile?._id === uid) {
|
|
91
|
+
return toLocalUser(profile);
|
|
102
92
|
}
|
|
93
|
+
await CloudBaseAuth.logout();
|
|
94
|
+
return null;
|
|
103
95
|
},
|
|
104
|
-
|
|
105
|
-
console.log('CloudBase 开始登录', userData);
|
|
106
|
-
const cbApp = ensureInit();
|
|
107
|
-
const loginType = authData.loginType || 'apple';
|
|
108
|
-
const response = await fetch(authUrl, {
|
|
109
|
-
method: 'POST',
|
|
110
|
-
headers: {
|
|
111
|
-
'Content-Type': 'application/json'
|
|
112
|
-
},
|
|
113
|
-
body: JSON.stringify({
|
|
114
|
-
action: 'loginWithAuthData',
|
|
115
|
-
authData: {
|
|
116
|
-
openid: authData.openid,
|
|
117
|
-
unionid: authData.unionid,
|
|
118
|
-
loginType
|
|
119
|
-
},
|
|
120
|
-
userData: userData ? {
|
|
121
|
-
nickname: userData.nickname,
|
|
122
|
-
headimgurl: userData.headimgurl,
|
|
123
|
-
email: userData.email
|
|
124
|
-
} : undefined,
|
|
125
|
-
source: _reactNative.Platform.OS === 'android' ? 2 : undefined
|
|
126
|
-
})
|
|
127
|
-
});
|
|
128
|
-
if (!response.ok) {
|
|
129
|
-
const text = await response.text().catch(() => '');
|
|
130
|
-
console.log('CloudBase 登录失败', response.status, text);
|
|
131
|
-
throw new Error(`CloudBase auth request failed: ${response.status}`);
|
|
132
|
-
}
|
|
133
|
-
const result = await response.json();
|
|
96
|
+
login: async (authData, userData) => {
|
|
134
97
|
const {
|
|
135
98
|
ticket,
|
|
136
99
|
user,
|
|
137
100
|
isNew
|
|
138
|
-
} =
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
localUser.isNew = isNew ?? false;
|
|
101
|
+
} = await requestAuth({
|
|
102
|
+
action: 'login',
|
|
103
|
+
authData: {
|
|
104
|
+
openid: authData.openid,
|
|
105
|
+
unionid: authData.unionid,
|
|
106
|
+
loginType: authData.loginType
|
|
107
|
+
},
|
|
108
|
+
userData: userData ? {
|
|
109
|
+
nickname: userData.nickname,
|
|
110
|
+
headimgurl: userData.headimgurl,
|
|
111
|
+
email: userData.email
|
|
112
|
+
} : undefined
|
|
113
|
+
});
|
|
114
|
+
await getApp().auth.signInWithCustomTicket(() => Promise.resolve(ticket));
|
|
115
|
+
setCachedProfile(user);
|
|
116
|
+
const localUser = toLocalUser(user);
|
|
117
|
+
localUser.isNew = isNew;
|
|
156
118
|
return localUser;
|
|
157
119
|
},
|
|
158
|
-
logout: () => {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
console.log('CloudBase signOut error', e);
|
|
162
|
-
});
|
|
163
|
-
cachedProfile = null;
|
|
120
|
+
logout: async () => {
|
|
121
|
+
await getApp().auth.signOut();
|
|
122
|
+
setCachedProfile();
|
|
164
123
|
},
|
|
165
124
|
updateUser: async (keys, values) => {
|
|
166
|
-
const
|
|
167
|
-
const uid = cbApp.auth.currentUser?.uid;
|
|
125
|
+
const uid = getUid();
|
|
168
126
|
if (!uid) throw new Error('User Not Login Yet');
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
data
|
|
180
|
-
} = await db.collection('user-profile').doc(uid).get();
|
|
181
|
-
cachedProfile = Array.isArray(data) ? data[0] : data;
|
|
182
|
-
return profileToLocalUser(cachedProfile);
|
|
183
|
-
} catch (error) {
|
|
184
|
-
if (cachedProfile) {
|
|
185
|
-
for (let i = 0; i < keys.length; i++) {
|
|
186
|
-
cachedProfile[keys[i]] = oldValues[i];
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
throw error;
|
|
190
|
-
}
|
|
127
|
+
const {
|
|
128
|
+
user
|
|
129
|
+
} = await requestAuth({
|
|
130
|
+
action: 'updateUser',
|
|
131
|
+
uid,
|
|
132
|
+
keys,
|
|
133
|
+
values
|
|
134
|
+
});
|
|
135
|
+
setCachedProfile(user);
|
|
136
|
+
return toLocalUser(user);
|
|
191
137
|
},
|
|
192
138
|
destroyUser: async () => {
|
|
193
|
-
const
|
|
194
|
-
const uid = cbApp.auth.currentUser?.uid;
|
|
139
|
+
const uid = getUid();
|
|
195
140
|
if (!uid) throw new Error('User Not Login Yet');
|
|
196
|
-
|
|
197
|
-
await cbApp.callFunction({
|
|
141
|
+
await getApp().callFunction({
|
|
198
142
|
name: 'auth',
|
|
199
143
|
data: {
|
|
200
144
|
action: 'destroyUser'
|
|
201
145
|
}
|
|
202
146
|
});
|
|
203
|
-
|
|
204
|
-
await cbApp.auth.signOut();
|
|
205
|
-
cachedProfile = null;
|
|
147
|
+
await CloudBaseAuth.logout();
|
|
206
148
|
}
|
|
207
149
|
};
|
|
208
150
|
//# sourceMappingURL=CloudBaseAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_adapterRn","_interopRequireDefault","require","_jsSdk","_constant","_SyncPrefData","_Tool","e","__esModule","default","cloudbase","useAdapters","adapter","app","authUrl","CACHED_PROFILE_KEY","LOGIN_TYPE_MAP","wechat","LoginType","LoginTypeWeChat","visitor","LoginTypeVisitor","huawei","LoginTypeHuawei","apple","LoginTypeApple","toLocalUser","profile","id","_id","nickname","email","headimgurl","type","loginType","vipType","vipEndTime","Date","undefined","createdAt","attr","webdav","getApp","CloudBaseEnv","CloudBaseAccessKey","CloudBaseRegion","CloudBaseAuthUrl","ToolkitConfig","Error","init","env","region","accessKey","endPointMode","setCachedProfile","SyncPrefData","delete","set","JSON","stringify","getUid","auth","hasLoginState","user","uid","requestAuth","body","response","fetch","method","headers","ok","status","json","CloudBaseAuth","exports","getLocalUser","raw","getString","parse","logout","login","authData","userData","ticket","isNew","action","openid","unionid","signInWithCustomTicket","Promise","resolve","localUser","signOut","updateUser","keys","values","destroyUser","callFunction","name","data"],"sourceRoot":"../../src","sources":["CloudBaseAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.LeanCloudAuth = void 0;
|
|
7
|
-
var _reactNative = require("react-native");
|
|
8
7
|
var _constant = require("./constant");
|
|
9
8
|
const AV = require('leancloud-storage');
|
|
10
9
|
const AVUserToLocalUser = user => {
|
|
@@ -34,11 +33,11 @@ const getLoginTypeNum = loginType => {
|
|
|
34
33
|
return _constant.LoginType.LoginTypeApple;
|
|
35
34
|
};
|
|
36
35
|
const LeanCloudAuth = exports.LeanCloudAuth = {
|
|
37
|
-
|
|
36
|
+
getLocalUser: async () => {
|
|
38
37
|
const user = await AV.User.currentAsync();
|
|
39
38
|
return user ? AVUserToLocalUser(user) : null;
|
|
40
39
|
},
|
|
41
|
-
|
|
40
|
+
login: async (authData, userData) => {
|
|
42
41
|
console.log('Lean Cloud 开始登录', userData);
|
|
43
42
|
// loginType 空说明是老用户
|
|
44
43
|
const loginType = authData.loginType || 'apple';
|
|
@@ -71,9 +70,6 @@ const LeanCloudAuth = exports.LeanCloudAuth = {
|
|
|
71
70
|
newUser.set('nickname', userData?.nickname);
|
|
72
71
|
newUser.set('headimgurl', userData?.headimgurl);
|
|
73
72
|
newUser.set('type', getLoginTypeNum(loginType));
|
|
74
|
-
if (_reactNative.Platform.OS === 'android') {
|
|
75
|
-
newUser.set('source', 2);
|
|
76
|
-
}
|
|
77
73
|
try {
|
|
78
74
|
const user = await newUser.loginWithAuthData(authData, loginType);
|
|
79
75
|
console.log('Lean Cloud 注册成功');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_constant","require","AV","AVUserToLocalUser","user","id","get","nickname","email","headimgurl","type","vipType","vipEndTime","createdAt","getCreatedAt","attr","webdav","getLoginTypeNum","loginType","LoginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","LeanCloudAuth","exports","getLocalUser","User","currentAsync","login","authData","userData","console","log","loginWithAuthData","failOnNotExist","error","code","newUser","setEmail","set","localUser","isNew","error2","logout","logOut","updateUser","keys","values","Error","oldValues","i","length","push","save","destroyUser","destroy"],"sourceRoot":"../../src","sources":["LeanCloudAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -47,7 +47,7 @@ const onLoginFinish = params => {
|
|
|
47
47
|
};
|
|
48
48
|
const doLogin = async (authData, userData) => {
|
|
49
49
|
try {
|
|
50
|
-
const user = await _Auth.Auth.
|
|
50
|
+
const user = await _Auth.Auth.login(authData, userData);
|
|
51
51
|
onLoginFinish({
|
|
52
52
|
user
|
|
53
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeAppleAuthentication","require","_reactNativeDeviceInfo","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","params","isAuto","user","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","Auth","
|
|
1
|
+
{"version":3,"names":["_reactNativeAppleAuthentication","require","_reactNativeDeviceInfo","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","params","isAuto","user","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","Auth","login","LoginManager","exports","autoLogin","devAuthData","loadingCallback","qrcodeCallback","_","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","code","undefined","appleAuth","CANCELED","LoginTypeWeChat","nickname","headimgurl","unionid","WeChatLoginUtil","ToolkitConfig","WeiXinId","WeiXinSecret","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","getUniqueIdSync","LoginTypeHuawei","HuaweiLoginUtil","logOut","callback","e","isLogin","currentUser","isVisitor","batchUpdateUser","keys","values","updateUser","key","value","deleteUser","requestDeleteAccount","lastLoginType","getValue","isRegisterInThisDevice","RegisterInThisDevice","fetchWeChatAvatar","getRegisterDays","createTime","createdAt","diff","Date","getTime","diffDay","Math","max","ceil"],"sourceRoot":"../../src","sources":["LoginManager.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/Auth.js
CHANGED
|
@@ -8,15 +8,15 @@ const backend = useCloudBase ? CloudBaseAuth : LeanCloudAuth;
|
|
|
8
8
|
let CURRENT_USER = null;
|
|
9
9
|
export const Auth = {
|
|
10
10
|
autoLogin: async () => {
|
|
11
|
-
const user = await backend.
|
|
11
|
+
const user = await backend.getLocalUser();
|
|
12
12
|
if (!user) {
|
|
13
13
|
throw new Error('User Not Login Yet');
|
|
14
14
|
}
|
|
15
15
|
CURRENT_USER = user;
|
|
16
16
|
return user;
|
|
17
17
|
},
|
|
18
|
-
|
|
19
|
-
const user = await backend.
|
|
18
|
+
login: async (authData, userData) => {
|
|
19
|
+
const user = await backend.login(authData, userData);
|
|
20
20
|
if (user.isNew) {
|
|
21
21
|
// 标记为当前用户是在本机注册的 TODO
|
|
22
22
|
PrefData.setValue(BuildInPrefs.RegisterInThisDevice, true);
|
package/lib/module/Auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CloudBaseAuth","LeanCloudAuth","BuildInPrefs","PrefData","useCloudBase","backend","CURRENT_USER","Auth","autoLogin","user","
|
|
1
|
+
{"version":3,"names":["CloudBaseAuth","LeanCloudAuth","BuildInPrefs","PrefData","useCloudBase","backend","CURRENT_USER","Auth","autoLogin","user","getLocalUser","Error","login","authData","userData","isNew","setValue","RegisterInThisDevice","logOut","logout","currentUser","batchUpdateUser","keys","values","updateUser","deleteUser","destroyUser"],"sourceRoot":"../../src","sources":["Auth.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,iBAAiB;AAE/C,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,YAAY,EAAEC,QAAQ,QAAQ,YAAY;AAEnD,MAAMC,YAAY,GAAG,KAAK;AAE1B,MAAMC,OAAO,GAAGD,YAAY,GAAGJ,aAAa,GAAGC,aAAa;AAE5D,IAAIK,YAA6B,GAAG,IAAI;AAExC,OAAO,MAAMC,IAAI,GAAG;EAClBC,SAAS,EAAE,MAAAA,CAAA,KAA+B;IACxC,MAAMC,IAAI,GAAG,MAAMJ,OAAO,CAACK,YAAY,CAAC,CAAC;IACzC,IAAI,CAACD,IAAI,EAAE;MACT,MAAM,IAAIE,KAAK,CAAC,oBAAoB,CAAC;IACvC;IACAL,YAAY,GAAGG,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDG,KAAK,EAAE,MAAAA,CACLC,QAA2B,EAC3BC,QAA4B,KACN;IACtB,MAAML,IAAI,GAAG,MAAMJ,OAAO,CAACO,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC;IACpD,IAAIL,IAAI,CAACM,KAAK,EAAE;MACd;MACAZ,QAAQ,CAACa,QAAQ,CAACd,YAAY,CAACe,oBAAoB,EAAE,IAAI,CAAC;IAC5D;IACAX,YAAY,GAAGG,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDS,MAAM,EAAE,MAAAA,CAAA,KAAY;IAClB,MAAMb,OAAO,CAACc,MAAM,CAAC,CAAC;IACtBb,YAAY,GAAG,IAAI;EACrB,CAAC;EAEDc,WAAW,EAAEA,CAAA,KAAuB;IAClC,OAAOd,YAAY;EACrB,CAAC;EAEDe,eAAe,EAAE,MAAAA,CAAOC,IAAc,EAAEC,MAAa,KAAwB;IAC3E,MAAMd,IAAI,GAAG,MAAMJ,OAAO,CAACmB,UAAU,CAACF,IAAI,EAAEC,MAAM,CAAC;IACnDjB,YAAY,GAAGG,IAAI;IACnB,OAAOA,IAAI;EACb,CAAC;EAEDgB,UAAU,EAAE,MAAAA,CAAA,KAA2B;IACrC,MAAMpB,OAAO,CAACqB,WAAW,CAAC,CAAC;IAC3BpB,YAAY,GAAG,IAAI;EACrB;AACF,CAAC","ignoreList":[]}
|