sim1222/misskey
1
0
Fork 0
mirror of https://github.com/sim1222/misskey.git synced 2025-07-01 16:29:56 +09:00
Code Issues Projects Releases Wiki Activity

アクセストークンは i に統一

Browse Source 
トークンの先頭に ! がプリフィックスされているかどうかでユーザー固有のトークンかどうか判別する
This commit is contained in:
syuilo
2017-01-06 01:28:16 +09:00
parent a63de6d776
commit fa591e5c9b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/api/authenticate.ts
View File

@ -20,10 +20,14 @@ export interface IAuthContext {
isSecure: boolean;
}
export default (req: express.Request) =>
new Promise<IAuthContext>(async (resolve, reject) => {
const token = req.body['i'];
if (token) {
export default (req: express.Request) => new Promise<IAuthContext>(async (resolve, reject) => {
const token = req.body['i'] || req.body['_userkey']; // そのうち_userkeyは削除
if (token == null) {
return resolve({ app: null, user: null, isSecure: false });
}
if (token[0] == '!') {
const user = await User
.findOne({ token: token });
@ -36,12 +40,9 @@ export default (req: express.Request) =>
user: user,
isSecure: true
});
}
const userkey = req.headers['userkey'] || req.body['_userkey'];
if (userkey) {
} else {
const userkeyDoc = await Userkey.findOne({
key: userkey
key: token
});
if (userkeyDoc === null) {
@ -56,6 +57,4 @@ export default (req: express.Request) =>
return resolve({ app: app, user: user, isSecure: false });
}
return resolve({ app: null, user: null, isSecure: false });
});