diff options
Diffstat (limited to 'src/services')
4 files changed, 17 insertions, 2 deletions
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index ae876b7f..b509c905 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -167,6 +167,8 @@ const register = (params) => { }) } +const getCaptcha = () => fetch('/api/pleroma/captcha').then(resp => resp.json()) + const authHeaders = (accessToken) => { if (accessToken) { return { 'Authorization': `Bearer ${accessToken}` } @@ -496,6 +498,7 @@ const apiService = { setUserMute, fetchMutes, register, + getCaptcha, updateAvatar, updateBg, updateProfile, diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index c84373ac..cc72f607 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -71,6 +71,7 @@ const backendInteractorService = (credentials) => { const fetchMutes = () => apiService.fetchMutes({credentials}) const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials}) + const getCaptcha = () => apiService.getCaptcha() const register = (params) => apiService.register(params) const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params}) const updateBg = ({params}) => apiService.updateBg({credentials, params}) @@ -100,6 +101,7 @@ const backendInteractorService = (credentials) => { setUserMute, fetchMutes, register, + getCaptcha, updateAvatar, updateBg, updateBanner, diff --git a/src/services/new_api/oauth.js b/src/services/new_api/oauth.js index 9e656507..97dec94f 100644 --- a/src/services/new_api/oauth.js +++ b/src/services/new_api/oauth.js @@ -5,7 +5,7 @@ const getOrCreateApp = ({oauth, instance}) => { const form = new window.FormData() form.append('client_name', `PleromaFE_${Math.random()}`) - form.append('redirect_uris', `${window.location.origin}/oauth-callback`) + form.append('redirect_uris', `${window.location.origin}/~/oauth-callback`) form.append('scopes', 'read write follow') return window.fetch(url, { @@ -64,7 +64,7 @@ const getToken = ({app, instance, code}) => { form.append('client_secret', app.client_secret) form.append('grant_type', 'authorization_code') form.append('code', code) - form.append('redirect_uri', `${window.location.origin}/oauth-callback`) + form.append('redirect_uri', `${window.location.origin}/~/oauth-callback`) return window.fetch(url, { method: 'POST', diff --git a/src/services/user_profile_link_generator/user_profile_link_generator.js b/src/services/user_profile_link_generator/user_profile_link_generator.js new file mode 100644 index 00000000..3367eb8a --- /dev/null +++ b/src/services/user_profile_link_generator/user_profile_link_generator.js @@ -0,0 +1,10 @@ +const generateProfileLink = (id, screenName) => { + return { + name: (isExternal(screenName) ? 'external-user-profile' : 'user-profile'), + params: (isExternal(screenName) ? { id } : { name: screenName }) + } +} + +const isExternal = screenName => screenName.includes('@') + +export default generateProfileLink |