fix login

src/api/oauth.js

@@ -5,8 +5,9 @@ import { paramsString, promisedRequest } from './helpers.js'
 import { StatusCodeError } from 'src/services/errors/errors.js'
 
 const REDIRECT_URI = `${window.location.origin}/oauth-callback`
+const MASTODON_APP_VERIFY_URL = '/api/v1/apps/verify_credentials'
 
-export const createApp = ({ instance }) => {
+export const createApp = () => {
   const formData = new window.FormData()
 
   formData.append('client_name', 'PleromaFE')
@@ -15,7 +16,7 @@ export const createApp = ({ instance }) => {
   formData.append('scopes', 'read write follow push admin')
 
   return promisedRequest({
-    url: `${instance}/api/v1/apps`,
+    url: '/api/v1/apps',
     method: 'POST',
     formData,
   }).then(({ data, ...rest }) => ({
@@ -28,6 +29,12 @@ export const createApp = ({ instance }) => {
   }))
 }
 
+export const verifyAppToken = ({ credentials }) =>
+  promisedRequest({
+    url: MASTODON_APP_VERIFY_URL,
+    credentials,
+  })
+
 export const getLoginUrl = ({ instance, clientId }) => {
   const data = {
     responseType: 'code',
@@ -42,7 +49,6 @@ export const getLoginUrl = ({ instance, clientId }) => {
 export const getTokenWithCredentials = ({
   clientId,
   clientSecret,
-  instance,
   username,
   password,
 }) => {
@@ -55,13 +61,13 @@ export const getTokenWithCredentials = ({
   formData.append('password', password)
 
   return promisedRequest({
-    url: `${instance}/oauth/token`,
+    url: '/oauth/token',
     method: 'POST',
     formData,
   })
 }
 
-export const getToken = ({ clientId, clientSecret, instance, code }) => {
+export const getToken = ({ clientId, clientSecret, code }) => {
   const formData = new window.FormData()
 
   formData.append('client_id', clientId)
@@ -71,13 +77,13 @@ export const getToken = ({ clientId, clientSecret, instance, code }) => {
   formData.append('redirect_uri', `${window.location.origin}/oauth-callback`)
 
   return promisedRequest({
-    url: `${instance}/oauth/token`,
+    url: '/oauth/token',
     method: 'POST',
     formData,
   })
 }
 
-export const getClientToken = ({ clientId, clientSecret, instance }) => {
+export const getClientToken = ({ clientId, clientSecret }) => {
   const formData = new window.FormData()
 
   formData.append('client_id', clientId)
@@ -86,13 +92,13 @@ export const getClientToken = ({ clientId, clientSecret, instance }) => {
   formData.append('redirect_uri', `${window.location.origin}/oauth-callback`)
 
   return promisedRequest({
-    url: `${instance}/oauth/token`,
+    url: '/oauth/token',
     method: 'POST',
     formData,
   })
 }
 
-export const verifyOTPCode = ({ app, instance, mfaToken, code }) => {
+export const verifyOTPCode = ({ app, mfaToken, code }) => {
   const formData = new window.FormData()
 
   formData.append('client_id', app.client_id)
@@ -102,13 +108,13 @@ export const verifyOTPCode = ({ app, instance, mfaToken, code }) => {
   formData.append('challenge_type', 'totp')
 
   return promisedRequest({
-    url: `${instance}/oauth/mfa/challenge`,
+    url: '/oauth/mfa/challenge',
     method: 'POST',
     formData,
   })
 }
 
-export const verifyRecoveryCode = ({ app, instance, mfaToken, code }) => {
+export const verifyRecoveryCode = ({ app, mfaToken, code }) => {
   const formData = new window.FormData()
 
   formData.append('client_id', app.client_id)
@@ -118,13 +124,13 @@ export const verifyRecoveryCode = ({ app, instance, mfaToken, code }) => {
   formData.append('challenge_type', 'recovery')
 
   return promisedRequest({
-    url: `${instance}/oauth/mfa/challenge`,
+    url: '/oauth/mfa/challenge',
     method: 'POST',
     formData,
   })
 }
 
-export const revokeToken = ({ app, instance, token }) => {
+export const revokeToken = ({ app, token }) => {
   const formData = new window.FormData()
 
   formData.append('client_id', app.clientId)
@@ -132,7 +138,7 @@ export const revokeToken = ({ app, instance, token }) => {
   formData.append('token', token)
 
   return promisedRequest({
-    url: `${instance}/oauth/revoke`,
+    url: '/oauth/revoke',
     method: 'POST',
     formData,
   })

src/api/public.js

@@ -54,7 +54,6 @@ const MASTODON_SEARCH_2 = '/api/v2/search'
 const MASTODON_USER_SEARCH_URL = '/api/v1/accounts/search'
 const MASTODON_STREAMING = '/api/v1/streaming'
 const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
-const MASTODON_ANNOUNCEMENTS_URL = '/api/v1/announcements'
 const PLEROMA_EMOJI_REACTIONS_URL = (id) =>
   `/api/v1/pleroma/statuses/${id}/reactions`
 const PLEROMA_SCROBBLES_URL = (id, { maxId, sinceId, minId, limit, offset }) =>
@@ -431,9 +430,6 @@ export const search2 = ({
 export const fetchKnownDomains = ({ credentials }) =>
   promisedRequest({ url: MASTODON_KNOWN_DOMAIN_LIST_URL, credentials })
 
-export const getAnnouncements = ({ credentials }) =>
-  promisedRequest({ url: MASTODON_ANNOUNCEMENTS_URL, credentials })
-
 export const getMastodonSocketURI = (
   { credentials, stream, args = {} },
   base,

src/api/user.js

@@ -368,7 +368,6 @@ export const dismissAnnouncement = ({ id, credentials }) =>
     method: 'POST',
   })
 
-
 // #Imports
 export const importMutes = ({ file, credentials }) => {
   const formData = new FormData()