secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Same .me format for providers; CORS for Genius

Browse Source
This commit is contained in:
James Barnsley
2018-08-17 16:09:36 +12:00
parent d48cdd9f45
commit b9f53d8d83
12 changed files with 211 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
mopidy_iris/static/app.js
View File

@ -16689,10 +16689,9 @@ function getMe() {
sendRequest(dispatch, getState, params).then(function (response) {
if (response.user) {
dispatch({
type: 'LASTFM_USER_LOADED',
user: response.user
type: 'LASTFM_ME_LOADED',
me: response.user
});
dispatch({ type: 'LASTFM_CONNECTED' });
}
});
};
@ -22096,16 +22095,8 @@ var sendRequest = function sendRequest(dispatch, getState, endpoint) {
var config = {
method: method,
url: 'https://api.genius.com/' + endpoint + '?access_token=' + getState().genius.access_token,
dataType: 'jsonp',
timeout: 30000,
crossDomain: true,
async: true,
headers: {
// We can't use headers as this seems to trigger CORS issues. Instead we have to post as URL params
// Authorization: 'Bearer '+ getState().genius.access_token,
Accept: 'application/json',
"Access-Control-Allow-Origin": "*"
}
crossDomain: true
// only if we've got data do we add it to the request (this prevents appending of "&false" to the URL)
};if (data) {
@ -22173,13 +22164,7 @@ function getMe() {
me: response.user
});
}, function (error) {
console.log(error);
/*
dispatch(coreActions.handleException(
'Could not load your Genius profile',
error
));
*/
dispatch(coreActions.handleException('Could not load your Genius profile', error));
});
};
}
@ -52393,14 +52378,18 @@ var _middleware9 = __webpack_require__(237);
var _middleware10 = _interopRequireDefault(_middleware9);
var _middleware11 = __webpack_require__(238);
var _middleware11 = __webpack_require__(341);
var _middleware12 = _interopRequireDefault(_middleware11);
var _middleware13 = __webpack_require__(239);
var _middleware13 = __webpack_require__(238);
var _middleware14 = _interopRequireDefault(_middleware13);
var _middleware15 = __webpack_require__(239);
var _middleware16 = _interopRequireDefault(_middleware15);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@ -52488,7 +52477,7 @@ initialState.genius = Object.assign({}, initialState.genius, helpers.getStorage(
console.log('Bootstrapping', initialState);
var store = (0, _redux.createStore)(reducers, initialState, (0, _redux.applyMiddleware)(_reduxThunk2.default, _middleware14.default, _middleware2.default, _middleware4.default, _middleware8.default, _middleware6.default, _middleware12.default, _middleware10.default));
var store = (0, _redux.createStore)(reducers, initialState, (0, _redux.applyMiddleware)(_reduxThunk2.default, _middleware16.default, _middleware2.default, _middleware4.default, _middleware8.default, _middleware6.default, _middleware14.default, _middleware10.default, _middleware12.default));
exports.default = store;
@ -53344,6 +53333,11 @@ function reducer() {
case 'LASTFM_SET':
return Object.assign({}, lastfm, action.data);
case 'LASTFM_ME_LOADED':
return Object.assign({}, lastfm, {
me: action.me
});
case 'LASTFM_AUTHORIZATION_GRANTED':
return Object.assign({}, lastfm, {
authorizing: false,
@ -61035,14 +61029,19 @@ var LastfmMiddleware = function () {
switch (action.type) {
case 'LASTFM_ME_LOADED':
store.dispatch({
type: 'LASTFM_USER_LOADED',
user: action.me
});
next(action);
break;
case 'LASTFM_USER_LOADED':
var user = Object.assign({}, action.user, {
uri: "lastfm:user:" + action.user.name
});
store.dispatch({
type: "USERS_LOADED",
users: [user]
});
store.dispatch(coreActions.userLoaded(user));
next(action);
break;
@ -61596,6 +61595,12 @@ var localstorageMiddleware = function () {
});
break;
case 'LASTFM_ME_LOADED':
helpers.setStorage('lastfm', {
me: action.data.session.user
});
break;
case 'LASTFM_AUTHORIZATION_GRANTED':
helpers.setStorage('lastfm', {
session: action.data.session
@ -61608,6 +61613,12 @@ var localstorageMiddleware = function () {
});
break;
case 'GENIUS_ME_LOADED':
helpers.setStorage('genius', {
me: action.me
});
break;
case 'GENIUS_AUTHORIZATION_GRANTED':
helpers.setStorage('genius', {
authorization: action.data,
@ -72565,6 +72576,9 @@ var Services = function (_React$Component) {
if (this.props.lastfm.session && this.props.core.users["lastfm:user:" + this.props.lastfm.session.name] === undefined) {
this.props.lastfmActions.getMe();
}
if (this.props.genius.me && this.props.core.users["genius:user:" + this.props.genius.me.id] === undefined) {
this.props.geniusActions.getMe();
}
}
}, {
key: 'componentWillReceiveProps',
@ -72871,7 +72885,7 @@ var Services = function (_React$Component) {
var user = _react2.default.createElement(
'span',
{ className: 'user' },
_react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', images: user_object.avatar }),
_react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', image: user_object.photo_url }),
_react2.default.createElement(
'span',
{ className: 'user-name' },
@ -72894,7 +72908,7 @@ var Services = function (_React$Component) {
return _react2.default.createElement(
'div',
null,
this.props.genius.me ? _react2.default.createElement(
this.props.genius.authorization ? _react2.default.createElement(
'div',
{ className: 'field current-user' },
_react2.default.createElement(
@ -73001,14 +73015,14 @@ var Services = function (_React$Component) {
var spotify_icon = _react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small' });
}
if (this.props.lastfm.session && this.props.core.users["lastfm:user:" + this.props.lastfm.session.name]) {
var lastfm_icon = _react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', images: this.props.core.users["lastfm:user:" + this.props.lastfm.session.name].image });
if (this.props.lastfm.me && this.props.core.users["lastfm:user:" + this.props.lastfm.me.name]) {
var lastfm_icon = _react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', images: this.props.core.users["lastfm:user:" + this.props.lastfm.me.name].image });
} else {
var lastfm_icon = _react2.default.createElement(_Icon2.default, { type: 'fontawesome', name: 'lastfm' });
}
if (this.props.genius.user && this.props.core.users["lastfm:user:" + this.props.genius.user.id]) {
var genius_icon = _react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', images: this.props.core.users["genius:user:" + this.props.genius.user.id].avatar });
if (this.props.genius.me && this.props.core.users["genius:user:" + this.props.genius.me.id]) {
var genius_icon = _react2.default.createElement(_Thumbnail2.default, { circle: true, size: 'small', image: this.props.core.users["genius:user:" + this.props.genius.me.id].photo_url });
} else {
var genius_icon = _react2.default.createElement(_Icon2.default, { name: 'extension' });
}
@ -73074,7 +73088,7 @@ var Services = function (_React$Component) {
{ className: 'title' },
'Genius'
),
this.props.genius.session ? _react2.default.createElement(
this.props.genius.authorization ? _react2.default.createElement(
'span',
{ className: 'status green-text' },
'Authorized'
@ -73264,7 +73278,6 @@ var GeniusAuthenticationFrame = function (_React$Component) {
key: 'componentDidMount',
value: function componentDidMount() {
var self = this;
this.props.geniusActions.getMe();
// Listen for incoming messages from the authorization popup
window.addEventListener('message', function (event) {
@ -82018,6 +82031,82 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
// removed by extract-text-webpack-plugin
/***/ }),
/* 314 */,
/* 315 */,
/* 316 */,
/* 317 */,
/* 318 */,
/* 319 */,
/* 320 */,
/* 321 */,
/* 322 */,
/* 323 */,
/* 324 */,
/* 325 */,
/* 326 */,
/* 327 */,
/* 328 */,
/* 329 */,
/* 330 */,
/* 331 */,
/* 332 */,
/* 333 */,
/* 334 */,
/* 335 */,
/* 336 */,
/* 337 */,
/* 338 */,
/* 339 */,
/* 340 */,
/* 341 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var helpers = __webpack_require__(1);
var coreActions = __webpack_require__(11);
var GeniusMiddleware = function () {
return function (store) {
return function (next) {
return function (action) {
var state = store.getState();
switch (action.type) {
case 'GENIUS_ME_LOADED':
store.dispatch({
type: 'GENIUS_USER_LOADED',
user: action.me
});
next(action);
break;
case 'GENIUS_USER_LOADED':
var user = Object.assign({}, action.user, {
uri: "genius:user:" + action.user.id
});
store.dispatch(coreActions.userLoaded(user));
next(action);
break;
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);
}
};
};
};
}();
exports.default = GeniusMiddleware;
/***/ })
/******/ ]);
//# sourceMappingURL=app.js.map

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -98,7 +98,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1534364832";
var build = "1534466976";
var version = "3.23.2";
// Construct the script tag

3
src/js/bootstrap.js vendored
View File

@ -17,6 +17,7 @@ import uiMiddleware from './services/ui/middleware'
import pusherMiddleware from './services/pusher/middleware'
import mopidyMiddleware from './services/mopidy/middleware'
import lastfmMiddleware from './services/lastfm/middleware'
import geniusMiddleware from './services/genius/middleware'
import spotifyMiddleware from './services/spotify/middleware'
import localstorageMiddleware from './services/localstorage/middleware'
@ -106,7 +107,7 @@ console.log('Bootstrapping', initialState)
let store = createStore(
reducers,
initialState,
applyMiddleware(thunk, localstorageMiddleware, coreMiddleware, uiMiddleware, mopidyMiddleware, pusherMiddleware, spotifyMiddleware, lastfmMiddleware )
applyMiddleware(thunk, localstorageMiddleware, coreMiddleware, uiMiddleware, mopidyMiddleware, pusherMiddleware, spotifyMiddleware, lastfmMiddleware, geniusMiddleware)
);
export default store;

1
src/js/components/Fields/GeniusAuthenticationFrame.js
View File

@ -21,7 +21,6 @@ class GeniusAuthenticationFrame extends React.Component{
componentDidMount(){
let self = this;
this.props.geniusActions.getMe();
// Listen for incoming messages from the authorization popup
window.addEventListener('message', function(event){

17
src/js/components/Services.js
View File

@ -35,6 +35,9 @@ class Services extends React.Component{
if (this.props.lastfm.session && this.props.core.users["lastfm:user:"+this.props.lastfm.session.name] === undefined){
this.props.lastfmActions.getMe();
}
if (this.props.genius.me && this.props.core.users["genius:user:"+this.props.genius.me.id] === undefined){
this.props.geniusActions.getMe();
}
}
componentWillReceiveProps(newProps){
var changed = false
@ -206,7 +209,7 @@ class Services extends React.Component{
if (user_object){
var user = (
<span className="user">
<Thumbnail circle={true} size="small" images={user_object.avatar} />
<Thumbnail circle={true} size="small" image={user_object.photo_url} />
<span className="user-name">
{user_object.name}
</span>
@ -225,7 +228,7 @@ class Services extends React.Component{
return (
<div>
{this.props.genius.me ? <div className="field current-user">
{this.props.genius.authorization ? <div className="field current-user">
<div className="name">Current user</div>
<div className="input">
<div className="text">
@ -286,14 +289,14 @@ class Services extends React.Component{
var spotify_icon = <Thumbnail circle={true} size="small" />
}
if (this.props.lastfm.session && this.props.core.users["lastfm:user:"+this.props.lastfm.session.name]){
var lastfm_icon = <Thumbnail circle={true} size="small" images={this.props.core.users["lastfm:user:"+this.props.lastfm.session.name].image} />
if (this.props.lastfm.me && this.props.core.users["lastfm:user:"+this.props.lastfm.me.name]){
var lastfm_icon = <Thumbnail circle={true} size="small" images={this.props.core.users["lastfm:user:"+this.props.lastfm.me.name].image} />
} else {
var lastfm_icon = <Icon type="fontawesome" name="lastfm" />
}
if (this.props.genius.user && this.props.core.users["lastfm:user:"+this.props.genius.user.id]){
var genius_icon = <Thumbnail circle={true} size="small" images={this.props.core.users["genius:user:"+this.props.genius.user.id].avatar} />
if (this.props.genius.me && this.props.core.users["genius:user:"+this.props.genius.me.id]){
var genius_icon = <Thumbnail circle={true} size="small" image={this.props.core.users["genius:user:"+this.props.genius.me.id].photo_url} />
} else {
var genius_icon = <Icon name="extension" />
}
@ -324,7 +327,7 @@ class Services extends React.Component{
<div className="title">
Genius
</div>
{this.props.genius.session ? <span className="status green-text">Authorized</span> : <span className="status grey-text">Unauthorized</span>}
{this.props.genius.authorization ? <span className="status green-text">Authorized</span> : <span className="status grey-text">Unauthorized</span>}
</Link>
</div>
<div className="menu-item-wrapper">

13
src/js/services/genius/actions.js
View File

@ -27,16 +27,8 @@ var sendRequest = (dispatch, getState, endpoint, method = 'GET', data = false) =
var config = {
method: method,
url: 'https://api.genius.com/'+endpoint+'?access_token='+getState().genius.access_token,
dataType: 'jsonp',
timeout: 30000,
crossDomain: true,
async: true,
headers: {
// We can't use headers as this seems to trigger CORS issues. Instead we have to post as URL params
// Authorization: 'Bearer '+ getState().genius.access_token,
Accept: 'application/json',
"Access-Control-Allow-Origin": "*"
}
crossDomain: true
}
// only if we've got data do we add it to the request (this prevents appending of "&false" to the URL)
@ -113,13 +105,10 @@ export function getMe(){
});
},
error => {
console.log(error);
/*
dispatch(coreActions.handleException(
'Could not load your Genius profile',
error
));
*/
}
);
}

39
src/js/services/genius/middleware.js Executable file
View File

@ -0,0 +1,39 @@
var helpers = require('./../../helpers')
var coreActions = require('../core/actions')
const GeniusMiddleware = (function(){
return store => next => action => {
var state = store.getState();
switch(action.type){
case 'GENIUS_ME_LOADED':
store.dispatch({
type: 'GENIUS_USER_LOADED',
user: action.me
});
next(action);
break;
case 'GENIUS_USER_LOADED':
var user = Object.assign(
{},
action.user,
{
uri: "genius:user:"+action.user.id
}
);
store.dispatch(coreActions.userLoaded(user));
next(action);
break;
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);
}
}
})();
export default GeniusMiddleware

5
src/js/services/lastfm/actions.js
View File

@ -164,10 +164,9 @@ export function getMe(){
response => {
if (response.user){
dispatch({
type: 'LASTFM_USER_LOADED',
user: response.user
type: 'LASTFM_ME_LOADED',
me: response.user
});
dispatch({ type: 'LASTFM_CONNECTED' })
}
}
)

13
src/js/services/lastfm/middleware.js
View File

@ -14,6 +14,14 @@ const LastfmMiddleware = (function(){
switch(action.type){
case 'LASTFM_ME_LOADED':
store.dispatch({
type: 'LASTFM_USER_LOADED',
user: action.me
});
next(action);
break;
case 'LASTFM_USER_LOADED':
var user = Object.assign(
{},
@ -22,10 +30,7 @@ const LastfmMiddleware = (function(){
uri: "lastfm:user:"+action.user.name
}
);
store.dispatch({
type: "USERS_LOADED",
users: [user]
});
store.dispatch(coreActions.userLoaded(user));
next(action);
break;

5
src/js/services/lastfm/reducer.js
View File

@ -12,6 +12,11 @@ export default function reducer(lastfm = {}, action){
case 'LASTFM_SET':
return Object.assign({}, lastfm, action.data)
case 'LASTFM_ME_LOADED':
return Object.assign({}, lastfm, {
me: action.me
})
case 'LASTFM_AUTHORIZATION_GRANTED':
return Object.assign({}, lastfm, {
authorizing: false,

18
src/js/services/localstorage/middleware.js
View File

@ -117,6 +117,15 @@ const localstorageMiddleware = (function(){
);
break;
case 'LASTFM_ME_LOADED':
helpers.setStorage(
'lastfm',
{
me: action.data.session.user
}
);
break;
case 'LASTFM_AUTHORIZATION_GRANTED':
helpers.setStorage(
'lastfm',
@ -135,6 +144,15 @@ const localstorageMiddleware = (function(){
);
break;
case 'GENIUS_ME_LOADED':
helpers.setStorage(
'genius',
{
me: action.me
}
);
break;
case 'GENIUS_AUTHORIZATION_GRANTED':
helpers.setStorage(
'genius',