verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +1 -5
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae6963c26d - Show all commits

5
modules/account/back/methods/account/handle-user.js
View File

@ -30,17 +30,14 @@ module.exports = Self => {
} }
}); });
Self.loginApp = async(ctx, android_id, versionApp, nameApp, options) => { Self.handleUser = async(ctx, android_id, versionApp, nameApp, options) => {
const models = Self.app.models; const models = Self.app.models;
const myOptions = {}; const myOptions = {};
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
// const login = await models.Account.login(ctx, user, password, myOptions);
const accessToken = ctx.req.accessToken; const accessToken = ctx.req.accessToken;
let user = await models.VnUser.findById(accessToken.userId); let user = await models.VnUser.findById(accessToken.userId);
console.log(user.id);
const [[{vIsAuthorized, vMessage}]] = const [[{vIsAuthorized, vMessage}]] =
await Self.rawSql('CALL vn.device_checkLogin(?, ?);', await Self.rawSql('CALL vn.device_checkLogin(?, ?);',

1
modules/account/back/models/account.js
View File

@ -10,7 +10,6 @@ module.exports = Self => {
require('../methods/account/logout')(Self); require('../methods/account/logout')(Self);
require('../methods/account/change-password')(Self); require('../methods/account/change-password')(Self);
require('../methods/account/set-password')(Self); require('../methods/account/set-password')(Self);
require('../methods/account/login-app')(Self);
require('../methods/account/handle-user')(Self); require('../methods/account/handle-user')(Self);
Self.setUnverifiedPassword = async(id, pass, options) => { Self.setUnverifiedPassword = async(id, pass, options) => {