Revert "Merge branch 'main' into feature/remote-debug"

This reverts commit 6d6333058c, reversing
changes made to 446aded1f7.

shared/management/http/api/openapi.yml

@@ -278,10 +278,6 @@ components:
           description: (Cloud only) Enables or disables peer approval globally. If enabled, all peers added will be in pending state until approved by an admin.
           type: boolean
           example: true
-        user_approval_required:
-          description: Enables manual approval for new users joining via domain matching. When enabled, users are blocked with pending approval status until explicitly approved by an admin.
-          type: boolean
-          example: false
         network_traffic_logs_enabled:
           description: Enables or disables network traffic logging. If enabled, all network traffic events from peers will be stored.
           type: boolean
@@ -298,7 +294,6 @@ components:
           example: true
       required:
         - peer_approval_enabled
-        - user_approval_required
         - network_traffic_logs_enabled
         - network_traffic_logs_groups
         - network_traffic_packet_counter_enabled
@@ -360,10 +355,6 @@ components:
           description: Is true if this user is blocked. Blocked users can't use the system
           type: boolean
           example: false
-        pending_approval:
-          description: Is true if this user requires approval before being activated. Only applicable for users joining via domain matching when user_approval_required is enabled.
-          type: boolean
-          example: false
         issued:
           description: How user was issued by API or Integration
           type: string
@@ -378,7 +369,6 @@ components:
         - auto_groups
         - status
         - is_blocked
-        - pending_approval
     UserPermissions:
       type: object
       properties:
@@ -1472,10 +1462,6 @@ components:
           items:
             type: string
             example: "chacbco6lnnbn6cg5s91"
-        skip_auto_apply:
-          description: Indicate if this exit node route (0.0.0.0/0) should skip auto-application for client routing
-          type: boolean
-          example: false
       required:
         - id
         - description
@@ -2778,63 +2764,6 @@ paths:
           "$ref": "#/components/responses/forbidden"
         '500':
           "$ref": "#/components/responses/internal_error"
-  /api/users/{userId}/approve:
-    post:
-      summary: Approve user
-      description: Approve a user that is pending approval
-      tags: [ Users ]
-      security:
-        - BearerAuth: [ ]
-        - TokenAuth: [ ]
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: string
-          description: The unique identifier of a user
-      responses:
-        '200':
-          description: Returns the approved user
-          content:
-            application/json:
-              schema:
-                "$ref": "#/components/schemas/User"
-        '400':
-          "$ref": "#/components/responses/bad_request"
-        '401':
-          "$ref": "#/components/responses/requires_authentication"
-        '403':
-          "$ref": "#/components/responses/forbidden"
-        '500':
-          "$ref": "#/components/responses/internal_error"
-  /api/users/{userId}/reject:
-    delete:
-      summary: Reject user
-      description: Reject a user that is pending approval by removing them from the account
-      tags: [ Users ]
-      security:
-        - BearerAuth: [ ]
-        - TokenAuth: [ ]
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: string
-          description: The unique identifier of a user
-      responses:
-        '200':
-          description: User rejected successfully
-          content: {}
-        '400':
-          "$ref": "#/components/responses/bad_request"
-        '401':
-          "$ref": "#/components/responses/requires_authentication"
-        '403':
-          "$ref": "#/components/responses/forbidden"
-        '500':
-          "$ref": "#/components/responses/internal_error"
   /api/users/current:
     get:
       summary: Retrieve current user

shared/management/http/api/types.gen.go

@@ -284,9 +284,6 @@ type AccountExtraSettings struct {
 
 	// PeerApprovalEnabled (Cloud only) Enables or disables peer approval globally. If enabled, all peers added will be in pending state until approved by an admin.
 	PeerApprovalEnabled bool `json:"peer_approval_enabled"`
-
-	// UserApprovalRequired Enables manual approval for new users joining via domain matching. When enabled, users are blocked with pending approval status until explicitly approved by an admin.
-	UserApprovalRequired bool `json:"user_approval_required"`
 }
 
 // AccountOnboarding defines model for AccountOnboarding.
@@ -1622,9 +1619,6 @@ type Route struct {
 
 	// PeerGroups Peers Group Identifier associated with route. This property can not be set together with `peer`
 	PeerGroups *[]string `json:"peer_groups,omitempty"`
-
-	// SkipAutoApply Indicate if this exit node route (0.0.0.0/0) should skip auto-application for client routing
-	SkipAutoApply *bool `json:"skip_auto_apply,omitempty"`
 }
 
 // RouteRequest defines model for RouteRequest.
@@ -1664,9 +1658,6 @@ type RouteRequest struct {
 
 	// PeerGroups Peers Group Identifier associated with route. This property can not be set together with `peer`
 	PeerGroups *[]string `json:"peer_groups,omitempty"`
-
-	// SkipAutoApply Indicate if this exit node route (0.0.0.0/0) should skip auto-application for client routing
-	SkipAutoApply *bool `json:"skip_auto_apply,omitempty"`
 }
 
 // RulePortRange Policy rule affected ports range
@@ -1855,11 +1846,8 @@ type User struct {
 	LastLogin *time.Time `json:"last_login,omitempty"`
 
 	// Name User's name from idp provider
-	Name string `json:"name"`
-
-	// PendingApproval Is true if this user requires approval before being activated. Only applicable for users joining via domain matching when user_approval_required is enabled.
-	PendingApproval bool             `json:"pending_approval"`
-	Permissions     *UserPermissions `json:"permissions,omitempty"`
+	Name        string           `json:"name"`
+	Permissions *UserPermissions `json:"permissions,omitempty"`
 
 	// Role User's NetBird account role
 	Role string `json:"role"`