OAuth integration #128

matthieusieben · 2024-05-31T18:16:43Z

Running locally:

Run pnpm i && pnpm build && pnpm dev from atproto's feat-oauth-client branch
Copy the "🗼 Ozone service DID" value printed in the outpur
From this branch: NEXT_PUBLIC_PLC_DIRECTORY_URL="http://localhost:2582" NEXT_PUBLIC_SOCIAL_APP_URL="http://localhost:2584" NEXT_PUBLIC_OZONE_SERVICE_DID="<ENTER_COPIED_OZONE_DID_HERE>" y dev
Visit http://127.0.0.1:3000 (make sure to use 127.0.0.1 and not localhost). Alternatively, start a reverse proxy using: ngrok http 3000 and visit the proxy's URL instead

render · 2024-05-31T18:16:46Z

Your Render PR Server URL is https://ozone-staging-pr-128.onrender.com.

Follow its progress at https://dashboard.render.com/web/srv-cpd183e74orc73bh2210.

render · 2024-05-31T18:16:48Z

Your Render PR Server URL is https://ozone-sandbox-pr-128.onrender.com.

Follow its progress at https://dashboard.render.com/web/srv-cpd183u74orc73bh2270.

foysalit

Leaving some comments after reviewing nearly 60% of the changes. Will do another pass once you get the rebased changes in.
Again, apologies for the huge conflict you're handling right now and LMK if I can help!

package.json

lib/util.ts

lib/clsx.ts

app/actions/ModActionPanel/QuickAction.tsx

app/oauth-client.json/route.ts

foysalit

wow this is a massive piece of work! thank you for powering through the conflict resolution and it looks quite good. left some comments and questions but nothing major popped out.

would love to get an extra pair of eyes from @devinivy and then do some testing with our mod team before creating a distro with this so let's hold on to merging until we get a distro out this week. will come back and approve once that's done.

app/actions/ModActionPanel/QuickAction.tsx

components/shell/ConfigurationContext.tsx

app/layout.tsx

app/repositories/[id]/[...record]/page-content.tsx

app/subject-status/page.tsx

components/config/server-config.tsx

components/list/Lists.tsx

components/mod-event/ItemTitle.tsx

components/shell/AuthContext.tsx

components/shell/ExternalLabelersContext.tsx

foysalit

Great work!

🐛 Add explicit resolution to avoid cypress install error 🐛 Fix yarn.lock issue ✅ Fix tests ✨ Replace deprecated BskyAgent 🚧 Fixing e2e suite ✅ Specify handle resolver url

Co-authored-by: devin ivy <[email protected]>

foysalit · 2024-09-02T14:48:51Z

lib/client-config.ts

@@ -9,10 +9,16 @@ export async function getConfig(): Promise<OzoneConfig> {
  if (labelerDid) {
    doc = await resolveDidDocData(labelerDid)
    const labelerUrl = doc && getServiceUrlFromDoc(doc, 'atproto_labeler')
-    if (labelerUrl) {
-      meta = await getOzoneMeta(labelerUrl)
+    if (process.env.NODE_ENV === 'development' && doc && labelerUrl) {


doesn't existence of labelerUrl imply that doc exists? not clear why we need to check for && doc here too?

This is solely for the purpose of making this work with yarn dev

with dev-env from atproto, there is no .well-known file, so the getOzoneMeta results in a 404.

I'm open to any other solution for this :-)

foysalit · 2024-09-02T14:59:42Z

lib/constants.ts

 export const PLC_DIRECTORY_URL =
-  process.env.NEXT_PUBLIC_PLC_DIRECTORY_URL || `https://plc.directory`
+  process.env.NEXT_PUBLIC_PLC_DIRECTORY_URL ||
+  (process.env.NODE_ENV === 'development'


I am not sure if hardcoding these based on NODE_ENV is very useful. next.js easily picks up local .env files and that also makes it quite easy to easily change these locally without having to change code.

to add more context, it makes total sense that when developing locally, we'd want to point to local atproto dev env but often, I point at staging or production to check UI things which is adds extra step when committing changes etc. so, this is more of a devex consideration.

I added this so that it works with yarn dev without any additional .env file whatsoever. I am happy to remove this if that breaks your flow.

* 🐛 Allow Only/Exclude/Indifferent filters for appeal status * 🐛 Fix page title * Line up logic with surrounding code Co-authored-by: devin ivy <[email protected]> --------- Co-authored-by: devin ivy <[email protected]>

matthieusieben force-pushed the oauth-matthieu branch 6 times, most recently from 461371b to 9323aac Compare June 16, 2024 10:55

matthieusieben force-pushed the oauth-matthieu branch from ad13d2e to ca825f2 Compare July 1, 2024 07:49

foysalit reviewed Jul 1, 2024

View reviewed changes

feat(login): login using oauth

76026e3

matthieusieben force-pushed the oauth-matthieu branch from ca825f2 to 76026e3 Compare July 1, 2024 18:08

matthieusieben added 4 commits July 2, 2024 14:10

Various fixes linked to oauth

cf37682

style: various minor updates

ed59541

fix(external-labelers): avoid un-necessary invalidation of queries

2b07e2b

tidy

93102bb

foysalit reviewed Jul 8, 2024

View reviewed changes

matthieusieben added 2 commits July 9, 2024 10:41

fix(oauth): adapt to latest client changes

72196d3

feat(tabs): expose current view

b24adb2

matthieusieben force-pushed the oauth-matthieu branch from 927b2d2 to b24adb2 Compare July 9, 2024 09:06

matthieusieben added 3 commits July 9, 2024 13:34

Merge remote-tracking branch 'origin/main' into oauth-matthieu

a6e51d0

fix: external labelers

99f27ce

improve init time

a52ee6f

foysalit approved these changes Jul 10, 2024

View reviewed changes

matthieusieben and others added 6 commits July 10, 2024 11:28

fix(repositories): list profiles using labeler instead of PDS

b3be988

style: remove un-necessary "encoding" param from api calls

7059cf2

fix: rename import from @atproto/api

64ed75c

:rightwards_twisted_arrows: Merge with upstream

a6966a5

🐛 Adjust for new oauth and atproto api package changes

7cae67c

🐛 Add explicit resolution to avoid cypress install error 🐛 Fix yarn.lock issue ✅ Fix tests ✨ Replace deprecated BskyAgent 🚧 Fixing e2e suite ✅ Specify handle resolver url

✅ Add manual wait

82594d8

Update cypress/support/api.ts

b97202d

Co-authored-by: devin ivy <[email protected]>

arcalinea temporarily deployed to oauth-matthieu - ozone-staging PR #128 August 30, 2024 12:46 — with Render Destroyed

add missing NEXT_PUBLIC_HANDLE_RESOLVER_URL in env config

c45e715

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 12:47 — with Render Failure

update dep

d8e8d28

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 12:50 — with Render Failure

code cleanup

7a3934d

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 13:05 — with Render Failure

restore default OZONE_PUBLIC_URL for dev mode

1e718b2

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 13:22 — with Render Failure

remove dev OZONE_PUBLIC_URL

d3944a4

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 13:46 — with Render Failure

fix local dev (yarn dev)

82fa7df

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 14:21 — with Render Failure

Add compatibility with legacy credentials

1e8d436

arcalinea had a problem deploying to oauth-matthieu - ozone-staging PR #128 August 30, 2024 14:25 — with Render Failure

adapt to main merge

b5dfbcd

arcalinea deployed to oauth-matthieu - ozone-staging PR #128 September 2, 2024 15:06 — with Render View deployment

foysalit approved these changes Sep 2, 2024

View reviewed changes

✅ Set correct fixture

83243e8

arcalinea deployed to oauth-matthieu - ozone-staging PR #128 September 2, 2024 17:01 — with Render View deployment

✅ set cypress env vars for github ci

9c51f6a

arcalinea deployed to oauth-matthieu - ozone-staging PR #128 September 2, 2024 18:11 — with Render View deployment

arcalinea deployed to oauth-matthieu - ozone-staging PR #128 September 3, 2024 14:26 — with Render View deployment

Merge remote-tracking branch 'origin/main' into oauth-matthieu

b9e8fd8

arcalinea temporarily deployed to oauth-matthieu - ozone-staging PR #128 September 3, 2024 14:39 — with Render Destroyed

matthieusieben merged commit 77a3c9b into main Sep 3, 2024
2 of 3 checks passed

matthieusieben deleted the oauth-matthieu branch September 3, 2024 14:40

matthieusieben mentioned this pull request Sep 3, 2024

OAuth login #173

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OAuth integration #128

OAuth integration #128

matthieusieben commented May 31, 2024 •

edited

Loading

render bot commented May 31, 2024

render bot commented May 31, 2024

foysalit left a comment

foysalit left a comment

foysalit left a comment

foysalit Sep 2, 2024

matthieusieben Sep 2, 2024

matthieusieben Sep 2, 2024

foysalit Sep 2, 2024

foysalit Sep 2, 2024

matthieusieben Sep 2, 2024

OAuth integration #128

OAuth integration #128

Conversation

matthieusieben commented May 31, 2024 • edited Loading

render bot commented May 31, 2024

render bot commented May 31, 2024

foysalit left a comment

Choose a reason for hiding this comment

foysalit left a comment

Choose a reason for hiding this comment

foysalit left a comment

Choose a reason for hiding this comment

foysalit Sep 2, 2024

Choose a reason for hiding this comment

matthieusieben Sep 2, 2024

Choose a reason for hiding this comment

matthieusieben Sep 2, 2024

Choose a reason for hiding this comment

foysalit Sep 2, 2024

Choose a reason for hiding this comment

foysalit Sep 2, 2024

Choose a reason for hiding this comment

matthieusieben Sep 2, 2024

Choose a reason for hiding this comment

matthieusieben commented May 31, 2024 •

edited

Loading