@wix/astro 1.0.22 → 1.0.23
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.
|
@@ -14,14 +14,17 @@ var loginSearchParams = object({
|
|
|
14
14
|
prompt: _enum(["login", "none"]).optional(),
|
|
15
15
|
returnToUrl: string().optional()
|
|
16
16
|
});
|
|
17
|
-
var GET = async ({ url }) => {
|
|
17
|
+
var GET = async ({ request, url }) => {
|
|
18
18
|
const { prompt, returnToUrl = "/" } = loginSearchParams.parse(
|
|
19
19
|
Object.fromEntries(url.searchParams.entries())
|
|
20
20
|
);
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
const callbackUrl = new URL("/api/auth/callback", url);
|
|
22
|
+
const referer = request.headers.get("referer");
|
|
23
|
+
if (referer != null) {
|
|
24
|
+
const originalUrl = new URL(referer);
|
|
25
|
+
callbackUrl.protocol = originalUrl.protocol;
|
|
26
|
+
}
|
|
27
|
+
const oauthData = auth.generateOAuthData(callbackUrl.toString(), returnToUrl);
|
|
25
28
|
const { authUrl } = await auth.getAuthUrl(oauthData, {
|
|
26
29
|
prompt,
|
|
27
30
|
responseMode: "query"
|
|
@@ -18,6 +18,11 @@ var POST = async ({ redirect, request, url }) => {
|
|
|
18
18
|
);
|
|
19
19
|
const baseUrl = `${new URL(request.url).origin}/${import.meta.env.BASE_URL}`;
|
|
20
20
|
const postFlowUrl = new URL("/api/auth/logout-callback", baseUrl);
|
|
21
|
+
const referer = request.headers.get("referer");
|
|
22
|
+
if (referer != null) {
|
|
23
|
+
const originalUrl = new URL(referer);
|
|
24
|
+
postFlowUrl.protocol = originalUrl.protocol;
|
|
25
|
+
}
|
|
21
26
|
postFlowUrl.searchParams.set(returnToQueryParamName, returnToUrl);
|
|
22
27
|
const { logoutUrl } = await auth.logout(postFlowUrl.toString());
|
|
23
28
|
return redirect(logoutUrl);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wix/astro",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.23",
|
|
4
4
|
"devDependencies": {
|
|
5
5
|
"@wix/dashboard": "^1.3.35",
|
|
6
6
|
"@wix/essentials": "^0.1.23",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
]
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
|
-
"falconPackageHash": "
|
|
51
|
+
"falconPackageHash": "5741caa5bbdd4030f672591a362f5f6d5cfc52902d127c7833873141"
|
|
52
52
|
}
|
package/src/routes/auth/login.ts
CHANGED
|
@@ -8,15 +8,20 @@ const loginSearchParams = z.object({
|
|
|
8
8
|
returnToUrl: z.string().optional(),
|
|
9
9
|
});
|
|
10
10
|
|
|
11
|
-
export const GET: APIRoute = async ({ url }) => {
|
|
11
|
+
export const GET: APIRoute = async ({ request, url }) => {
|
|
12
12
|
const { prompt, returnToUrl = '/' } = loginSearchParams.parse(
|
|
13
13
|
Object.fromEntries(url.searchParams.entries())
|
|
14
14
|
);
|
|
15
15
|
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
)
|
|
16
|
+
const callbackUrl = new URL('/api/auth/callback', url);
|
|
17
|
+
const referer = request.headers.get('referer');
|
|
18
|
+
|
|
19
|
+
if (referer != null) {
|
|
20
|
+
const originalUrl = new URL(referer);
|
|
21
|
+
callbackUrl.protocol = originalUrl.protocol;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const oauthData = auth.generateOAuthData(callbackUrl.toString(), returnToUrl);
|
|
20
25
|
|
|
21
26
|
const { authUrl } = await auth.getAuthUrl(oauthData, {
|
|
22
27
|
prompt,
|
|
@@ -13,6 +13,13 @@ export const POST: APIRoute = async ({ redirect, request, url }) => {
|
|
|
13
13
|
);
|
|
14
14
|
const baseUrl = `${new URL(request.url).origin}/${import.meta.env.BASE_URL}`;
|
|
15
15
|
const postFlowUrl = new URL('/api/auth/logout-callback', baseUrl);
|
|
16
|
+
const referer = request.headers.get('referer');
|
|
17
|
+
|
|
18
|
+
if (referer != null) {
|
|
19
|
+
const originalUrl = new URL(referer);
|
|
20
|
+
postFlowUrl.protocol = originalUrl.protocol;
|
|
21
|
+
}
|
|
22
|
+
|
|
16
23
|
postFlowUrl.searchParams.set(returnToQueryParamName, returnToUrl);
|
|
17
24
|
|
|
18
25
|
const { logoutUrl } = await auth.logout(postFlowUrl.toString());
|