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

LastFM authorization format; Sharing config working

Browse Source
This commit is contained in:
James Barnsley
2018-10-01 21:51:46 +13:00
parent ba0f780c28
commit 85c5786d9e
18 changed files with 12014 additions and 15081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,10 +87,10 @@ const sendSignedRequest = (dispatch, getState, params) => {
return new Promise((resolve, reject) => {
// Not authorized
if (!getState().lastfm.session){
if (!getState().lastfm.authorization){
reject({
params: params,
error: "No active LastFM session"
error: "No active LastFM authorization (session)"
});
}
@ -100,7 +100,7 @@ const sendSignedRequest = (dispatch, getState, params) => {
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+method));
params += "&sk="+getState().lastfm.session.key;
params += "&sk="+getState().lastfm.authorization.key;
var config = {
method: 'GET',
@ -167,7 +167,7 @@ export function importAuthorization(authorization){
export function getMe(){
return (dispatch, getState) => {
var params = 'method=user.getInfo&user='+getState().lastfm.session.name
var params = 'method=user.getInfo&user='+getState().lastfm.authorization.name
sendRequest(dispatch, getState, params)
.then(
response => {
@ -206,8 +206,8 @@ export function getTrack(uri){
var track_name = track.name;
var artist_name = encodeURIComponent(track.artists[0].name);
var params = 'method=track.getInfo&track='+track_name+'&artist='+artist_name;
if (getState().lastfm.session){
params += '&username='+getState().lastfm.session.name;
if (getState().lastfm.authorization){
params += '&username='+getState().lastfm.authorization.name;
}
sendRequest(dispatch, getState, params)
.then(

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

@ -20,20 +20,20 @@ export default function reducer(lastfm = {}, action){
case 'LASTFM_AUTHORIZATION_GRANTED':
return Object.assign({}, lastfm, {
authorizing: false,
session: action.data.session
authorization: action.data.session
})
case 'LASTFM_AUTHORIZATION_REVOKED':
return Object.assign({}, lastfm, {
authorizing: false,
session: false,
authorization: false,
me: null
});
case 'LASTFM_IMPORT_AUTHORIZATION':
return Object.assign({}, lastfm, {
authorizing: false,
session: action.authorization,
authorization: action.authorization,
me: null
});