fix: minor convention fixes

SamCaliman · Jul 4, 2024 · 514cb86 · 514cb86
1 parent 68683e6
commit 514cb86
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 42 deletions.
diff --git a/api/.aeria/aeria-sdk.d.ts b/api/.aeria/aeria-sdk.d.ts
@@ -549,9 +549,6 @@ declare type MirrorRouter = {
   },
   "/github/githubAuth": {
     "POST": null
-  },
-  "/user/createGithubUser": {
-    "POST": null
   }
 }
 

diff --git a/api/src/routes/github.ts b/api/src/routes/github.ts
@@ -53,22 +53,19 @@ githubRouter.POST('/githubAuth', async(context)=>{
   })
 
   if(userError){
-    const gitUserId = gitTempUser.id
     const { error: userInsertError, result: userInsertResult } = await context.collections.user.functions.insert({
       what: {
         name: gitTempUser.login,
         active: true,
-        github_id: gitUserId.toString(),
+        github_id: gitTempUser.id.toString(),
         roles: ['root'],
         email: `${gitTempUser.login}@user.github.com`,
       },
     })
     if (userInsertError){
-      return context.error(HTTPStatus.InternalServerError, {code: userInsertError.code})
+      return Result.error(userInsertError)
     }
     return Result.result(await successfulAuthentication(userInsertResult._id, context))
   }
-  if (user){
-    return Result.result(await successfulAuthentication(user._id, context))
-  }
+  return Result.result(await successfulAuthentication(user._id, context))
 })
diff --git a/api/src/routes/index.ts b/api/src/routes/index.ts
@@ -1,6 +1,5 @@
 import { createRouter, Result } from 'aeria'
 import { githubRouter } from './github.js'
-import { userRouter } from './user.js'
 
 export const router = createRouter()
 
@@ -18,4 +17,3 @@ router.GET('/test', async (context) => {
 })
 
 router.group('/github', githubRouter)
-router.group('/user', userRouter)
diff --git a/api/src/routes/user.ts b/api/src/routes/user.ts
diff --git a/web/.aeria-ui/aeria-sdk.d.ts b/web/.aeria-ui/aeria-sdk.d.ts
@@ -549,9 +549,6 @@ declare type MirrorRouter = {
   },
   "/github/githubAuth": {
     "POST": null
-  },
-  "/user/createGithubUser": {
-    "POST": null
   }
 }
 

diff --git a/web/src/pages/dashboard/index.vue b/web/src/pages/dashboard/index.vue
@@ -6,18 +6,8 @@ definePage({
   },
 })
 
-async function githubAuth() {
-  const CLIENT_ID = import.meta.env.VITE_GITHUB_CLIENT_ID
-  console.log(CLIENT_ID)
-  if(CLIENT_ID){
-    window.open(`https://github.com/login/oauth/authorize?client_id=${CLIENT_ID}`)
-  }
-  
-}
-
 </script>
 
 <template>
   <h1>Welcome</h1>
-  <aeria-button @click="githubAuth()">clique</aeria-button>
 </template>
diff --git a/web/src/pages/redirect.vue b/web/src/pages/redirect.vue
@@ -18,14 +18,14 @@ onMounted(async ()=>{
         const {error,result}: Result.Either<EndpointError, SuccessfulAuthentication>= await aeria.github.githubAuth.POST({
             code: gitTempCode
         }) as any
-        console.log(result)
-        if(result){
-          userStore.$actions.setCurrentUser(result)
-          window.open('http://localhost:8080/dashboard', '_self')
-        }
         if(error){
-          window.open('http://localhost:8080/githubAuth')
+          router.push('/githubAuth')
+          //window.open('http://localhost:8080/githubAuth', '_self')
+          return
         }
+        userStore.$actions.setCurrentUser(result)
+        router.push('/dashboard')
+        //window.open('http://localhost:8080/dashboard', '_self')
     }
 })