Pass the whole app to db2sdk

code-asher · code-asher · commit cbefdb2b4397 · 2024-02-08T18:24:13.000-09:00
diff --git a/enterprise/coderd/oauth2.go b/enterprise/coderd/oauth2.go
@@ -77,16 +77,11 @@ func (api *API) oAuth2ProviderApps(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var dbApps []database.OAuth2ProviderApp
+	var sdkApps []codersdk.OAuth2ProviderApp
 	for _, app := range userApps {
-		dbApps = append(dbApps, database.OAuth2ProviderApp{
-			ID:          app.OAuth2ProviderApp.ID,
-			Name:        app.OAuth2ProviderApp.Name,
-			CallbackURL: app.OAuth2ProviderApp.CallbackURL,
-			Icon:        app.OAuth2ProviderApp.Icon,
-		})
+		sdkApps = append(sdkApps, db2sdk.OAuth2ProviderApp(api.AccessURL, app.OAuth2ProviderApp))
 	}
-	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.OAuth2ProviderApps(api.AccessURL, dbApps))
+	httpapi.Write(ctx, rw, http.StatusOK, sdkApps)
 }
 
 // @Summary Get OAuth2 application.

Original file line number	Diff line number	Diff line change
`@@ -77,16 +77,11 @@ func (api API) oAuth2ProviderApps(rw http.ResponseWriter, r http.Request) {`
`77`	`77`	`return`
`78`	`78`	`}`
`79`	`79`
`80`		`- var dbApps []database.OAuth2ProviderApp`
	`80`	`+ var sdkApps []codersdk.OAuth2ProviderApp`
`81`	`81`	`for _, app := range userApps {`
`82`		`- dbApps = append(dbApps, database.OAuth2ProviderApp{`
`83`		`- ID: app.OAuth2ProviderApp.ID,`
`84`		`- Name: app.OAuth2ProviderApp.Name,`
`85`		`- CallbackURL: app.OAuth2ProviderApp.CallbackURL,`
`86`		`- Icon: app.OAuth2ProviderApp.Icon,`
`87`		`- })`
	`82`	`+ sdkApps = append(sdkApps, db2sdk.OAuth2ProviderApp(api.AccessURL, app.OAuth2ProviderApp))`
`88`	`83`	`}`
`89`		`- httpapi.Write(ctx, rw, http.StatusOK, db2sdk.OAuth2ProviderApps(api.AccessURL, dbApps))`
	`84`	`+ httpapi.Write(ctx, rw, http.StatusOK, sdkApps)`
`90`	`85`	`}`
`91`	`86`
`92`	`87`	`// @Summary Get OAuth2 application.`