feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimkl merged 4 commits into from
Aug 4, 2023
Merged

feat(remix,backend): Repo level config for remix #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d04cde9
feat(remix,backend): Repo level config for remix
desiprisg Jul 11, 2023
e8a88a2
fix(remix): Add ClerkState missing types
desiprisg Jul 11, 2023
2046d45
test(backend,remix): Update tests
desiprisg Jul 12, 2023
172838b
chore(repo): Changeset
desiprisg Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nine-peas-care.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.
5 changes: 5 additions & 0 deletions .changeset/wicked-schools-tell.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.
48 changes: 45 additions & 3 deletions packages/backend/src/tokens/authStatus.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
isSatellite: boolean;
domain: string;
signInUrl: string;
signUpUrl: string;
afterSignInUrl: string;
afterSignUpUrl: string;
isSignedIn: true;
isInterstitial: false;
isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
isSatellite: boolean;
domain: string;
signInUrl: string;
signUpUrl: string;
afterSignInUrl: string;
afterSignUpUrl: string;
isSignedIn: false;
isInterstitial: false;
isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
loadUser,
loadOrganization,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
} = options as any;

const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
domain,
isSatellite,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
isSignedIn: true,
isInterstitial: false,
isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
const {
frontendApi,
publishableKey,
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
} = options as any;

return {
status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
isSatellite,
domain,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
isSignedIn: false,
isInterstitial: false,
isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
const {
frontendApi,
publishableKey,
proxyUrl,
isSatellite,
domain,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
} = options as any;
return {
status: AuthStatus.Interstitial,
reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
domain,
proxyUrl,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
isSignedIn: false,
isInterstitial: true,
isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
options as any;
return {
status: AuthStatus.Unknown,
reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
isSatellite,
domain,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
isSignedIn: false,
isInterstitial: false,
isUnknown: true,
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/tokens/request.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
isUnknown: false,
isSatellite: false,
signInUrl: '',
signUpUrl: '',
afterSignInUrl: '',
afterSignUpUrl: '',
domain: '',
message: '',
toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
isUnknown: false,
isSatellite: false,
signInUrl: '',
signUpUrl: '',
afterSignInUrl: '',
afterSignUpUrl: '',
domain: '',
toAuth: {},
...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
isUnknown: true,
isSatellite: false,
signInUrl: '',
signUpUrl: '',
afterSignInUrl: '',
afterSignUpUrl: '',
domain: '',
reason,
toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
isUnknown: false,
isSatellite: false,
signInUrl: '',
signUpUrl: '',
afterSignInUrl: '',
afterSignUpUrl: '',
domain: '',
...expectedState,
});
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
skipJwksCache: true,
isSatellite: false,
signInUrl: '',
signUpUrl: '',
afterSignInUrl: '',
afterSignUpUrl: '',
domain: '',
searchParams: new URLSearchParams(),
} satisfies AuthenticateRequestOptions;
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/tokens/request.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
* @experimental
*/
signInUrl?: string;
signUpUrl?: string;
afterSignInUrl?: string;
afterSignUpUrl?: string;
request?: Request;
};

Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
} as any as NextClerkProviderProps;
} as unknown as NextClerkProviderProps;
};
6 changes: 6 additions & 0 deletions packages/remix/src/client/RemixClerkProvider.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
__isSatellite,
__clerk_debug,
__signInUrl,
__signUpUrl,
__afterSignInUrl,
__afterSignUpUrl,
__clerkJSUrl,
__clerkJSVersion,
} = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
domain={__domain as any}
isSatellite={__isSatellite}
signInUrl={__signInUrl}
signUpUrl={__signUpUrl}
afterSignInUrl={__afterSignInUrl}
afterSignUpUrl={__afterSignUpUrl}
clerkJSUrl={__clerkJSUrl}
clerkJSVersion={__clerkJSVersion}
{...restProps}
Expand Down
3 changes: 3 additions & 0 deletions packages/remix/src/client/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
__domain: string | undefined;
__isSatellite: boolean;
__signInUrl: string | undefined;
__signUpUrl: string | undefined;
__afterSignInUrl: string | undefined;
__afterSignUpUrl: string | undefined;
__clerk_debug: any;
__clerkJSUrl: string | undefined;
__clerkJSVersion: string | undefined;
Expand Down
18 changes: 18 additions & 0 deletions packages/remix/src/ssr/authenticateRequest.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
const signInUrl =
opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

const signUpUrl =
opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

const afterSignInUrl =
opts.afterSignInUrl ||
getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
(context?.CLERK_AFTER_SIGN_IN_URL as string) ||
'';

const afterSignUpUrl =
opts.afterSignUpUrl ||
getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
(context?.CLERK_AFTER_SIGN_UP_URL as string) ||
'';

@dimkldimklJul 13, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?

@desiprisgdesiprisgJul 17, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.

@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy


if (isSatellite && !proxyUrl && !domain) {
throw new Error(satelliteAndMissingProxyUrlAndDomain);
}
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
isSatellite,
domain,
signInUrl,
signUpUrl,
afterSignInUrl,
afterSignUpUrl,
request,
});
}
3 changes: 3 additions & 0 deletions packages/remix/src/ssr/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
loadOrganization?: boolean;
authorizedParties?: [];
signInUrl?: string;
signUpUrl?: string;
afterSignInUrl?: string;
afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
MultiDomainAndOrProxy;

Expand Down
3 changes: 3 additions & 0 deletions packages/remix/src/ssr/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
__domain: requestState.domain,
__isSatellite: requestState.isSatellite,
__signInUrl: requestState.signInUrl,
__signUpUrl: requestState.signUpUrl,
__afterSignInUrl: requestState.afterSignInUrl,
__afterSignUpUrl: requestState.afterSignUpUrl,
__clerk_debug: debugRequestState(requestState),
__clerkJSUrl: getEnvVariable('CLERK_JS'),
__clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(remix,backend): Repo level config for remix#1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 4 commits into

from

Aug 4, 2023
 Merged


feat(remix,backend): Repo level config for remix
#1470
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d04cde9

feat(remix,backend): Repo level config for remix


desiprisg Jul 11, 2023
e8a88a2

fix(remix): Add ClerkState missing types


desiprisg Jul 11, 2023
2046d45

test(backend,remix): Update tests


desiprisg Jul 12, 2023
172838b

chore(repo): Changeset


desiprisg Jul 12, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/nine-peas-care.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': minor
---

Configure sign in/up and afterSignIn/Up paths for remix via env variables.

5 changes: 5 additions & 0 deletions
.changeset/wicked-schools-tell.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Include `signUpUrl`, `afterSignInUrl` and `afterSignUpUrl` to `authenticateRequest` options.

48 changes: 45 additions & 3 deletions
packages/backend/src/tokens/authStatus.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,9 @@ export type SignedInState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: true;
 isInterstitial: false;
 isUnknown: false;
Expand All@@ -38,6 +41,9 @@ export type SignedOutState = {
 isSatellite: boolean;
 domain: string;
 signInUrl: string;
 signUpUrl: string;
 afterSignInUrl: string;
 afterSignUpUrl: string;
 isSignedIn: false;
 isInterstitial: false;
 isUnknown: false;
Expand DownExpand Up@@ -94,6 +100,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 loadUser,
 loadOrganization,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 const { sid: sessionId, org_id: orgId, sub: userId } = sessionClaims;
Expand DownExpand Up@@ -143,6 +152,9 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
 domain,
 isSatellite,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: true,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -151,7 +163,17 @@ export async function signedIn<T>(options: T, sessionClaims: JwtPayload): Promis
}

export function signedOut<T>(options: T, reason: AuthReason, message = ''): SignedOutState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;

 return {
 status: AuthStatus.SignedOut,
Expand All@@ -163,6 +185,9 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: false,
Expand All@@ -171,7 +196,17 @@ export function signedOut<T>(options: T, reason: AuthReason, message = ''): Sign
}

export function interstitial<T>(options: T, reason: AuthReason, message = ''): InterstitialState {
 const { frontendApi, publishableKey, proxyUrl, isSatellite, domain, signInUrl } = options as any;
 const {
 frontendApi,
 publishableKey,
 proxyUrl,
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 } = options as any;
 return {
 status: AuthStatus.Interstitial,
 reason,
Expand All@@ -182,6 +217,9 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
 domain,
 proxyUrl,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: true,
 isUnknown: false,
Expand All@@ -190,7 +228,8 @@ export function interstitial<T>(options: T, reason: AuthReason, message = ''): I
}

export function unknownState<T>(options: T, reason: AuthReason, message = ''): UnknownState {
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl } = options as any;
 const { frontendApi, publishableKey, isSatellite, domain, signInUrl, signUpUrl, afterSignInUrl, afterSignUpUrl } =
 options as any;
 return {
 status: AuthStatus.Unknown,
 reason,
Expand All@@ -200,6 +239,9 @@ export function unknownState<T>(options: T, reason: AuthReason, message = ''): U
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 isSignedIn: false,
 isInterstitial: false,
 isUnknown: true,
Expand Down

15 changes: 15 additions & 0 deletions
packages/backend/src/tokens/request.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ function assertSignedOut(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 message: '',
 toAuth: {},
Expand DownExpand Up@@ -72,6 +75,9 @@ function assertInterstitial(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 toAuth: {},
 ...expectedState,
Expand All@@ -88,6 +94,9 @@ function assertUnknown(assert, requestState: RequestState, reason: AuthReason) {
 isUnknown: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 reason,
 toAuth: {},
Expand DownExpand Up@@ -128,6 +137,9 @@ function assertSignedIn(
 isUnknown: false,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 ...expectedState,
 });
Expand All@@ -150,6 +162,9 @@ export default (QUnit: QUnit) => {
 skipJwksCache: true,
 isSatellite: false,
 signInUrl: '',
 signUpUrl: '',
 afterSignInUrl: '',
 afterSignUpUrl: '',
 domain: '',
 searchParams: new URLSearchParams(),
 } satisfies AuthenticateRequestOptions;
Expand Down

3 changes: 3 additions & 0 deletions
packages/backend/src/tokens/request.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,9 @@ export type AuthenticateRequestOptions = OptionalVerifyTokenOptions &
 * @experimental
 */
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
 request?: Request;
 };

Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,5 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
 signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
 afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
 afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
 } as any as NextClerkProviderProps;
 } as unknown as NextClerkProviderProps;
};

6 changes: 6 additions & 0 deletions
packages/remix/src/client/RemixClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 __isSatellite,
 __clerk_debug,
 __signInUrl,
 __signUpUrl,
 __afterSignInUrl,
 __afterSignUpUrl,
 __clerkJSUrl,
 __clerkJSVersion,
 } = clerkState?.__internal_clerk_state || {};
Expand All@@ -68,6 +71,9 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
 domain={__domain as any}
 isSatellite={__isSatellite}
 signInUrl={__signInUrl}
 signUpUrl={__signUpUrl}
 afterSignInUrl={__afterSignInUrl}
 afterSignUpUrl={__afterSignUpUrl}
 clerkJSUrl={__clerkJSUrl}
 clerkJSVersion={__clerkJSVersion}
 {...restProps}
Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/client/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,9 @@ export type ClerkState = {
 __domain: string | undefined;
 __isSatellite: boolean;
 __signInUrl: string | undefined;
 __signUpUrl: string | undefined;
 __afterSignInUrl: string | undefined;
 __afterSignUpUrl: string | undefined;
 __clerk_debug: any;
 __clerkJSUrl: string | undefined;
 __clerkJSVersion: string | undefined;
Expand Down

18 changes: 18 additions & 0 deletions
packages/remix/src/ssr/authenticateRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,21 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 const signInUrl =
 opts.signInUrl || getEnvVariable('CLERK_SIGN_IN_URL') || (context?.CLERK_SIGN_IN_URL as string) || '';

 const signUpUrl =
 opts.signUpUrl || getEnvVariable('CLERK_SIGN_UP_URL') || (context?.CLERK_SIGN_UP_URL as string) || '';

 const afterSignInUrl =
 opts.afterSignInUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_IN_URL') ||
 (context?.CLERK_AFTER_SIGN_IN_URL as string) ||
 '';

 const afterSignUpUrl =
 opts.afterSignUpUrl ||
 getEnvVariable('CLERK_AFTER_SIGN_UP_URL') ||
 (context?.CLERK_AFTER_SIGN_UP_URL as string) ||
 '';
@dimkldimklJul 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☁️ If we had a centralized config object, probably this (and the 3 following added lines) would have been the change to support the Repo level config for remix. Right?
@desiprisgdesiprisgJul 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd also have to include the options in authenticateRequest.
@nikosdouvlisnikosdouvlisAug 2, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimkl That is correct. We need to bring this up again now that we have 2 packages using repo-level config otherwise, this will become unwieldy

 if (isSatellite && !proxyUrl && !domain) {
 throw new Error(satelliteAndMissingProxyUrlAndDomain);
 }
Expand All@@ -96,6 +111,9 @@ export function authenticateRequest(args: LoaderFunctionArgs, opts: RootAuthLoad
 isSatellite,
 domain,
 signInUrl,
 signUpUrl,
 afterSignInUrl,
 afterSignUpUrl,
 request,
 });
}

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,9 @@ export type RootAuthLoaderOptions = {
 loadOrganization?: boolean;
 authorizedParties?: [];
 signInUrl?: string;
 signUpUrl?: string;
 afterSignInUrl?: string;
 afterSignUpUrl?: string;
} & Pick<VerifyTokenOptions, 'audience'> &
 MultiDomainAndOrProxy;

Expand Down

3 changes: 3 additions & 0 deletions
packages/remix/src/ssr/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,9 @@ export const injectRequestStateIntoResponse = async (response: Response, request
 __domain: requestState.domain,
 __isSatellite: requestState.isSatellite,
 __signInUrl: requestState.signInUrl,
 __signUpUrl: requestState.signUpUrl,
 __afterSignInUrl: requestState.afterSignInUrl,
 __afterSignUpUrl: requestState.afterSignUpUrl,
 __clerk_debug: debugRequestState(requestState),
 __clerkJSUrl: getEnvVariable('CLERK_JS'),
 __clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
Expand Down