feat(unlock-app): NextAuth components #14025

SVell · 2024-06-10T05:45:27Z

Description

This PR aims to bring new components required for NextAuth without any connecting logic

Issues

Fixes #
Refs #

Checklist:

1 PR, 1 purpose: my Pull Request applies to a single purpose
I have commented my code, particularly in hard-to-understand areas
I have updated the docs to reflect my changes if applicable
I have added tests (and stories for frontend components) that prove my fix is effective or that my feature works
I have performed a self-review of my own code
If my code involves visual changes, I am adding applicable screenshots to this thread

Release Note Draft Snippet

julien51 · 2024-06-11T22:24:05Z

screenshots please?

julien51 · 2024-06-12T15:42:30Z

Instead of loading this in the "main" view/UI, can you please do that in a modal since this is auth related?

julien51 · 2024-06-12T15:47:28Z

unlock-app/package.json

@@ -79,6 +81,7 @@
    "typescript": "5.4.5",
    "unified": "11.0.4",
    "validator": "13.12.0",
+    "waas-sdk-ethers": "https://api.developer.coinbase.com/waas/consumer/1994648a1fa8a282f1c3ca917a0379f1f79fbb06/waas-sdk-ethers/waas-sdk-ethers-3.0.0.tgz",


I thought we said you will use our own library here?

julien51 · 2024-06-12T15:50:21Z

unlock-app/src/components/content/ConnectingContent.tsx

+import ConnectingWaas from '../interface/connect/ConnectingWaas'
+import { AppLayout } from '../interface/layouts/AppLayout'
+
+export const ConnectingContent = () => {


Can you rather try to use the same layout as the "login" state?

julien51 · 2024-06-12T15:51:26Z

unlock-app/src/components/interface/connect/ConnectingWaas.tsx

+
+  useEffect(() => {
+    if (!timeoutRef.current) {
+      timeoutRef.current = setTimeout(async () => {


What's the purpose of the timeout here? I assume it should never happen, right?

If connecting takes to much time, we cancel the sign-in process here

Is that happening?

julien51

That's a decent start! Please rebase and implement the changes!

julien51 · 2024-06-12T15:53:26Z

unlock-app/src/components/interface/layouts/AppLayout.tsx

-              },
-            ]}
+            actions={
+              showConnectButton


You would not need to change any of these if you use the same layout for the ConnectingContent view, which I think is what you should do.

julien51 · 2024-06-12T15:54:01Z

unlock-app/src/config/app.ts

@@ -52,6 +52,8 @@ export const config = {
  ethPassApiKey: 'sk_live_h0pHRAZ2E6WTkNIrXvEzbEQN39Ftrp1p',
  walletConnectApiKey: '1535029cc7500ace23802e2e990c58d7', // https://cloud.walletconnect.com/app/project?uuid=7920be27-1e19-43a8-8f7d-cafbb00d4b80
  googleMapsApiKey: 'AIzaSyDp0Y4yQn6WtYEFEgRZg52EiDSgLwxzVMA',
+  googleClientId: process.env.GOOGLE_CLIENT_ID, // https://console.cloud.google.com/apis/dashboard


This should porbably use the NEXT_PUBLIC_ prefix. Please confirm!

Or is it secret as well?

julien51 · 2024-06-12T15:57:11Z

unlock-app/src/services/storageService.ts

+   * @param {*} token
+   * @returns {Promise<*>}
+   */
+  async getUserWaasUuid(emailAddress: string, provider: string, token: string) {


This should npt be in this file. Please add the API calls to openapi.yaml (inside of unlockjs) and then use the generated client.

julien51 · 2024-06-14T14:21:20Z

unlock-app/src/components/interface/connect/ConnectingWaas.tsx

+      <span className="w-full max-w-lg text-base text-gray-700">
+        We are connecting to the Unlock Protocol, please be patient and do not
+        refresh the page.
+      </span>


Suggested change

<span className="w-full max-w-lg text-base text-gray-700">

We are connecting to the Unlock Protocol, please be patient and do not

refresh the page.

</span>

<span className="w-full max-w-lg text-base text-gray-700">

Signing in...

</span>

julien51 · 2024-06-14T14:25:26Z

unlock-app/src/config/app.ts

@@ -52,6 +52,9 @@ export const config = {
  ethPassApiKey: 'sk_live_h0pHRAZ2E6WTkNIrXvEzbEQN39Ftrp1p',
  walletConnectApiKey: '1535029cc7500ace23802e2e990c58d7', // https://cloud.walletconnect.com/app/project?uuid=7920be27-1e19-43a8-8f7d-cafbb00d4b80
  googleMapsApiKey: 'AIzaSyDp0Y4yQn6WtYEFEgRZg52EiDSgLwxzVMA',
+  googleClientId: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID, // https://console.cloud.google.com/apis/dashboard
+  googleClientSecret: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_SECRET, // https://console.cloud.google.com/apis/dashboard


Suggested change

googleClientSecret: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_SECRET, // https://console.cloud.google.com/apis/dashboard

googleClientSecret: process.env.GOOGLE_CLIENT_SECRET, // https://console.cloud.google.com/apis/dashboard

SVell · 2024-06-16T18:46:51Z

https://www.loom.com/share/9ea3ca3cf6364b0db83138695ea2a836

…lock into next-auth-front-start

julien51

One final change

julien51 · 2024-06-20T14:47:15Z

.github/workflows/master.yml

@@ -82,7 +82,7 @@ jobs:
          UNLOCK_APP_VERCEL_STAGING_VERCEL_ORG_ID: op://secrets/vercel/org-id
          UNLOCK_APP_VERCEL_STAGING_VERCEL_TOKEN: op://secrets/vercel/deployment-token
          UNLOCK_APP_VERCEL_STAGING_NEXT_PUBLIC_BASE64_WEDLOCKS_PUBLIC_KEY: op://secrets/wedlocks/public-key
-          UNLOCK_APP_VERCEL_STAGING_NEXTHAUTH_URL: 'https://unlock-protocol.com'
+          UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://unlock-protocol.com'


This would be more accurate?

Suggested change

UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://unlock-protocol.com'

UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://staging-app.unlock-protocol.com'

Also please add to the pull-request.yml and production workflows!

julien51

Let's make sure we set the env correctly!

julien51 · 2024-06-20T14:48:23Z

.github/actions/vercel/action.yml

@@ -23,6 +23,7 @@ secrets:
  NEXT_PUBLIC_ETHPASS_KEY:
    required: false
 env:
+  NEXTAUTH_URL: 'https://unlock-protocol.com'


This is porbabvly not correct?

It needs to be https://app.unlock-protocol.com or https://staging-app.unlock-protocol.com but please pass the value from the workflow that calls this action

julien51

Still not correct

julien51 · 2024-06-20T15:15:45Z

.github/workflows/pull-request.yml

@@ -85,18 +21,9 @@ jobs:
          UNLOCK_APP_VERCEL_STAGING_VERCEL_ORG_ID: op://secrets/vercel/org-id
          UNLOCK_APP_VERCEL_STAGING_VERCEL_TOKEN: op://secrets/vercel/deployment-token
          UNLOCK_APP_VERCEL_STAGING_NEXT_PUBLIC_BASE64_WEDLOCKS_PUBLIC_KEY: op://secrets/wedlocks/public-key
-                    UNLOCK_APP_VERCEL_STAGING_GOOGLE_CLIENT_SECRET: op://secrets/google/staging-secret
+          UNLOCK_APP_VERCEL_STAGING_GOOGLE_CLIENT_SECRET: op://secrets/google/staging-secret
+


Why is there an extra space here?

julien51 · 2024-06-20T16:29:08Z

.github/workflows/production.yml

      - uses: ./.github/actions/vercel
        with:
          service: unlock-app
          target-env: prod
+        env:
+          UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://app.unlock-protocol.com'


This CANNOT be STAGING. Staging is for Master.

Thi needs to be UNLOCK_APP_VERCEL_PROD_...

…lock into next-auth-front-start

Waas new components

31cd2e9

cla-bot bot added the cla-signed label Jun 10, 2024

Session type

61a70f7

SVell marked this pull request as ready for review June 12, 2024 15:38

julien51 reviewed Jun 12, 2024

View reviewed changes

julien51 requested changes Jun 12, 2024

View reviewed changes

SVell added 7 commits June 13, 2024 08:51

Removed linked WAAS

ceffb4e

Merge branch 'master' into next-auth-front-start

bfd20fc

Update WaasProvider.ts

cc10c54

Update WaasProvider.ts

f9c1830

Removed connecting page

8b6558a

Update WaasProvider.ts

bfc5ac8

Keys updated

ce40bda

julien51 reviewed Jun 14, 2024

View reviewed changes

SVell added 10 commits June 14, 2024 18:02

Changes getUserWaas

a174e83

Merge branch 'master' into next-auth-front-start

9a94346

Update yarn.lock

efec41b

Update ConnectingWaas.tsx

05ed8f8

Update ConnectingWaas.tsx

0b20fd8

Update app.ts

6b2fe22

Update WaasProvider.ts

6d22ea3

Update ConnectingWaas.tsx

d7d6dba

Update ConnectingWaas.tsx

afb5fa0

Merge branch 'master' into next-auth-front-start

df07a0f

SVell added 9 commits June 20, 2024 17:03

Update master.yml

99b3444

Update pull-request.yml

82f0269

Update master.yml

11c78cf

Update pull-request.yml

c9dab73

Moved next auth link

7f14513

Update action.yml

94220c4

Merge branch 'master' into next-auth-front-start

6f7619d

Update action.yml

74faff5

Merge branch 'next-auth-front-start' of github.com:unlock-protocol/un…

0112ef7

…lock into next-auth-front-start

julien51 requested changes Jun 20, 2024

View reviewed changes

SVell added 10 commits June 20, 2024 17:51

Update pull-request.yml

4920d81

Passing env

f090a17

Update pull-request.yml

f3503df

Update pull-request.yml

55fa62a

Update pull-request.yml

6307db3

Update

96b5577

Update pull-request.yml

75913bb

Update pull-request.yml

547b64d

Added NextAuth URL

2cbfe0a

Updated links

03d79e5

julien51 requested changes Jun 20, 2024

View reviewed changes

SVell added 6 commits June 20, 2024 23:52

Update production.yml

2bdb3d3

Merge branch 'master' into next-auth-front-start

58a8f03

Spaces

b311170

Spaces fix

bb0015b

Merge branch 'next-auth-front-start' of github.com:unlock-protocol/un…

b831ab0

…lock into next-auth-front-start

Update master.yml

63547d0

julien51 merged commit d7d4e2e into master Jun 20, 2024
13 checks passed

julien51 deleted the next-auth-front-start branch June 20, 2024 21:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(unlock-app): NextAuth components #14025

feat(unlock-app): NextAuth components #14025

SVell commented Jun 10, 2024 •

edited

Loading

julien51 commented Jun 11, 2024

julien51 commented Jun 12, 2024

julien51 Jun 12, 2024

julien51 Jun 12, 2024

julien51 Jun 12, 2024

SVell Jun 12, 2024

julien51 Jun 14, 2024

julien51 left a comment

julien51 Jun 12, 2024

julien51 Jun 12, 2024

julien51 Jun 12, 2024

julien51 Jun 12, 2024

julien51 Jun 14, 2024

julien51 Jun 14, 2024

SVell commented Jun 16, 2024

julien51 left a comment

julien51 Jun 20, 2024

julien51 Jun 20, 2024

julien51 left a comment

julien51 Jun 20, 2024

julien51 left a comment

julien51 Jun 20, 2024

julien51 Jun 20, 2024

	googleClientSecret: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_SECRET, // https://console.cloud.google.com/apis/dashboard
	googleClientSecret: process.env.GOOGLE_CLIENT_SECRET, // https://console.cloud.google.com/apis/dashboard

	UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://unlock-protocol.com'
	UNLOCK_APP_VERCEL_STAGING_NEXTAUTH_URL: 'https://staging-app.unlock-protocol.com'

feat(unlock-app): NextAuth components #14025

feat(unlock-app): NextAuth components #14025

Conversation

SVell commented Jun 10, 2024 • edited Loading

Description

Issues

Checklist:

Release Note Draft Snippet

julien51 commented Jun 11, 2024

julien51 commented Jun 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

julien51 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SVell commented Jun 16, 2024

julien51 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

julien51 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

julien51 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SVell commented Jun 10, 2024 •

edited

Loading