fix(backend): change teamId to id to match client response expectation

measure-sh · Nov 21, 2023 · 23a268a · 23a268a
1 parent ca45480
commit 23a268a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/measure-backend/measure-go/users.go b/measure-backend/measure-go/users.go
@@ -29,7 +29,7 @@ func (u *User) getTeams() ([]map[string]string, error) {
 			return nil, err
 		}
 
-		team["teamId"] = teamId
+		team["id"] = teamId
 		team["name"] = name
 		team["role"] = role
 		teams = append(teams, team)

diff --git a/measure-web-app/app/auth/callback/github/route.ts b/measure-web-app/app/auth/callback/github/route.ts
@@ -39,7 +39,7 @@ export async function GET(request: Request) {
   }
 
   type Team = {
-    teamId: string,
+    id: string,
     name: string,
     role: string,
   }
@@ -51,5 +51,5 @@ export async function GET(request: Request) {
     return NextResponse.redirect(errRedirectUrl, { status: 302 })
   }
 
-  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.teamId}/overview`, { status: 302 })
+  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.id}/overview`, { status: 302 })
 }
diff --git a/measure-web-app/app/auth/callback/google/route.ts b/measure-web-app/app/auth/callback/google/route.ts
@@ -52,7 +52,7 @@ export async function POST(request: Request) {
   }
 
   type Team = {
-    teamId: string,
+    id: string,
     name: string,
     role: string,
   }
@@ -64,5 +64,5 @@ export async function POST(request: Request) {
     return NextResponse.redirect(errRedirectUrl, { status: 302 })
   }
 
-  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.teamId}/overview`, { status: 302 })
+  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.id}/overview`, { status: 302 })
 }
diff --git a/measure-web-app/app/auth/callback/route.ts b/measure-web-app/app/auth/callback/route.ts
@@ -43,7 +43,7 @@ export async function GET(request: Request) {
   }
 
   type Team = {
-    teamId: string,
+    id: string,
     name: string,
     role: string,
   }
@@ -55,5 +55,5 @@ export async function GET(request: Request) {
     return NextResponse.redirect(errRedirectUrl, { status: 302 })
   }
 
-  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.teamId}/overview`, { status: 302 })
+  return NextResponse.redirect(`${requestUrl.origin}/${ownTeam.id}/overview`, { status: 302 })
 }