@norcy/react-native-toolkit 0.3.30 → 0.3.31
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
|
@@ -1,30 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import cloudbase from '@cloudbase/js-sdk';
|
|
4
3
|
import adapter from '@cloudbase/adapter-rn';
|
|
5
|
-
import
|
|
4
|
+
import cloudbase from '@cloudbase/js-sdk';
|
|
6
5
|
import { LoginType } from './constant';
|
|
6
|
+
import { SyncPrefData } from './SyncPrefData';
|
|
7
7
|
import { ToolkitConfig } from './Tool';
|
|
8
8
|
cloudbase.useAdapters(adapter);
|
|
9
|
-
|
|
10
|
-
/**
|
|
11
|
-
* CloudBase 自定义登录所需的云函数约定（需部署到 CloudBase 并开启 HTTP 访问服务）：
|
|
12
|
-
*
|
|
13
|
-
* ### loginWithAuthData（通过 ToolkitConfig.CloudBaseAuthUrl HTTP 调用）
|
|
14
|
-
* 请求体: { action, authData: { openid, unionid?, loginType }, userData?: { nickname, headimgurl, email }, source? }
|
|
15
|
-
* 响应体: { ticket: string, user: UserProfile, isNew: boolean }
|
|
16
|
-
* 逻辑: 根据 openid+loginType 查找 user_profile，不存在则创建用户（CreateUser API + user_profile 文档），
|
|
17
|
-
* 用 app.auth().createTicket(uid) 签发 ticket 并连同 user_profile 一起返回。
|
|
18
|
-
*
|
|
19
|
-
* ### destroyUser（已登录态下通过 callFunction 调用，云函数名 "auth"）
|
|
20
|
-
* event: { action: 'destroyUser' }
|
|
21
|
-
* 逻辑: 从 context.auth 获取 uid，删除用户系统记录（DeleteUsers API）及 user_profile 文档。
|
|
22
|
-
*/
|
|
23
|
-
|
|
24
9
|
let app = null;
|
|
25
|
-
let cachedProfile = null;
|
|
26
10
|
let authUrl = '';
|
|
27
|
-
const
|
|
11
|
+
const CACHED_PROFILE_KEY = 'CloudBaseAuth_CachedProfile_v1';
|
|
12
|
+
const LOGIN_TYPE_MAP = {
|
|
13
|
+
wechat: LoginType.LoginTypeWeChat,
|
|
14
|
+
visitor: LoginType.LoginTypeVisitor,
|
|
15
|
+
huawei: LoginType.LoginTypeHuawei,
|
|
16
|
+
apple: LoginType.LoginTypeApple
|
|
17
|
+
};
|
|
18
|
+
const toLocalUser = profile => {
|
|
19
|
+
return {
|
|
20
|
+
id: profile._id,
|
|
21
|
+
nickname: profile.nickname,
|
|
22
|
+
email: profile.email,
|
|
23
|
+
headimgurl: profile.headimgurl,
|
|
24
|
+
type: LOGIN_TYPE_MAP[profile.loginType],
|
|
25
|
+
vipType: profile.vipType,
|
|
26
|
+
vipEndTime: profile.vipEndTime ? new Date(profile.vipEndTime) : undefined,
|
|
27
|
+
createdAt: profile.createdAt ? new Date(profile.createdAt) : undefined,
|
|
28
|
+
attr: profile.attr,
|
|
29
|
+
webdav: profile.webdav
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
const getApp = () => {
|
|
28
33
|
if (app) return app;
|
|
29
34
|
const {
|
|
30
35
|
CloudBaseEnv,
|
|
@@ -44,160 +49,97 @@ const ensureInit = () => {
|
|
|
44
49
|
authUrl = CloudBaseAuthUrl;
|
|
45
50
|
return app;
|
|
46
51
|
};
|
|
47
|
-
const
|
|
48
|
-
if (
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
return LoginType.LoginTypeVisitor;
|
|
53
|
-
}
|
|
54
|
-
if (loginType === 'huawei') {
|
|
55
|
-
return LoginType.LoginTypeHuawei;
|
|
52
|
+
const setCachedProfile = profile => {
|
|
53
|
+
if (!profile) {
|
|
54
|
+
SyncPrefData.delete(CACHED_PROFILE_KEY);
|
|
55
|
+
} else {
|
|
56
|
+
SyncPrefData.set(CACHED_PROFILE_KEY, JSON.stringify(profile));
|
|
56
57
|
}
|
|
57
|
-
return LoginType.LoginTypeApple;
|
|
58
58
|
};
|
|
59
|
-
const
|
|
60
|
-
return
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
59
|
+
const getUid = () => {
|
|
60
|
+
return getApp().auth.hasLoginState()?.user.uid;
|
|
61
|
+
};
|
|
62
|
+
const requestAuth = async body => {
|
|
63
|
+
getApp();
|
|
64
|
+
const response = await fetch(authUrl, {
|
|
65
|
+
method: 'POST',
|
|
66
|
+
headers: {
|
|
67
|
+
'Content-Type': 'application/json'
|
|
68
|
+
},
|
|
69
|
+
body: JSON.stringify(body)
|
|
70
|
+
});
|
|
71
|
+
if (!response.ok) {
|
|
72
|
+
throw new Error(`CloudBase auth failed: ${response.status}`);
|
|
73
|
+
}
|
|
74
|
+
return response.json();
|
|
72
75
|
};
|
|
73
76
|
export const CloudBaseAuth = {
|
|
74
|
-
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
cachedProfile = null;
|
|
77
|
+
getLocalUser: async () => {
|
|
78
|
+
const uid = getUid();
|
|
79
|
+
if (!uid) {
|
|
80
|
+
setCachedProfile();
|
|
79
81
|
return null;
|
|
80
82
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
if (!uid) return null;
|
|
86
|
-
try {
|
|
87
|
-
const db = cbApp.database();
|
|
88
|
-
const {
|
|
89
|
-
data
|
|
90
|
-
} = await db.collection('user-profile').doc(uid).get();
|
|
91
|
-
if (!data || Array.isArray(data) && data.length === 0) return null;
|
|
92
|
-
cachedProfile = Array.isArray(data) ? data[0] : data;
|
|
93
|
-
return profileToLocalUser(cachedProfile);
|
|
94
|
-
} catch (error) {
|
|
95
|
-
console.log('CloudBase getCurrentUser error', error);
|
|
96
|
-
return null;
|
|
83
|
+
const raw = SyncPrefData.getString(CACHED_PROFILE_KEY);
|
|
84
|
+
const profile = raw ? JSON.parse(raw) : null;
|
|
85
|
+
if (profile?._id === uid) {
|
|
86
|
+
return toLocalUser(profile);
|
|
97
87
|
}
|
|
88
|
+
await CloudBaseAuth.logout();
|
|
89
|
+
return null;
|
|
98
90
|
},
|
|
99
|
-
|
|
100
|
-
console.log('CloudBase 开始登录', userData);
|
|
101
|
-
const cbApp = ensureInit();
|
|
102
|
-
const loginType = authData.loginType || 'apple';
|
|
103
|
-
const response = await fetch(authUrl, {
|
|
104
|
-
method: 'POST',
|
|
105
|
-
headers: {
|
|
106
|
-
'Content-Type': 'application/json'
|
|
107
|
-
},
|
|
108
|
-
body: JSON.stringify({
|
|
109
|
-
action: 'loginWithAuthData',
|
|
110
|
-
authData: {
|
|
111
|
-
openid: authData.openid,
|
|
112
|
-
unionid: authData.unionid,
|
|
113
|
-
loginType
|
|
114
|
-
},
|
|
115
|
-
userData: userData ? {
|
|
116
|
-
nickname: userData.nickname,
|
|
117
|
-
headimgurl: userData.headimgurl,
|
|
118
|
-
email: userData.email
|
|
119
|
-
} : undefined,
|
|
120
|
-
source: Platform.OS === 'android' ? 2 : undefined
|
|
121
|
-
})
|
|
122
|
-
});
|
|
123
|
-
if (!response.ok) {
|
|
124
|
-
const text = await response.text().catch(() => '');
|
|
125
|
-
console.log('CloudBase 登录失败', response.status, text);
|
|
126
|
-
throw new Error(`CloudBase auth request failed: ${response.status}`);
|
|
127
|
-
}
|
|
128
|
-
const result = await response.json();
|
|
91
|
+
login: async (authData, userData) => {
|
|
129
92
|
const {
|
|
130
93
|
ticket,
|
|
131
94
|
user,
|
|
132
95
|
isNew
|
|
133
|
-
} =
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
localUser.isNew = isNew ?? false;
|
|
96
|
+
} = await requestAuth({
|
|
97
|
+
action: 'login',
|
|
98
|
+
authData: {
|
|
99
|
+
openid: authData.openid,
|
|
100
|
+
unionid: authData.unionid,
|
|
101
|
+
loginType: authData.loginType
|
|
102
|
+
},
|
|
103
|
+
userData: userData ? {
|
|
104
|
+
nickname: userData.nickname,
|
|
105
|
+
headimgurl: userData.headimgurl,
|
|
106
|
+
email: userData.email
|
|
107
|
+
} : undefined
|
|
108
|
+
});
|
|
109
|
+
await getApp().auth.signInWithCustomTicket(() => Promise.resolve(ticket));
|
|
110
|
+
setCachedProfile(user);
|
|
111
|
+
const localUser = toLocalUser(user);
|
|
112
|
+
localUser.isNew = isNew;
|
|
151
113
|
return localUser;
|
|
152
114
|
},
|
|
153
|
-
logout: () => {
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
console.log('CloudBase signOut error', e);
|
|
157
|
-
});
|
|
158
|
-
cachedProfile = null;
|
|
115
|
+
logout: async () => {
|
|
116
|
+
await getApp().auth.signOut();
|
|
117
|
+
setCachedProfile();
|
|
159
118
|
},
|
|
160
119
|
updateUser: async (keys, values) => {
|
|
161
|
-
const
|
|
162
|
-
const uid = cbApp.auth.currentUser?.uid;
|
|
120
|
+
const uid = getUid();
|
|
163
121
|
if (!uid) throw new Error('User Not Login Yet');
|
|
164
|
-
const
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
data
|
|
175
|
-
} = await db.collection('user-profile').doc(uid).get();
|
|
176
|
-
cachedProfile = Array.isArray(data) ? data[0] : data;
|
|
177
|
-
return profileToLocalUser(cachedProfile);
|
|
178
|
-
} catch (error) {
|
|
179
|
-
if (cachedProfile) {
|
|
180
|
-
for (let i = 0; i < keys.length; i++) {
|
|
181
|
-
cachedProfile[keys[i]] = oldValues[i];
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
throw error;
|
|
185
|
-
}
|
|
122
|
+
const {
|
|
123
|
+
user
|
|
124
|
+
} = await requestAuth({
|
|
125
|
+
action: 'updateUser',
|
|
126
|
+
uid,
|
|
127
|
+
keys,
|
|
128
|
+
values
|
|
129
|
+
});
|
|
130
|
+
setCachedProfile(user);
|
|
131
|
+
return toLocalUser(user);
|
|
186
132
|
},
|
|
187
133
|
destroyUser: async () => {
|
|
188
|
-
const
|
|
189
|
-
const uid = cbApp.auth.currentUser?.uid;
|
|
134
|
+
const uid = getUid();
|
|
190
135
|
if (!uid) throw new Error('User Not Login Yet');
|
|
191
|
-
|
|
192
|
-
await cbApp.callFunction({
|
|
136
|
+
await getApp().callFunction({
|
|
193
137
|
name: 'auth',
|
|
194
138
|
data: {
|
|
195
139
|
action: 'destroyUser'
|
|
196
140
|
}
|
|
197
141
|
});
|
|
198
|
-
|
|
199
|
-
await cbApp.auth.signOut();
|
|
200
|
-
cachedProfile = null;
|
|
142
|
+
await CloudBaseAuth.logout();
|
|
201
143
|
}
|
|
202
144
|
};
|
|
203
145
|
//# sourceMappingURL=CloudBaseAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["adapter","cloudbase","LoginType","SyncPrefData","ToolkitConfig","useAdapters","app","authUrl","CACHED_PROFILE_KEY","LOGIN_TYPE_MAP","wechat","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","Error","init","env","region","accessKey","endPointMode","setCachedProfile","delete","set","JSON","stringify","getUid","auth","hasLoginState","user","uid","requestAuth","body","response","fetch","method","headers","ok","status","json","CloudBaseAuth","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":[]}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Platform } from 'react-native';
|
|
4
3
|
import { LoginType } from './constant';
|
|
5
4
|
const AV = require('leancloud-storage');
|
|
6
5
|
const AVUserToLocalUser = user => {
|
|
@@ -30,11 +29,11 @@ const getLoginTypeNum = loginType => {
|
|
|
30
29
|
return LoginType.LoginTypeApple;
|
|
31
30
|
};
|
|
32
31
|
export const LeanCloudAuth = {
|
|
33
|
-
|
|
32
|
+
getLocalUser: async () => {
|
|
34
33
|
const user = await AV.User.currentAsync();
|
|
35
34
|
return user ? AVUserToLocalUser(user) : null;
|
|
36
35
|
},
|
|
37
|
-
|
|
36
|
+
login: async (authData, userData) => {
|
|
38
37
|
console.log('Lean Cloud 开始登录', userData);
|
|
39
38
|
// loginType 空说明是老用户
|
|
40
39
|
const loginType = authData.loginType || 'apple';
|
|
@@ -67,9 +66,6 @@ export const LeanCloudAuth = {
|
|
|
67
66
|
newUser.set('nickname', userData?.nickname);
|
|
68
67
|
newUser.set('headimgurl', userData?.headimgurl);
|
|
69
68
|
newUser.set('type', getLoginTypeNum(loginType));
|
|
70
|
-
if (Platform.OS === 'android') {
|
|
71
|
-
newUser.set('source', 2);
|
|
72
|
-
}
|
|
73
69
|
try {
|
|
74
70
|
const user = await newUser.loginWithAuthData(authData, loginType);
|
|
75
71
|
console.log('Lean Cloud 注册成功');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["LoginType","AV","require","AVUserToLocalUser","user","id","get","nickname","email","headimgurl","type","vipType","vipEndTime","createdAt","getCreatedAt","attr","webdav","getLoginTypeNum","loginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","LeanCloudAuth","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":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["appleAuth","getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginType","onLoginFinish","params","isAuto","user","setValue","LastLoginType","type","data","console","log","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","
|
|
1
|
+
{"version":3,"names":["appleAuth","getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginType","onLoginFinish","params","isAuto","user","setValue","LastLoginType","type","data","console","log","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","login","LoginManager","autoLogin","devAuthData","loadingCallback","qrcodeCallback","_","LoginTypeApple","email","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","code","undefined","CANCELED","LoginTypeWeChat","nickname","headimgurl","unionid","WeiXinId","WeiXinSecret","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","LoginTypeHuawei","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":";;AAAA,SAASA,SAAS,QAAQ,8CAA8C;AACxE,SAASC,eAAe,QAAQ,0BAA0B;AAC1D,SAASC,cAAc,QAAQ,kBAAkB;AACjD,SAASC,IAAI,QAAQ,QAAQ;AAC7B,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,YAAY,EAAEC,QAAQ,QAAQ,YAAY;AACnD,SAASC,aAAa,QAAQ,QAAQ;AACtC,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAEEC,SAAS,QAGJ,YAAY;AAiBnB,MAAMC,aAAa,GAAIC,MAAyB,IAAK;EACnD,IAAI,MAAM,IAAIA,MAAM,EAAE;IACpB,MAAM;MAAEC,MAAM,GAAG,KAAK;MAAEC;IAAK,CAAC,GAAGF,MAAM;IACvCL,QAAQ,CAACQ,QAAQ,CAACT,YAAY,CAACU,aAAa,EAAEF,IAAI,CAACG,IAAI,CAAC;IACxD,MAAMC,IAA4B,GAAG;MAAEL,MAAM;MAAEC;IAAK,CAAC;IACrDK,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEF,IAAI,CAAC;IACnCb,YAAY,CAACgB,gBAAgB,CAAC,gBAAgB,EAAEH,IAAI,CAAC;EACvD,CAAC,MAAM;IACL,MAAM;MAAEL,MAAM,GAAG,KAAK;MAAES,KAAK;MAAEC,QAAQ,GAAG;IAAM,CAAC,GAAGX,MAAM;IAC1D,IAAIY,OAAO,IAAI,EAAEF,KAAK,YAAYG,KAAK,CAAC,EAAE;MACxCN,OAAO,CAACG,KAAK,CACX,wDAAwD,EACxDA,KACF,CAAC;IACH;IACA,MAAMJ,IAAyB,GAAG;MAAEL,MAAM;MAAES,KAAK;MAAEC;IAAS,CAAC;IAC7DJ,OAAO,CAACC,GAAG,CAAC,aAAa,EAAEF,IAAI,CAAC;IAChCb,YAAY,CAACgB,gBAAgB,CAAC,aAAa,EAAEH,IAAI,CAAC;EACpD;AACF,CAAC;AAED,MAAMQ,OAAO,GAAG,MAAAA,CACdC,QAA2B,EAC3BC,QAA4B,KACzB;EACH,IAAI;IACF,MAAMd,IAAI,GAAG,MAAMX,IAAI,CAAC0B,KAAK,CAACF,QAAQ,EAAEC,QAAQ,CAAC;IACjDjB,aAAa,CAAC;MAAEG;IAAK,CAAC,CAAC;EACzB,CAAC,CAAC,OAAOQ,KAAU,EAAE;IACnBX,aAAa,CAAC;MAAEW;IAAM,CAAC,CAAC;EAC1B;AACF,CAAC;AAED,OAAO,MAAMQ,YAAY,GAAG;EAC1B;EACAC,SAAS,EAAE,MAAAA,CAAA,KAAY;IACrB,IAAI;MACF,MAAMjB,IAAI,GAAG,MAAMX,IAAI,CAAC4B,SAAS,CAAC,CAAC;MACnCZ,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;MACrBT,aAAa,CAAC;QAAEE,MAAM,EAAE,IAAI;QAAEC;MAAK,CAAC,CAAC;IACvC,CAAC,CAAC,OAAOQ,KAAU,EAAE;MACnBX,aAAa,CAAC;QAAEE,MAAM,EAAE,IAAI;QAAES;MAAM,CAAC,CAAC;IACxC;EACF,CAAC;EAED;EACAO,KAAK,EAAE,MAAAA,CACLZ,IAAe,EACfe,WAAqC,GAAG,IAAI,EAC5CC,eAA2B,EAC3BC,cAAyC,KACtC;IACH;IACA,IAAI;MACF,MAAMpB,IAAI,GAAG,MAAMX,IAAI,CAAC4B,SAAS,CAAC,CAAC;MACnCpB,aAAa,CAAC;QAAEE,MAAM,EAAE,IAAI;QAAEC;MAAK,CAAC,CAAC;MACrC;IACF,CAAC,CAAC,OAAOqB,CAAC,EAAE;MACV;IAAA;;IAGF;IACA,IAAIX,OAAO,EAAE;MACX,IAAIQ,WAAW,EAAE;QACf,MAAMN,OAAO,CAACM,WAAW,CAAC;QAC1B;MACF;IACF;IAEA,IAAIf,IAAI,KAAKP,SAAS,CAAC0B,cAAc,EAAE;MACrC,IAAI;QACF,MAAM;UAAEtB,IAAI;UAAEuB;QAAM,CAAC,GAAG,MAAMnC,cAAc,CAACoC,wBAAwB,CAAC,CAAC;QACvE,MAAMpC,cAAc,CAACqC,6BAA6B,CAACzB,IAAI,CAAC;QACxD,IAAIc,QAAQ,GAAG;UACbY,MAAM,EAAE1B,IAAI;UACZuB,KAAK;UACLV,QAAQ,EAAE;YAAEc,MAAM,EAAE3B,IAAI;YAAE4B,SAAS,EAAE;UAAiB;QACxD,CAAC;QACDT,eAAe,GAAG,CAAC;QACnBP,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAON,KAAK,EAAE;QACd,MAAMqB,IAAI,GACRrB,KAAK,YAAYG,KAAK,IAAI,MAAM,IAAIH,KAAK,GACpCA,KAAK,CAA+BqB,IAAI,GACzCC,SAAS;QACfjC,aAAa,CAAC;UAAEW,KAAK;UAAEC,QAAQ,EAAEoB,IAAI,KAAK3C,SAAS,CAACyB,KAAK,CAACoB;QAAS,CAAC,CAAC;MACvE;IACF,CAAC,MAAM,IAAI5B,IAAI,KAAKP,SAAS,CAACoC,eAAe,EAAE;MAC7C,IAAI;QACF,MAAM;UAAEC,QAAQ;UAAEC,UAAU;UAAEP,MAAM;UAAEQ;QAAQ,CAAC,GAC7C,MAAMxC,eAAe,CAACiB,OAAO,CAC3BlB,aAAa,CAAC0C,QAAQ,EACtB1C,aAAa,CAAC2C,YAChB,CAAC;QACH,IAAIvB,QAAQ,GAAG;UACbmB,QAAQ;UACRC,UAAU;UACVrB,QAAQ,EAAE;YAAEc,MAAM;YAAEQ,OAAO;YAAEP,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDT,eAAe,GAAG,CAAC;QACnBP,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAON,KAAK,EAAE;QACdX,aAAa,CAAC;UAAEW;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM,IAAIL,IAAI,KAAKP,SAAS,CAAC0C,mBAAmB,EAAE;MACjD,IAAI;QACF,MAAM;UAAEL,QAAQ;UAAEC,UAAU;UAAEP,MAAM;UAAEQ;QAAQ,CAAC,GAC7C,MAAMxC,eAAe,CAAC4C,aAAa,CACjC7C,aAAa,CAAC0C,QAAQ,EACtB1C,aAAa,CAAC2C,YAAY,EAC1BjB,cACF,CAAC;QACH,IAAIN,QAAQ,GAAG;UACbmB,QAAQ;UACRC,UAAU;UACVrB,QAAQ,EAAE;YAAEc,MAAM;YAAEQ,OAAO;YAAEP,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDT,eAAe,GAAG,CAAC;QACnBP,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAON,KAAK,EAAE;QACdX,aAAa,CAAC;UAAEW;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM,IAAIL,IAAI,KAAKP,SAAS,CAAC4C,gBAAgB,EAAE;MAC9C,MAAMC,QAAQ,GAAGtD,eAAe,CAAC,CAAC;MAClCkB,OAAO,CAACC,GAAG,CAACmC,QAAQ,CAAC;MACrB,IAAI3B,QAAQ,GAAG;QACbmB,QAAQ,EAAE,SAAS;QACnBpB,QAAQ,EAAE;UACRc,MAAM,EAAEc,QAAQ;UAChBb,SAAS,EAAE;QACb;MACF,CAAC;MACDT,eAAe,GAAG,CAAC;MACnBP,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;IACtC,CAAC,MAAM,IAAIX,IAAI,KAAKP,SAAS,CAAC8C,eAAe,EAAE;MAC7C,IAAI;QACF,MAAM;UAAET,QAAQ;UAAEC,UAAU;UAAEP,MAAM;UAAEQ;QAAQ,CAAC,GAC7C,MAAM7C,eAAe,CAACsB,OAAO,CAAC,CAAC;QACjC,IAAIE,QAAQ,GAAG;UACbmB,QAAQ;UACRC,UAAU;UACVrB,QAAQ,EAAE;YAAEc,MAAM;YAAEQ,OAAO;YAAEP,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDT,eAAe,GAAG,CAAC;QACnBP,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAON,KAAK,EAAE;QACdX,aAAa,CAAC;UAAEW;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM;MACLX,aAAa,CAAC;QAAEW,KAAK,EAAE,IAAIG,KAAK,CAAC,oBAAoB;MAAE,CAAC,CAAC;IAC3D;EACF,CAAC;EAEDgC,MAAM,EAAE,MAAOC,QAAoC,IAAK;IACtD,IAAI;MACF,MAAMvD,IAAI,CAACsD,MAAM,CAAC,CAAC;MACnBtC,OAAO,CAACC,GAAG,CAAC,UAAU,CAAC;MACvBsC,QAAQ,GAAG,CAAC;MACZrD,YAAY,CAACgB,gBAAgB,CAAC,UAAU,CAAC;IAC3C,CAAC,CAAC,OAAOsC,CAAC,EAAE;MACVxC,OAAO,CAACG,KAAK,CAACqC,CAAC,CAAC;MAChBD,QAAQ,GAAGC,CAAC,CAAC;IACf;EACF,CAAC;EAEDC,OAAO,EAAEA,CAAA,KAAM;IACb,OAAO9B,YAAY,CAAC+B,WAAW,CAAC,CAAC,IAAI,IAAI;EAC3C,CAAC;EAEDC,SAAS,EAAEA,CAAA,KAAM;IACf,OACEhC,YAAY,CAAC8B,OAAO,CAAC,CAAC,IACtB9B,YAAY,CAAC+B,WAAW,CAAC,CAAC,EAAE5C,IAAI,KAAKP,SAAS,CAAC4C,gBAAgB;EAEnE,CAAC;EAEDO,WAAW,EAAEA,CAAA,KAAM;IACjB,OAAO1D,IAAI,CAAC0D,WAAW,CAAC,CAAC;EAC3B,CAAC;EAEDE,eAAe,EAAE,MAAAA,CACfC,IAAc,EACdC,MAAa,EACbP,QAAoC,KACjC;IACH,IAAI;MACFvC,OAAO,CAACC,GAAG,CAAC,2BAA2B,GAAG4C,IAAI,GAAG,GAAG,GAAGC,MAAM,CAAC;MAC9D,MAAMnD,IAAI,GAAG,MAAMX,IAAI,CAAC4D,eAAe,CAACC,IAAI,EAAEC,MAAM,CAAC;MACrD9C,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEN,IAAI,CAAC;MAC1C4C,QAAQ,GAAG,CAAC;IACd,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVxC,OAAO,CAACG,KAAK,CAACqC,CAAC,CAAC;MAChBD,QAAQ,GAAGC,CAAC,CAAC;IACf;EACF,CAAC;EAEDO,UAAU,EAAEA,CACVC,GAAW,EACXC,KAAU,EACVV,QAAoC,KACjC;IACH5B,YAAY,CAACiC,eAAe,CAAC,CAACI,GAAG,CAAC,EAAE,CAACC,KAAK,CAAC,EAAEV,QAAQ,CAAC;EACxD,CAAC;EAEDW,UAAU,EAAE,MAAOX,QAAmC,IAAK;IACzD,IAAI;MACF,MAAMG,WAAW,GAAG1D,IAAI,CAAC0D,WAAW,CAAC,CAAC;MACtC,IAAI,CAACA,WAAW,EAAE;QAChB;MACF;MACA,IAAIA,WAAW,CAAC5C,IAAI,KAAKP,SAAS,CAAC0B,cAAc,EAAE;QACjD,MAAMlC,cAAc,CAACoE,oBAAoB,CAAC,CAAC;MAC7C;MACA,MAAMnE,IAAI,CAACkE,UAAU,CAAC,CAAC;MACvBX,QAAQ,CAAC,CAAC;IACZ,CAAC,CAAC,OAAOpC,KAAK,EAAE;MACdH,OAAO,CAACG,KAAK,CAACA,KAAK,CAAC;MACpBoC,QAAQ,CAACpC,KAAK,CAAC;IACjB;EACF,CAAC;EAEDiD,aAAa,EAAEA,CAAA,KAAM;IACnB,OAAOhE,QAAQ,CAACiE,QAAQ,CAAClE,YAAY,CAACU,aAAa,CAAC;EACtD,CAAC;EAEDyD,sBAAsB,EAAEA,CAAA,KAAM;IAC5B,OAAOlE,QAAQ,CAACiE,QAAQ,CAAClE,YAAY,CAACoE,oBAAoB,CAAC;EAC7D,CAAC;EAEDC,iBAAiB,EAAE,MAAOjB,QAAgC,IAAK;IAC7D,IAAI;MACF,MAAM;QAAEV;MAAW,CAAC,GAAG,MAAMvC,eAAe,CAACiB,OAAO,CAClDlB,aAAa,CAAC0C,QAAQ,EACtB1C,aAAa,CAAC2C,YAChB,CAAC;MACDO,QAAQ,CAAC;QAAEV;MAAW,CAAC,CAAC;IAC1B,CAAC,CAAC,OAAOb,CAAC,EAAE;MACV;IAAA;EAEJ,CAAC;EAEDyC,eAAe,EAAEA,CAAA,KAAM;IACrB,IAAI,CAAC9C,YAAY,CAAC8B,OAAO,CAAC,CAAC,EAAE;MAC3B,OAAO,CAAC;IACV;IACA,MAAMiB,UAAU,GAAG/C,YAAY,CAAC+B,WAAW,CAAC,CAAC,EAAEiB,SAAS;IACxD,IAAID,UAAU,EAAE;MACd,MAAME,IAAI,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,GAAGJ,UAAU,CAACI,OAAO,CAAC,CAAC;MACxD,MAAMC,OAAO,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,IAAI,CAACN,IAAI,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;MACpE,OAAOG,OAAO;IAChB;IACA,OAAO,CAAC;EACV;AACF,CAAC","ignoreList":[]}
|
package/lib/typescript/Auth.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LoginAuthDataType, LoginUserDataType, UserType } from './constant';
|
|
2
2
|
export declare const Auth: {
|
|
3
3
|
autoLogin: () => Promise<UserType>;
|
|
4
|
-
|
|
4
|
+
login: (authData: LoginAuthDataType, userData?: LoginUserDataType) => Promise<UserType>;
|
|
5
5
|
logOut: () => Promise<void>;
|
|
6
6
|
currentUser: () => UserType | null;
|
|
7
7
|
batchUpdateUser: (keys: string[], values: any[]) => Promise<UserType>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../src/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAU5E,eAAO,MAAM,IAAI;qBACM,QAAQ,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../src/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAU5E,eAAO,MAAM,IAAI;qBACM,QAAQ,QAAQ,CAAC;sBAU1B,iBAAiB,aAChB,iBAAiB,KAC3B,QAAQ,QAAQ,CAAC;;uBAeH,QAAQ,GAAG,IAAI;4BAIF,MAAM,EAAE,UAAU,GAAG,EAAE,KAAG,QAAQ,QAAQ,CAAC;sBAMnD,QAAQ,IAAI,CAAC;CAIpC,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { LoginAuthDataType, LoginUserDataType, UserType } from './constant';
|
|
2
2
|
export declare const CloudBaseAuth: {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
logout: () => void
|
|
3
|
+
getLocalUser: () => Promise<UserType | null>;
|
|
4
|
+
login: (authData: LoginAuthDataType, userData?: LoginUserDataType) => Promise<UserType>;
|
|
5
|
+
logout: () => Promise<void>;
|
|
6
6
|
updateUser: (keys: string[], values: any[]) => Promise<UserType>;
|
|
7
7
|
destroyUser: () => Promise<void>;
|
|
8
8
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudBaseAuth.d.ts","sourceRoot":"","sources":["../../src/CloudBaseAuth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CloudBaseAuth.d.ts","sourceRoot":"","sources":["../../src/CloudBaseAuth.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EAEjB,iBAAiB,EACjB,QAAQ,EACT,MAAM,YAAY,CAAC;AAsGpB,eAAO,MAAM,aAAa;wBACA,QAAQ,QAAQ,GAAG,IAAI,CAAC;sBAkBpC,iBAAiB,aAChB,iBAAiB,KAC3B,QAAQ,QAAQ,CAAC;;uBA6BK,MAAM,EAAE,UAAU,GAAG,EAAE,KAAG,QAAQ,QAAQ,CAAC;;CAwBrE,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LoginAuthDataType, LoginUserDataType, UserType } from './constant';
|
|
2
2
|
export declare const LeanCloudAuth: {
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
getLocalUser: () => Promise<UserType | null>;
|
|
4
|
+
login: (authData: LoginAuthDataType, userData?: LoginUserDataType) => Promise<UserType>;
|
|
5
5
|
logout: () => Promise<void>;
|
|
6
6
|
updateUser: (keys: string[], values: any[]) => Promise<UserType>;
|
|
7
7
|
destroyUser: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeanCloudAuth.d.ts","sourceRoot":"","sources":["../../src/LeanCloudAuth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LeanCloudAuth.d.ts","sourceRoot":"","sources":["../../src/LeanCloudAuth.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,iBAAiB,EACjB,QAAQ,EACT,MAAM,YAAY,CAAC;AAgCpB,eAAO,MAAM,aAAa;wBACA,QAAQ,QAAQ,GAAG,IAAI,CAAC;sBAMpC,iBAAiB,aAChB,iBAAiB,KAC3B,QAAQ,QAAQ,CAAC;;uBAmDK,MAAM,EAAE,UAAU,GAAG,EAAE,KAAG,QAAQ,QAAQ,CAAC;;CA8BrE,CAAC"}
|
package/package.json
CHANGED
package/src/Auth.ts
CHANGED
|
@@ -11,7 +11,7 @@ let CURRENT_USER: UserType | null = null;
|
|
|
11
11
|
|
|
12
12
|
export const Auth = {
|
|
13
13
|
autoLogin: async (): Promise<UserType> => {
|
|
14
|
-
const user = await backend.
|
|
14
|
+
const user = await backend.getLocalUser();
|
|
15
15
|
if (!user) {
|
|
16
16
|
throw new Error('User Not Login Yet');
|
|
17
17
|
}
|
|
@@ -19,11 +19,11 @@ export const Auth = {
|
|
|
19
19
|
return user;
|
|
20
20
|
},
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
login: async (
|
|
23
23
|
authData: LoginAuthDataType,
|
|
24
24
|
userData?: LoginUserDataType
|
|
25
25
|
): Promise<UserType> => {
|
|
26
|
-
const user = await backend.
|
|
26
|
+
const user = await backend.login(authData, userData);
|
|
27
27
|
if (user.isNew) {
|
|
28
28
|
// 标记为当前用户是在本机注册的 TODO
|
|
29
29
|
PrefData.setValue(BuildInPrefs.RegisterInThisDevice, true);
|