Skip to content

Remove client_secret from osm auth #6793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
royallsilwallz wants to merge 1 commit into from
Closed

Remove client_secret from osm auth #6793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions frontend/.env.expand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ REACT_APP_ENABLE_SERVICEWORKER=$TM_ENABLE_SERVICEWORKER
REACT_APP_MAX_FILESIZE=$TM_IMPORT_MAX_FILESIZE
REACT_APP_MAX_AOI_AREA=$TM_MAX_AOI_AREA
REACT_APP_OHSOME_STATS_BASE_URL=$OHSOME_STATS_BASE_URL
REACT_APP_OHSOME_STATS_TOKEN=$OHSOME_STATS_TOKEN
REACT_APP_OSM_CLIENT_ID=$TM_CLIENT_ID
REACT_APP_OSM_CLIENT_SECRET=$TM_CLIENT_SECRET
REACT_APP_OSM_REDIRECT_URI=$TM_REDIRECT_URI
REACT_APP_OSM_SERVER_URL=$OSM_SERVER_URL
REACT_APP_OSM_SERVER_API_URL=$OSM_SERVER_API_URL
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { gpx } from '@tmcw/togeojson';
import * as iD from '@hotosm/id';
import '@hotosm/id/dist/iD.css';

import { OSM_CLIENT_ID, OSM_CLIENT_SECRET, OSM_REDIRECT_URI, OSM_SERVER_URL } from '../config';
import { OSM_CLIENT_ID, OSM_REDIRECT_URI, OSM_SERVER_URL } from '../config';
import messages from './messages';

export default function Editor({ setDisable, comment, presets, imagery, gpxUrl }) {
Expand Down Expand Up @@ -98,7 +98,6 @@ export default function Editor({ setDisable, comment, presets, imagery, gpxUrl }
var auth = {
url: OSM_SERVER_URL,
client_id: OSM_CLIENT_ID,
client_secret: OSM_CLIENT_SECRET,
redirect_uri: OSM_REDIRECT_URI,
access_token: session.osm_oauth_token,
};
Expand Down
10 changes: 1 addition & 9 deletions frontend/src/components/rapidEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';

import PropTypes from 'prop-types';

import {
OSM_CLIENT_ID,
OSM_CLIENT_SECRET,
OSM_REDIRECT_URI,
OSM_SERVER_API_URL,
OSM_SERVER_URL,
} from '../config';
import { OSM_CLIENT_ID, OSM_REDIRECT_URI, OSM_SERVER_API_URL, OSM_SERVER_URL } from '../config';
import { types } from '../store/actions/editor';

// We import from a CDN using a SEMVER minor version range
Expand Down Expand Up @@ -198,7 +192,6 @@ function RapidEditor({
url: OSM_SERVER_URL,
apiUrl: OSM_SERVER_API_URL,
client_id: OSM_CLIENT_ID,
client_secret: OSM_CLIENT_SECRET,
redirect_uri: OSM_REDIRECT_URI,
},
];
Expand Down Expand Up @@ -279,7 +272,6 @@ function RapidEditor({
url: OSM_SERVER_URL,
apiUrl: OSM_SERVER_API_URL,
client_id: OSM_CLIENT_ID,
client_secret: OSM_CLIENT_SECRET,
redirect_uri: OSM_REDIRECT_URI,
access_token: session.osm_oauth_token,
};
Expand Down
1 change: 0 additions & 1 deletion frontend/src/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ORG_LOGO = process.env.REACT_APP_ORG_LOGO || '';
export const HOMEPAGE_IMG_HIGH = process.env.REACT_APP_HOMEPAGE_IMG_HIGH || '';
export const HOMEPAGE_IMG_LOW = process.env.REACT_APP_HOMEPAGE_IMG_LOW || '';
export const OSM_CLIENT_ID = process.env.REACT_APP_OSM_CLIENT_ID || '';
export const OSM_CLIENT_SECRET = process.env.REACT_APP_OSM_CLIENT_SECRET || '';
export const OSM_REDIRECT_URI = process.env.REACT_APP_OSM_REDIRECT_URI || '';
export const ORG_PRIVACY_POLICY_URL = process.env.REACT_APP_ORG_PRIVACY_POLICY_URL || '';
export const OSM_REGISTER_URL =
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/config/tests/config.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ it('exports ORG_GITHUB', () => {
it('exports OSM_CLIENT_ID', () => {
expect(typeof config.OSM_CLIENT_ID).toBe('string');
});
it('exports OSM_CLIENT_SECRET', () => {
expect(typeof config.OSM_CLIENT_SECRET).toBe('string');
});
it('exports OSM_REDIRECT_URI', () => {
expect(typeof config.OSM_REDIRECT_URI).toBe('string');
});
Expand Down
Loading