fix(oauth): ensure correct redirect page after login

userstyles-world · Jul 24, 2021 · e0514d9 · e0514d9
1 parent 9df31a2
commit e0514d9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/typescript/main.ts b/typescript/main.ts
@@ -1,4 +1,6 @@
-import {changeEntriesBehavior} from 'page/modlog';
+import {checkRedirect} from './page/account';
+import {saveRedirect} from './page/login';
+import {changeEntriesBehavior} from './page/modlog';
 import {InitalizeColorScheme as initalizeColorScheme} from './color-scheme';
 import {ShareButton} from './share-button';
 import {BroadcastReady} from './third-party';
@@ -36,6 +38,12 @@ function pageSpecificFunctions(settings: UserSettings) {
         case '/modlog':
             changeEntriesBehavior(settings.entriesBehavior);
             break;
+        case '/login':
+            saveRedirect();
+            break;
+        case '/account':
+            checkRedirect(settings.redirect);
+            break;
     }
 }
 

diff --git a/typescript/page/account.ts b/typescript/page/account.ts
@@ -0,0 +1,8 @@
+import {storeNewSettings} from 'utils/storage';
+
+export function checkRedirect(redirect: string) {
+    if (redirect) {
+        storeNewSettings({redirect: ''});
+        window.location.href = window.location.origin + redirect;
+    }
+}
diff --git a/typescript/page/login.ts b/typescript/page/login.ts
@@ -0,0 +1,8 @@
+import {storeNewSettings} from 'utils/storage';
+
+export function saveRedirect() {
+    const redirect = new URLSearchParams(location.search).get('r');
+    if (redirect) {
+        storeNewSettings({redirect});
+    }
+}
diff --git a/typescript/utils/storage.ts b/typescript/utils/storage.ts
@@ -1,11 +1,13 @@
 export interface UserSettings {
     colorScheme: 'dark' | 'light' | 'follow-system';
     entriesBehavior: 'hover' | 'click' | 'no-hide';
+    redirect: string;
 }
 
 const DEFAULT_SETTINGS: UserSettings = {
     colorScheme: 'follow-system',
     entriesBehavior: 'click',
+    redirect: '',
 };
 
 const localStorageKey = 'user-preferences';