From bc1698e755cbfa33257360f5bdff781e8ecef517 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 9 Feb 2017 00:11:16 +0900 Subject: [PATCH] nanka iroiro --- src/api/endpoints.ts | 1 + src/api/endpoints/i/authorized_apps.js | 60 +++++++++++++++++++ src/web/app/common/tags/authorized-apps.tag | 34 +++++++++++ src/web/app/common/tags/index.js | 1 + src/web/app/desktop/tags/settings.tag | 5 ++ src/web/app/mobile/router.ls | 3 + src/web/app/mobile/tags/index.js | 1 + src/web/app/mobile/tags/page/settings.tag | 1 + .../tags/page/settings/authorized-apps.tag | 16 +++++ 9 files changed, 122 insertions(+) create mode 100644 src/api/endpoints/i/authorized_apps.js create mode 100644 src/web/app/common/tags/authorized-apps.tag create mode 100644 src/web/app/mobile/tags/page/settings/authorized-apps.tag diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts index ad45f42bc7..e4abc06f53 100644 --- a/src/api/endpoints.ts +++ b/src/api/endpoints.ts @@ -46,6 +46,7 @@ export default [ { name: 'i/appdata/get', shouldBeSignin: true }, { name: 'i/appdata/set', shouldBeSignin: true }, { name: 'i/signin_history', shouldBeSignin: true, kind: 'account-read' }, + { name: 'i/authorized_apps', shouldBeSignin: true, secure: true }, { name: 'i/notifications', shouldBeSignin: true, kind: 'notification-read' }, { name: 'notifications/delete', shouldBeSignin: true, kind: 'notification-write' }, diff --git a/src/api/endpoints/i/authorized_apps.js b/src/api/endpoints/i/authorized_apps.js new file mode 100644 index 0000000000..17f971af2f --- /dev/null +++ b/src/api/endpoints/i/authorized_apps.js @@ -0,0 +1,60 @@ +'use strict'; + +/** + * Module dependencies + */ +import * as mongo from 'mongodb'; +import AccessToken from '../../models/access-token'; +import App from '../../models/app'; +import serialize from '../../serializers/app'; + +/** + * Get authorized apps of my account + * + * @param {Object} params + * @param {Object} user + * @return {Promise} + */ +module.exports = (params, user) => + new Promise(async (res, rej) => +{ + // Get 'limit' parameter + let limit = params.limit; + if (limit !== undefined && limit !== null) { + limit = parseInt(limit, 10); + + // From 1 to 100 + if (!(1 <= limit && limit <= 100)) { + return rej('invalid limit range'); + } + } else { + limit = 10; + } + + // Get 'offset' parameter + let offset = params.offset; + if (offset !== undefined && offset !== null) { + offset = parseInt(offset, 10); + } else { + offset = 0; + } + + // Get 'sort' parameter + let sort = params.sort || 'desc'; + + // Get tokens + const tokens = await AccessToken + .find({ + user_id: user._id + }, { + limit: limit, + skip: offset, + sort: { + _id: sort == 'asc' ? 1 : -1 + } + }); + + // Serialize + res(await Promise.all(tokens.map(async token => + await serialize(token.app_id)))); +}); diff --git a/src/web/app/common/tags/authorized-apps.tag b/src/web/app/common/tags/authorized-apps.tag new file mode 100644 index 0000000000..aedfc78fd9 --- /dev/null +++ b/src/web/app/common/tags/authorized-apps.tag @@ -0,0 +1,34 @@ + +

連携しているアプリケーションはありません。

+
+
+

{ app.name }

+

{ app.description }

+
+
+ + + diff --git a/src/web/app/common/tags/index.js b/src/web/app/common/tags/index.js index a27dc11987..ef61d51ba4 100644 --- a/src/web/app/common/tags/index.js +++ b/src/web/app/common/tags/index.js @@ -17,3 +17,4 @@ require('./copyright.tag'); require('./signin-history.tag'); require('./api-info.tag'); require('./twitter-setting.tag'); +require('./authorized-apps.tag'); diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag index f446440dc8..3f8f759b47 100644 --- a/src/web/app/desktop/tags/settings.tag +++ b/src/web/app/desktop/tags/settings.tag @@ -63,6 +63,11 @@ +
+

アプリケーション

+ +
+