@norcy/react-native-toolkit 0.3.26 → 0.3.27
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.
|
@@ -76,7 +76,7 @@ const profileToLocalUser = profile => {
|
|
|
76
76
|
const CloudBaseAuth = exports.CloudBaseAuth = {
|
|
77
77
|
getCurrentUser: async () => {
|
|
78
78
|
const cbApp = ensureInit();
|
|
79
|
-
const loginState =
|
|
79
|
+
const loginState = cbApp.auth.hasLoginState();
|
|
80
80
|
if (!loginState) {
|
|
81
81
|
cachedProfile = null;
|
|
82
82
|
return null;
|
|
@@ -138,8 +138,7 @@ const CloudBaseAuth = exports.CloudBaseAuth = {
|
|
|
138
138
|
console.log('CloudBase 登录失败: no ticket returned');
|
|
139
139
|
throw new Error('CloudBase auth: server did not return a ticket');
|
|
140
140
|
}
|
|
141
|
-
await cbApp.auth.
|
|
142
|
-
await cbApp.auth.signInWithCustomTicket();
|
|
141
|
+
await cbApp.auth.signInWithCustomTicket(() => Promise.resolve(ticket));
|
|
143
142
|
console.log('CloudBase 登录成功');
|
|
144
143
|
cachedProfile = user;
|
|
145
144
|
const localUser = profileToLocalUser(user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_jsSdk","_interopRequireDefault","require","_adapterRn","_reactNative","_constant","_Tool","e","__esModule","default","app","cachedProfile","authUrl","ensureInit","CloudBaseEnv","CloudBaseAccessKey","CloudBaseRegion","CloudBaseAuthUrl","ToolkitConfig","Error","cloudbase","useAdapters","adapter","init","env","region","accessKey","getLoginTypeNum","loginType","LoginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","profileToLocalUser","profile","id","_id","nickname","email","headimgurl","type","vipType","vipEndTime","Date","undefined","createdAt","attr","webdav","CloudBaseAuth","exports","getCurrentUser","cbApp","loginState","auth","hasLoginState","uid","currentUser","db","database","data","collection","doc","get","Array","isArray","length","error","console","log","loginWithAuthData","authData","userData","response","fetch","method","headers","body","JSON","stringify","action","openid","unionid","source","Platform","OS","ok","text","catch","status","result","json","ticket","user","isNew","
|
|
1
|
+
{"version":3,"names":["_jsSdk","_interopRequireDefault","require","_adapterRn","_reactNative","_constant","_Tool","e","__esModule","default","app","cachedProfile","authUrl","ensureInit","CloudBaseEnv","CloudBaseAccessKey","CloudBaseRegion","CloudBaseAuthUrl","ToolkitConfig","Error","cloudbase","useAdapters","adapter","init","env","region","accessKey","getLoginTypeNum","loginType","LoginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","profileToLocalUser","profile","id","_id","nickname","email","headimgurl","type","vipType","vipEndTime","Date","undefined","createdAt","attr","webdav","CloudBaseAuth","exports","getCurrentUser","cbApp","loginState","auth","hasLoginState","uid","currentUser","db","database","data","collection","doc","get","Array","isArray","length","error","console","log","loginWithAuthData","authData","userData","response","fetch","method","headers","body","JSON","stringify","action","openid","unionid","source","Platform","OS","ok","text","catch","status","result","json","ticket","user","isNew","signInWithCustomTicket","Promise","resolve","localUser","logout","signOut","updateUser","keys","values","updateData","oldValues","i","push","update","destroyUser","callFunction","name"],"sourceRoot":"../../src","sources":["CloudBaseAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -72,7 +72,7 @@ const profileToLocalUser = profile => {
|
|
|
72
72
|
export const CloudBaseAuth = {
|
|
73
73
|
getCurrentUser: async () => {
|
|
74
74
|
const cbApp = ensureInit();
|
|
75
|
-
const loginState =
|
|
75
|
+
const loginState = cbApp.auth.hasLoginState();
|
|
76
76
|
if (!loginState) {
|
|
77
77
|
cachedProfile = null;
|
|
78
78
|
return null;
|
|
@@ -134,8 +134,7 @@ export const CloudBaseAuth = {
|
|
|
134
134
|
console.log('CloudBase 登录失败: no ticket returned');
|
|
135
135
|
throw new Error('CloudBase auth: server did not return a ticket');
|
|
136
136
|
}
|
|
137
|
-
await cbApp.auth.
|
|
138
|
-
await cbApp.auth.signInWithCustomTicket();
|
|
137
|
+
await cbApp.auth.signInWithCustomTicket(() => Promise.resolve(ticket));
|
|
139
138
|
console.log('CloudBase 登录成功');
|
|
140
139
|
cachedProfile = user;
|
|
141
140
|
const localUser = profileToLocalUser(user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["cloudbase","adapter","Platform","LoginType","ToolkitConfig","app","cachedProfile","authUrl","ensureInit","CloudBaseEnv","CloudBaseAccessKey","CloudBaseRegion","CloudBaseAuthUrl","Error","useAdapters","init","env","region","accessKey","getLoginTypeNum","loginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","profileToLocalUser","profile","id","_id","nickname","email","headimgurl","type","vipType","vipEndTime","Date","undefined","createdAt","attr","webdav","CloudBaseAuth","getCurrentUser","cbApp","loginState","auth","hasLoginState","uid","currentUser","db","database","data","collection","doc","get","Array","isArray","length","error","console","log","loginWithAuthData","authData","userData","response","fetch","method","headers","body","JSON","stringify","action","openid","unionid","source","OS","ok","text","catch","status","result","json","ticket","user","isNew","
|
|
1
|
+
{"version":3,"names":["cloudbase","adapter","Platform","LoginType","ToolkitConfig","app","cachedProfile","authUrl","ensureInit","CloudBaseEnv","CloudBaseAccessKey","CloudBaseRegion","CloudBaseAuthUrl","Error","useAdapters","init","env","region","accessKey","getLoginTypeNum","loginType","LoginTypeWeChat","LoginTypeVisitor","LoginTypeHuawei","LoginTypeApple","profileToLocalUser","profile","id","_id","nickname","email","headimgurl","type","vipType","vipEndTime","Date","undefined","createdAt","attr","webdav","CloudBaseAuth","getCurrentUser","cbApp","loginState","auth","hasLoginState","uid","currentUser","db","database","data","collection","doc","get","Array","isArray","length","error","console","log","loginWithAuthData","authData","userData","response","fetch","method","headers","body","JSON","stringify","action","openid","unionid","source","OS","ok","text","catch","status","result","json","ticket","user","isNew","signInWithCustomTicket","Promise","resolve","localUser","logout","signOut","e","updateUser","keys","values","updateData","oldValues","i","push","update","destroyUser","callFunction","name"],"sourceRoot":"../../src","sources":["CloudBaseAuth.ts"],"mappings":";;AAAA,OAAOA,SAAS,MAAM,mBAAmB;AACzC,OAAOC,OAAO,MAAM,uBAAuB;AAC3C,SAASC,QAAQ,QAAQ,cAAc;AACvC,SAEEC,SAAS,QAGJ,YAAY;AACnB,SAASC,aAAa,QAAQ,QAAQ;;AAEtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,IAAIC,GAA6B,GAAG,IAAI;AACxC,IAAIC,aAAkB,GAAG,IAAI;AAC7B,IAAIC,OAAO,GAAG,EAAE;AAEhB,MAAMC,UAAU,GAAGA,CAAA,KAAM;EACvB,IAAIH,GAAG,EAAE,OAAOA,GAAG;EACnB,MAAM;IACJI,YAAY;IACZC,kBAAkB;IAClBC,eAAe;IACfC;EACF,CAAC,GAAGR,aAAa;EACjB,IAAI,CAACK,YAAY,IAAI,CAACC,kBAAkB,IAAI,CAACE,gBAAgB,EAAE;IAC7D,MAAM,IAAIC,KAAK,CACb,sGACF,CAAC;EACH;EACAb,SAAS,CAACc,WAAW,CAACb,OAAO,CAAC;EAC9BI,GAAG,GAAGL,SAAS,CAACe,IAAI,CAAC;IACnBC,GAAG,EAAEP,YAAY;IACjBQ,MAAM,EAAEN,eAAe,IAAI,aAAa;IACxCO,SAAS,EAAER;EACb,CAAC,CAAC;EACFH,OAAO,GAAGK,gBAAgB;EAC1B,OAAOP,GAAG;AACZ,CAAC;AAED,MAAMc,eAAe,GAAIC,SAAkB,IAAK;EAC9C,IAAIA,SAAS,KAAK,QAAQ,EAAE;IAC1B,OAAOjB,SAAS,CAACkB,eAAe;EAClC;EACA,IAAID,SAAS,KAAK,SAAS,EAAE;IAC3B,OAAOjB,SAAS,CAACmB,gBAAgB;EACnC;EACA,IAAIF,SAAS,KAAK,QAAQ,EAAE;IAC1B,OAAOjB,SAAS,CAACoB,eAAe;EAClC;EACA,OAAOpB,SAAS,CAACqB,cAAc;AACjC,CAAC;AAED,MAAMC,kBAAkB,GAAIC,OAAY,IAAe;EACrD,OAAO;IACLC,EAAE,EAAED,OAAO,CAACE,GAAG,IAAI,EAAE;IACrBC,QAAQ,EAAEH,OAAO,CAACG,QAAQ;IAC1BC,KAAK,EAAEJ,OAAO,CAACI,KAAK;IACpBC,UAAU,EAAEL,OAAO,CAACK,UAAU;IAC9BC,IAAI,EAAEN,OAAO,CAACM,IAAI,IAAIb,eAAe,CAACO,OAAO,CAACN,SAAS,CAAC;IACxDa,OAAO,EAAEP,OAAO,CAACO,OAAO;IACxBC,UAAU,EAAER,OAAO,CAACQ,UAAU,GAAG,IAAIC,IAAI,CAACT,OAAO,CAACQ,UAAU,CAAC,GAAGE,SAAS;IACzEC,SAAS,EAAEX,OAAO,CAACW,SAAS,GAAG,IAAIF,IAAI,CAACT,OAAO,CAACW,SAAS,CAAC,GAAGD,SAAS;IACtEE,IAAI,EAAEZ,OAAO,CAACY,IAAI;IAClBC,MAAM,EAAEb,OAAO,CAACa;EAClB,CAAC;AACH,CAAC;AAED,OAAO,MAAMC,aAAa,GAAG;EAC3BC,cAAc,EAAE,MAAAA,CAAA,KAAsC;IACpD,MAAMC,KAAK,GAAGlC,UAAU,CAAC,CAAC;IAC1B,MAAMmC,UAAU,GAAGD,KAAK,CAACE,IAAI,CAACC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAACF,UAAU,EAAE;MACfrC,aAAa,GAAG,IAAI;MACpB,OAAO,IAAI;IACb;IAEA,IAAIA,aAAa,EAAE;MACjB,OAAOmB,kBAAkB,CAACnB,aAAa,CAAC;IAC1C;IAEA,MAAMwC,GAAG,GAAGJ,KAAK,CAACE,IAAI,CAACG,WAAW,EAAED,GAAG;IACvC,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;IAErB,IAAI;MACF,MAAME,EAAE,GAAGN,KAAK,CAACO,QAAQ,CAAC,CAAC;MAC3B,MAAM;QAAEC;MAAK,CAAC,GAAG,MAAMF,EAAE,CAACG,UAAU,CAAC,cAAc,CAAC,CAACC,GAAG,CAACN,GAAG,CAAC,CAACO,GAAG,CAAC,CAAC;MACnE,IAAI,CAACH,IAAI,IAAKI,KAAK,CAACC,OAAO,CAACL,IAAI,CAAC,IAAIA,IAAI,CAACM,MAAM,KAAK,CAAE,EAAE,OAAO,IAAI;MACpElD,aAAa,GAAGgD,KAAK,CAACC,OAAO,CAACL,IAAI,CAAC,GAAGA,IAAI,CAAC,CAAC,CAAC,GAAGA,IAAI;MACpD,OAAOzB,kBAAkB,CAACnB,aAAa,CAAC;IAC1C,CAAC,CAAC,OAAOmD,KAAK,EAAE;MACdC,OAAO,CAACC,GAAG,CAAC,gCAAgC,EAAEF,KAAK,CAAC;MACpD,OAAO,IAAI;IACb;EACF,CAAC;EAEDG,iBAAiB,EAAE,MAAAA,CACjBC,QAA2B,EAC3BC,QAA4B,KACN;IACtBJ,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEG,QAAQ,CAAC;IACvC,MAAMpB,KAAK,GAAGlC,UAAU,CAAC,CAAC;IAC1B,MAAMY,SAAS,GAAGyC,QAAQ,CAACzC,SAAS,IAAI,OAAO;IAE/C,MAAM2C,QAAQ,GAAG,MAAMC,KAAK,CAACzD,OAAO,EAAE;MACpC0D,MAAM,EAAE,MAAM;MACdC,OAAO,EAAE;QAAE,cAAc,EAAE;MAAmB,CAAC;MAC/CC,IAAI,EAAEC,IAAI,CAACC,SAAS,CAAC;QACnBC,MAAM,EAAE,mBAAmB;QAC3BT,QAAQ,EAAE;UACRU,MAAM,EAAEV,QAAQ,CAACU,MAAM;UACvBC,OAAO,EAAEX,QAAQ,CAACW,OAAO;UACzBpD;QACF,CAAC;QACD0C,QAAQ,EAAEA,QAAQ,GACd;UACEjC,QAAQ,EAAEiC,QAAQ,CAACjC,QAAQ;UAC3BE,UAAU,EAAE+B,QAAQ,CAAC/B,UAAU;UAC/BD,KAAK,EAAEgC,QAAQ,CAAChC;QAClB,CAAC,GACDM,SAAS;QACbqC,MAAM,EAAEvE,QAAQ,CAACwE,EAAE,KAAK,SAAS,GAAG,CAAC,GAAGtC;MAC1C,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,CAAC2B,QAAQ,CAACY,EAAE,EAAE;MAChB,MAAMC,IAAI,GAAG,MAAMb,QAAQ,CAACa,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,MAAM,EAAE,CAAC;MAClDnB,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEI,QAAQ,CAACe,MAAM,EAAEF,IAAI,CAAC;MACpD,MAAM,IAAI/D,KAAK,CAAC,kCAAkCkD,QAAQ,CAACe,MAAM,EAAE,CAAC;IACtE;IAEA,MAAMC,MAAM,GAAG,MAAMhB,QAAQ,CAACiB,IAAI,CAAC,CAAC;IACpC,MAAM;MAAEC,MAAM;MAAEC,IAAI;MAAEC;IAAM,CAAC,GAAGJ,MAAM;IAEtC,IAAI,CAACE,MAAM,EAAE;MACXvB,OAAO,CAACC,GAAG,CAAC,oCAAoC,CAAC;MACjD,MAAM,IAAI9C,KAAK,CAAC,gDAAgD,CAAC;IACnE;IAEA,MAAM6B,KAAK,CAACE,IAAI,CAACwC,sBAAsB,CAAC,MAAMC,OAAO,CAACC,OAAO,CAACL,MAAM,CAAC,CAAC;IACtEvB,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;IAE7BrD,aAAa,GAAG4E,IAAI;IACpB,MAAMK,SAAS,GAAG9D,kBAAkB,CAACyD,IAAI,CAAC;IAC1CK,SAAS,CAACJ,KAAK,GAAGA,KAAK,IAAI,KAAK;IAChC,OAAOI,SAAS;EAClB,CAAC;EAEDC,MAAM,EAAEA,CAAA,KAAM;IACZ,MAAM9C,KAAK,GAAGlC,UAAU,CAAC,CAAC;IAC1BkC,KAAK,CAACE,IAAI,CAAC6C,OAAO,CAAC,CAAC,CAACZ,KAAK,CAAEa,CAAM,IAAK;MACrChC,OAAO,CAACC,GAAG,CAAC,yBAAyB,EAAE+B,CAAC,CAAC;IAC3C,CAAC,CAAC;IACFpF,aAAa,GAAG,IAAI;EACtB,CAAC;EAEDqF,UAAU,EAAE,MAAAA,CAAOC,IAAc,EAAEC,MAAa,KAAwB;IACtE,MAAMnD,KAAK,GAAGlC,UAAU,CAAC,CAAC;IAC1B,MAAMsC,GAAG,GAAGJ,KAAK,CAACE,IAAI,CAACG,WAAW,EAAED,GAAG;IACvC,IAAI,CAACA,GAAG,EAAE,MAAM,IAAIjC,KAAK,CAAC,oBAAoB,CAAC;IAE/C,MAAMmC,EAAE,GAAGN,KAAK,CAACO,QAAQ,CAAC,CAAC;IAC3B,MAAM6C,UAA+B,GAAG,CAAC,CAAC;IAC1C,MAAMC,SAAgB,GAAG,EAAE;IAE3B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,IAAI,CAACpC,MAAM,EAAEwC,CAAC,EAAE,EAAE;MACpCD,SAAS,CAACE,IAAI,CAAC3F,aAAa,GAAGsF,IAAI,CAACI,CAAC,CAAC,CAAC,CAAC;MACxCF,UAAU,CAACF,IAAI,CAACI,CAAC,CAAC,CAAC,GAAGH,MAAM,CAACG,CAAC,CAAC;IACjC;IAEA,IAAI;MACF,MAAMhD,EAAE,CAACG,UAAU,CAAC,cAAc,CAAC,CAACC,GAAG,CAACN,GAAG,CAAC,CAACoD,MAAM,CAACJ,UAAU,CAAC;MAC/D,MAAM;QAAE5C;MAAK,CAAC,GAAG,MAAMF,EAAE,CAACG,UAAU,CAAC,cAAc,CAAC,CAACC,GAAG,CAACN,GAAG,CAAC,CAACO,GAAG,CAAC,CAAC;MACnE/C,aAAa,GAAGgD,KAAK,CAACC,OAAO,CAACL,IAAI,CAAC,GAAGA,IAAI,CAAC,CAAC,CAAC,GAAGA,IAAI;MACpD,OAAOzB,kBAAkB,CAACnB,aAAa,CAAC;IAC1C,CAAC,CAAC,OAAOmD,KAAK,EAAE;MACd,IAAInD,aAAa,EAAE;QACjB,KAAK,IAAI0F,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,IAAI,CAACpC,MAAM,EAAEwC,CAAC,EAAE,EAAE;UACpC1F,aAAa,CAACsF,IAAI,CAACI,CAAC,CAAC,CAAC,GAAGD,SAAS,CAACC,CAAC,CAAC;QACvC;MACF;MACA,MAAMvC,KAAK;IACb;EACF,CAAC;EAED0C,WAAW,EAAE,MAAAA,CAAA,KAAY;IACvB,MAAMzD,KAAK,GAAGlC,UAAU,CAAC,CAAC;IAC1B,MAAMsC,GAAG,GAAGJ,KAAK,CAACE,IAAI,CAACG,WAAW,EAAED,GAAG;IACvC,IAAI,CAACA,GAAG,EAAE,MAAM,IAAIjC,KAAK,CAAC,oBAAoB,CAAC;IAE/C6C,OAAO,CAACC,GAAG,CAAC,kBAAkB,CAAC;IAC/B,MAAMjB,KAAK,CAAC0D,YAAY,CAAC;MACvBC,IAAI,EAAE,MAAM;MACZnD,IAAI,EAAE;QAAEoB,MAAM,EAAE;MAAc;IAChC,CAAC,CAAC;IACFZ,OAAO,CAACC,GAAG,CAAC,qBAAqB,CAAC;IAClC,MAAMjB,KAAK,CAACE,IAAI,CAAC6C,OAAO,CAAC,CAAC;IAC1BnF,aAAa,GAAG,IAAI;EACtB;AACF,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudBaseAuth.d.ts","sourceRoot":"","sources":["../../src/CloudBaseAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EAEjB,iBAAiB,EACjB,QAAQ,EACT,MAAM,YAAY,CAAC;AAwEpB,eAAO,MAAM,aAAa;0BACE,QAAQ,QAAQ,GAAG,IAAI,CAAC;kCA4BtC,iBAAiB,aAChB,iBAAiB,KAC3B,QAAQ,QAAQ,CAAC;;
|
|
1
|
+
{"version":3,"file":"CloudBaseAuth.d.ts","sourceRoot":"","sources":["../../src/CloudBaseAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EAEjB,iBAAiB,EACjB,QAAQ,EACT,MAAM,YAAY,CAAC;AAwEpB,eAAO,MAAM,aAAa;0BACE,QAAQ,QAAQ,GAAG,IAAI,CAAC;kCA4BtC,iBAAiB,aAChB,iBAAiB,KAC3B,QAAQ,QAAQ,CAAC;;uBAyDK,MAAM,EAAE,UAAU,GAAG,EAAE,KAAG,QAAQ,QAAQ,CAAC;;CA2CrE,CAAC"}
|
package/package.json
CHANGED
package/src/CloudBaseAuth.ts
CHANGED
|
@@ -81,7 +81,7 @@ const profileToLocalUser = (profile: any): UserType => {
|
|
|
81
81
|
export const CloudBaseAuth = {
|
|
82
82
|
getCurrentUser: async (): Promise<UserType | null> => {
|
|
83
83
|
const cbApp = ensureInit();
|
|
84
|
-
const loginState =
|
|
84
|
+
const loginState = cbApp.auth.hasLoginState();
|
|
85
85
|
if (!loginState) {
|
|
86
86
|
cachedProfile = null;
|
|
87
87
|
return null;
|
|
@@ -149,8 +149,7 @@ export const CloudBaseAuth = {
|
|
|
149
149
|
throw new Error('CloudBase auth: server did not return a ticket');
|
|
150
150
|
}
|
|
151
151
|
|
|
152
|
-
await cbApp.auth.
|
|
153
|
-
await cbApp.auth.signInWithCustomTicket();
|
|
152
|
+
await cbApp.auth.signInWithCustomTicket(() => Promise.resolve(ticket));
|
|
154
153
|
console.log('CloudBase 登录成功');
|
|
155
154
|
|
|
156
155
|
cachedProfile = user;
|