Skip to content

Commit fc7ae1f

Browse files
Updated loadProfileDone() to use V5 API
1 parent e85b7d4 commit fc7ae1f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/actions/auth.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ import { getApi } from '../services/api';
1616
function loadProfileDone(userTokenV3) {
1717
if (!userTokenV3) return Promise.resolve(null);
1818
const user = decodeToken(userTokenV3);
19-
const api = getApi('V3', userTokenV3);
19+
const api = getApi('V5', userTokenV3);
2020
return Promise.all([
2121
api.get(`/members/${user.handle}`)
22-
.then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
22+
.then(res => (res.ok ? res.json() : new Error(res.statusText)))
23+
.then(res => (res.message ? new Error(res.message) : res[0])),
2324
api.get(`/groups?memberId=${user.userId}&membershipType=user`)
24-
.then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : [])),
25+
.then(res => (res.ok ? res.json() : new Error(res.statusText)))
26+
.then(res => (res.message ? new Error(res.message) : res)),
2527
]).then(([profile, groups]) => ({ ...profile, groups }));
2628
}
2729

src/services/groups.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ function mergeGroup(groups, group) {
170170
* @param {Object} group
171171
* @return {String[]} Array of IDs.
172172
*/
173-
export function reduceGroupIds({ oldId, subGroups }) {
174-
let res = [oldId];
173+
export function reduceGroupIds({ id, subGroups }) {
174+
let res = [id];
175175
if (subGroups) {
176176
subGroups.forEach((g) => {
177177
res = res.concat(reduceGroupIds(g));

src/utils/challenge/filter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ export function mapToBackend(filter) {
382382
if (filter.or) return {};
383383

384384
const res = {};
385-
if (filter.groupIds) res.groupIds = filter.groupIds.join(',');
385+
if (filter.groupIds) res.groupIds = filter.groupIds; // filter.groupIds.join(',');
386386

387387
/* NOTE: Right now the frontend challenge filter by tag works different,
388388
* it looks for matches in the challenge name OR in the techs / platforms. */

0 commit comments

Comments
 (0)