Merge branch 'master' of github.com:AnonymusRaccoon/Aeris into multilng-about-json

api/services/anilist.json

@@ -3,7 +3,7 @@
 	"actions": [],
 	"reactions": [
 		{
-			"name": "UpdateAbout",
+			"name": "Anilist_UpdateAbout",
 			"description": {
 				"en": "Update the about you section.",
 				"fr": "Mets à jour votre section \"À propos de moi\"."
@@ -25,7 +25,7 @@
 			"returns": []
 		},
 		{
-			"name": "ToggleFavourite",
+			"name": "Anilist_ToggleFavourite",
 			"description": {
 				"en": "Add or remove an anime from your favorite.",
 				"fr": "Ajoute ou retire un animé de vos favoris."

api/services/spotify.json

@@ -69,6 +69,7 @@
 	],
 	"reactions": [
 		{
+<<<<<<< HEAD
 			"name": "PlayTrack",
 			"description": {
 				"en": "Play a track",
@@ -78,6 +79,10 @@
 				"en": "Play a track",
 				"fr": "Joue une musique"
 			},
+=======
+			"name": "Spotify_PlayTrack",
+			"description": "Play a track",
+>>>>>>> 26566154676c8e279c3615522129e61b851c75a9
 			"params": [
 				{
 					"name": "artist",
@@ -134,6 +139,7 @@
 			"returns": []
 		},
 		{
+<<<<<<< HEAD
 			"name": "AddTrackToLibrary",
 			"description": {
 				"en": "Add a track to library",
@@ -143,6 +149,10 @@
 				"en": "Add a song to library",
 				"fr": "Ajoute une musique à votre librarie"
 			},
+=======
+			"name": "Spotify_AddTrackToLibrary",
+			"description": "Add a track to library",
+>>>>>>> 26566154676c8e279c3615522129e61b851c75a9
 			"params": [
 				{
 					"name": "artist",

api/src/Api/OIDC.hs

@@ -40,34 +40,34 @@ urlHandler :: Service -> Maybe String -> AppM NoContent
 urlHandler _ Nothing = throwError err400
 urlHandler Anilist (Just r) = do
     clientId <- liftIO $ envAsString "ANILIST_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://anilist.co/api/v2/oauth/authorize?client_id=" ++ clientId ++ "&response_type=code&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://anilist.co/api/v2/oauth/authorize?client_id=" ++ clientId ++ "&response_type=code&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 urlHandler Discord (Just r) = do
     clientId <- liftIO $ envAsString "DISCORD_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://discord.com/api/oauth2/authorize?response_type=code&scope=identify&client_id=" ++ clientId ++ "&response_type=code&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://discord.com/api/oauth2/authorize?response_type=code&scope=identify%20guilds%20messages.read%20activities.write%20webhook.incoming&client_id=" ++ clientId ++ "&response_type=code&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 urlHandler Google  (Just r) = do
     clientId <- liftIO $ envAsString "GOOGLE_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://accounts.google.com/o/oauth2/v2/auth?scope=https://www.googleapis.com/auth/youtube.force-ssl&access_type=offline&prompt=consent&include_granted_scopes=true&response_type=code&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://accounts.google.com/o/oauth2/v2/auth?scope=https://www.googleapis.com/auth/youtube.force-ssl&access_type=offline&prompt=consent&include_granted_scopes=true&response_type=code&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 urlHandler Twitter (Just r) = do
     clientId <- liftIO $ envAsString "TWITTER_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://twitter.com/i/oauth2/authorize?response_type=code&scope=like.write like.read follows.read follows.write offline.access tweet.read tweet.write&code_challenge=challenge&code_challenge_method=plain&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://twitter.com/i/oauth2/authorize?response_type=code&scope=like.write like.read follows.read follows.write offline.access tweet.read tweet.write&code_challenge=challenge&code_challenge_method=plain&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 urlHandler Spotify (Just r) = do
     clientId <- liftIO $ envAsString "SPOTIFY_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://accounts.spotify.com/authorize?response_type=code&scope=user-library-read&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://accounts.spotify.com/authorize?response_type=code&scope=user-library-read&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 urlHandler Github  (Just r) = do
     clientId <- liftIO $ envAsString "GITHUB_CLIENT_ID" ""
-    backRedirect <- liftIO $ envAsString "BACK_REDIRECT_URL" ""
+    backRedirect <- liftIO $ envAsString "BACK_URL" ""
     throwError $ err302 { errHeaders =
-        [("Location", B8.pack $ "https://github.com/login/oauth/authorize?response_type=code&scope=repo&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "&state=" ++ r)] } 
+        [("Location", B8.pack $ "https://github.com/login/oauth/authorize?response_type=code&scope=repo&client_id=" ++ clientId ++ "&redirect_uri=" ++ backRedirect ++ "auth/redirect" ++ "&state=" ++ r)] } 
 
 servicesHandler :: AuthRes -> AppM [String]
 servicesHandler (Authenticated (User uid name slug)) = do