Merge pull request #468 from bobbyrullo/remove_apis

Remove old client_resource api

cmd/dexctl/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"net/http"
 	"os"
 	"strings"
 
@@ -44,7 +43,6 @@ var (
 	}
 
 	global struct {
-		endpoint string
 		creds    oidc.ClientCredentials
 		dbURL    string
 		help     bool
@@ -55,9 +53,6 @@ var (
 func init() {
 	log.EnableTimestamps()
 
-	rootCmd.PersistentFlags().StringVar(&global.endpoint, "endpoint", "", "URL of dex API")
-	rootCmd.PersistentFlags().StringVar(&global.creds.ID, "client-id", "", "dex API user ID")
-	rootCmd.PersistentFlags().StringVar(&global.creds.Secret, "client-secret", "", "dex API user password")
 	rootCmd.PersistentFlags().StringVar(&global.dbURL, "db-url", "", "DSN-formatted database connection string")
 	rootCmd.PersistentFlags().BoolVar(&global.logDebug, "log-debug", false, "Log debug-level information")
 }
@@ -79,19 +74,8 @@ func getDriver() (drv driver) {
 	switch {
 	case len(global.dbURL) > 0:
 		drv, err = newDBDriver(global.dbURL)
-	case len(global.endpoint) > 0:
-		if len(global.creds.ID) == 0 || len(global.creds.Secret) == 0 {
-			err = errors.New("--client-id/--client-secret flags unset")
-			break
-		}
-		pcfg, err := oidc.FetchProviderConfig(http.DefaultClient, global.endpoint)
-		if err != nil {
-			stderr("Unable to fetch provider config: %v", err)
-			os.Exit(1)
-		}
-		drv, err = newAPIDriver(pcfg, global.creds)
 	default:
-		err = errors.New("--endpoint/--db-url flags unset")
+		err = errors.New("--db-url flag unset")
 	}
 
 	if err != nil {

schema/adminschema/mapper_test.go

@@ -48,7 +48,7 @@ func TestMapSchemaClientToClient(t *testing.T) {
 				Id:     "123",
 				Secret: "sec_123",
 				RedirectURIs: []string{
-					"ht.d://p * * *",
+					"",
 				},
 			},
 			wantErr: true,

schema/adminschema/v1-json.go

@@ -1,4 +1,5 @@
 package adminschema
+
 //
 // This file is automatically generated by schema/generator
 //
@@ -236,4 +237,4 @@ const DiscoveryJSON = `{
   }
 }
 
-`
+`

schema/generator

@@ -73,3 +73,5 @@ GOPATH=${PWD}/gopath ./bin/google-api-go-generator \
 
 # Finally, fix the import in the bindings to refer to the vendored google-api package
 goimports -w ${GEN}
+
+gofmt -w schema/${GOPKG}

schema/workerschema/README.md

@@ -8,46 +8,6 @@ __Version:__ v1
 ## Models
 
 
-### Client
-
-
-
-```
-{
-    id: string,
-    redirectURIs: [
-        string
-    ]
-}
-```
-
-### ClientPage
-
-
-
-```
-{
-    clients: [
-        Client
-    ],
-    nextPageToken: string
-}
-```
-
-### ClientWithSecret
-
-
-
-```
-{
-    id: string,
-    redirectURIs: [
-        string
-    ],
-    secret: string
-}
-```
-
 ### Error
 
 
@@ -232,8 +192,8 @@ A client with associated public metadata.
 
 > |Name|Located in|Description|Required|Type|
 |:-----|:-----|:-----|:-----|:-----|
-| clientid | path |  | Yes | string | 
 | userid | path |  | Yes | string | 
+| clientid | path |  | Yes | string | 
 
 
 > __Responses__
@@ -243,58 +203,6 @@ A client with associated public metadata.
 | default | Unexpected error |  |
 
 
-### GET /clients
-
-> __Summary__
-
-> List Clients
-
-> __Description__
-
-> Retrieve a page of Client objects.
-
-
-> __Parameters__
-
-> |Name|Located in|Description|Required|Type|
-|:-----|:-----|:-----|:-----|:-----|
-| nextPageToken | query |  | No | string | 
-
-
-> __Responses__
-
-> |Code|Description|Type|
-|:-----|:-----|:-----|
-| 200 |  | [ClientPage](#clientpage) |
-| default | Unexpected error |  |
-
-
-### POST /clients
-
-> __Summary__
-
-> Create Clients
-
-> __Description__
-
-> Register a new Client.
-
-
-> __Parameters__
-
-> |Name|Located in|Description|Required|Type|
-|:-----|:-----|:-----|:-----|:-----|
-|  | body |  | Yes | [Client](#client) | 
-
-
-> __Responses__
-
-> |Code|Description|Type|
-|:-----|:-----|:-----|
-| 200 |  | [ClientWithSecret](#clientwithsecret) |
-| default | Unexpected error |  |
-
-
 ### GET /users
 
 > __Summary__