uibee 2.8.0 → 2.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/src/components/inputs/shared/colorPickerPopup.js +1 -1
  2. package/dist/src/utils/auth/token.js +7 -2
  3. package/package.json +1 -1
  4. package/src/components/inputs/shared/colorPickerPopup.tsx +1 -1
  5. package/src/utils/auth/token.ts +9 -2
package/dist/src/components/inputs/shared/colorPickerPopup.js CHANGED
@@ -88,7 +88,7 @@ function hsvToHex(h, s, v) {
88
88
  return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
89
89
  }
90
90
  const PRESET_COLORS = [
91
- '#f87171', '#fb923c', '#fbbf24', '#facc15', '#a3e635', '#4ade80', '#34d399', '#2dd4bf',
91
+ '#f87171', '#fd8738', '#fbbf24', '#facc15', '#a3e635', '#4ade80', '#34d399', '#2dd4bf',
92
92
  '#38bdf8', '#60a5fa', '#818cf8', '#a78bfa', '#c084fc', '#e879f9', '#f472b6', '#fb7185'
93
93
  ];
94
94
  function SaturationPicker({ hsv, onChange }) {
package/dist/src/utils/auth/token.js CHANGED
@@ -3,11 +3,13 @@ export default async function AuthToken({ req, frontendURL, redirectPath }) {
3
3
  const url = new URL(req.url);
4
4
  const token = url.searchParams.get('access_token');
5
5
  const btg = url.searchParams.get('btg');
6
+ const redirectCookie = req.cookies.get('redirect_after_login');
7
+ const redirect = redirectCookie ? redirectCookie.value : redirectPath || '/';
6
8
  if (!token) {
7
9
  return NextResponse.json({ error: 'No access token provided' }, { status: 400 });
8
10
  }
9
11
  if (btg) {
10
- return NextResponse.redirect(new URL(redirectPath || '/', frontendURL));
12
+ return NextResponse.redirect(new URL(redirect, frontendURL));
11
13
  }
12
14
  const accessToken = url.searchParams.get('access_token');
13
15
  const userID = url.searchParams.get('id');
@@ -15,12 +17,15 @@ export default async function AuthToken({ req, frontendURL, redirectPath }) {
15
17
  const userNickname = url.searchParams.get('username');
16
18
  const userEmail = url.searchParams.get('email');
17
19
  const userGroups = url.searchParams.get('groups');
18
- const response = NextResponse.redirect(new URL(redirectPath || '/', frontendURL));
20
+ const response = NextResponse.redirect(new URL(redirect, frontendURL));
19
21
  response.cookies.set('access_token', accessToken);
20
22
  response.cookies.set('user_id', userID);
21
23
  response.cookies.set('user_name', username);
22
24
  response.cookies.set('user_nickname', userNickname);
23
25
  response.cookies.set('user_email', userEmail);
24
26
  response.cookies.set('user_groups', userGroups);
27
+ if (redirectCookie) {
28
+ response.cookies.delete('redirect_after_login');
29
+ }
25
30
  return response;
26
31
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "uibee",
3
- "version": "2.8.0",
3
+ "version": "2.8.2",
4
4
  "description": "Shared components, functions and hooks for reuse across Login projects",
5
5
  "homepage": "https://github.com/Login-Linjeforening-for-IT/uibee#readme",
6
6
  "bugs": {
package/src/components/inputs/shared/colorPickerPopup.tsx CHANGED
@@ -70,7 +70,7 @@ function hsvToHex(h: number, s: number, v: number): string {
70
70
  }
71
71
 
72
72
  const PRESET_COLORS: string[] = [
73
- '#f87171', '#fb923c', '#fbbf24', '#facc15', '#a3e635', '#4ade80', '#34d399', '#2dd4bf',
73
+ '#f87171', '#fd8738', '#fbbf24', '#facc15', '#a3e635', '#4ade80', '#34d399', '#2dd4bf',
74
74
  '#38bdf8', '#60a5fa', '#818cf8', '#a78bfa', '#c084fc', '#e879f9', '#f472b6', '#fb7185'
75
75
  ]
76
76
 
package/src/utils/auth/token.ts CHANGED
@@ -5,12 +5,15 @@ export default async function AuthToken({ req, frontendURL, redirectPath }: Auth
5
5
  const url = new URL(req.url)
6
6
  const token = url.searchParams.get('access_token')
7
7
  const btg = url.searchParams.get('btg')
8
+ const redirectCookie = req.cookies.get('redirect_after_login')
9
+ const redirect = redirectCookie ? redirectCookie.value : redirectPath || '/'
10
+
8
11
  if (!token) {
9
12
  return NextResponse.json({ error: 'No access token provided' }, { status: 400 })
10
13
  }
11
14
 
12
15
  if (btg) {
13
- return NextResponse.redirect(new URL(redirectPath || '/', frontendURL))
16
+ return NextResponse.redirect(new URL(redirect, frontendURL))
14
17
  }
15
18
 
16
19
  const accessToken = url.searchParams.get('access_token')!
@@ -20,7 +23,7 @@ export default async function AuthToken({ req, frontendURL, redirectPath }: Auth
20
23
  const userEmail = url.searchParams.get('email')!
21
24
  const userGroups = url.searchParams.get('groups')!
22
25
 
23
- const response = NextResponse.redirect(new URL(redirectPath || '/', frontendURL))
26
+ const response = NextResponse.redirect(new URL(redirect, frontendURL))
24
27
  response.cookies.set('access_token', accessToken)
25
28
  response.cookies.set('user_id', userID)
26
29
  response.cookies.set('user_name', username)
@@ -28,5 +31,9 @@ export default async function AuthToken({ req, frontendURL, redirectPath }: Auth
28
31
  response.cookies.set('user_email', userEmail)
29
32
  response.cookies.set('user_groups', userGroups)
30
33
 
34
+ if (redirectCookie) {
35
+ response.cookies.delete('redirect_after_login')
36
+ }
37
+
31
38
  return response
32
39
  }