Fixes from PR review

smallstep · Jul 3, 2021 · 5679c99 · 5679c99
1 parent 77fdfc9
commit 5679c99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/authority/admin/api/middleware.go b/authority/admin/api/middleware.go
@@ -52,15 +52,3 @@ const (
 	// adminContextKey account key
 	adminContextKey = ContextKey("admin")
 )
-
-/*
-// adminFromContext searches the context for the token. Returns the
-// token or an error.
-func adminFromContext(ctx context.Context) (*linkedca.Admin, error) {
-	val, ok := ctx.Value(adminContextKey).(*linkedca.Admin)
-	if !ok || val == nil {
-		return nil, admin.NewErrorISE("admin not in context")
-	}
-	return val, nil
-}
-*/
diff --git a/authority/administrator/collection.go b/authority/administrator/collection.go
@@ -184,7 +184,7 @@ func (c *Collection) Update(id string, nu *linkedca.Admin) (*linkedca.Admin, err
 		return nil, admin.NewError(admin.ErrorNotFoundType, "admin %s not found", adm.Id)
 	}
 	if adm.Type == nu.Type {
-		return nil, admin.NewError(admin.ErrorBadRequestType, "admin %s already has type %s", id, adm.Type)
+		return adm, nil
 	}
 	if adm.Type == linkedca.Admin_SUPER_ADMIN && c.SuperCount() == 1 {
 		return nil, admin.NewError(admin.ErrorBadRequestType, "cannot change role of last super admin")