Merge branch 'add-code' of https://github.com/rokwire/core-building-b…

…lock into add-code

.secrets.baseline

@@ -333,7 +333,7 @@
         "filename": "driver/web/docs/gen/gen_types.go",
         "hashed_secret": "c9739eab2dfa093cc0e450bf0ea81a43ae67b581",
         "is_verified": false,
-        "line_number": 1806
+        "line_number": 1812
       }
     ],
     "driver/web/docs/resources/admin/auth/login.yaml": [
@@ -364,5 +364,5 @@
       }
     ]
   },
-  "generated_at": "2023-11-24T06:43:37Z"
+  "generated_at": "2023-11-28T04:34:17Z"
 }

core/apis.go

@@ -284,8 +284,8 @@ type servicesImpl struct {
 	app *application
 }
 
-func (s *servicesImpl) SerDeleteAccount(id string) error {
-	return s.app.serDeleteAccount(id)
+func (s *servicesImpl) SerDeleteAccount(id string, apps []string) error {
+	return s.app.serDeleteAccount(id, apps)
 }
 
 func (s *servicesImpl) SerGetAccount(cOrgID string, cAppID string, accountID string) (*model.Account, error) {

core/app_services.go

@@ -132,8 +132,8 @@ func (app *application) serUpdateAccountPreferences(id string, appID string, org
 	return false, nil
 }
 
-func (app *application) serDeleteAccount(id string) error {
-	return app.auth.DeleteAccount(id)
+func (app *application) serDeleteAccount(id string, apps []string) error {
+	return app.auth.DeleteAccount(id, apps)
 }
 
 func (app *application) serGetAccounts(limit int, offset int, appID string, orgID string, accountID *string, firstName *string, lastName *string, authType *string,

core/auth/interfaces.go

@@ -413,7 +413,7 @@ type APIs interface {
 	CheckGroups(context storage.TransactionContext, appOrg *model.ApplicationOrganization, groupIDs []string, assignerPermissions []string, revoke bool) ([]model.AppOrgGroup, error)
 
 	//DeleteAccount deletes an account for the given id
-	DeleteAccount(id string) error
+	DeleteAccount(id string, apps []string) error
 
 	//GetAdminToken returns an admin token for the specified application and organization
 	GetAdminToken(claims tokenauth.Claims, appID string, orgID string, l *logs.Log) (string, error)

core/interfaces.go

@@ -24,7 +24,7 @@ import (
 
 // Services exposes APIs for the driver adapters
 type Services interface {
-	SerDeleteAccount(id string) error
+	SerDeleteAccount(id string, apps []string) error
 	SerGetAccount(cOrgID string, cAppID string, accountID string) (*model.Account, error)
 	SerGetProfile(cOrgID string, cAppID string, accountID string) (*model.Profile, error)
 	SerGetPreferences(cOrgID string, cAppID string, accountID string) (map[string]interface{}, error)

driver/web/apis_services.go

@@ -436,7 +436,16 @@ func (h ServicesApisHandler) getServiceRegistrations(l *logs.Log, r *http.Reques
 }
 
 func (h ServicesApisHandler) deleteAccount(l *logs.Log, r *http.Request, claims *tokenauth.Claims) logs.HTTPResponse {
-	err := h.coreAPIs.Services.SerDeleteAccount(claims.Subject)
+	//apps
+	var apps []string
+	appsArg := r.URL.Query().Get("apps")
+	if appsArg != "" {
+		apps = strings.Split(appsArg, ",")
+	} else {
+		apps = append(apps, claims.AppID)
+	}
+
+	err := h.coreAPIs.Services.SerDeleteAccount(claims.Subject, apps)
 	if err != nil {
 		return l.HTTPResponseErrorAction(logutils.ActionDelete, model.TypeAccount, nil, err, http.StatusInternalServerError, true)
 	}

driver/web/docs/gen/def.yaml

@@ -1159,6 +1159,15 @@ paths:
         **Auth:** Requires auth token
       security:
         - bearerAuth: []
+      parameters:
+        - name: apps
+          in: query
+          description: A comma-separated list of app_ids
+          required: false
+          style: form
+          explode: false
+          schema:
+            type: string
       responses:
         '200':
           description: Success

driver/web/docs/resources/services/account.yaml

@@ -8,6 +8,15 @@ delete:
     **Auth:** Requires auth token
   security:
     - bearerAuth: []
+  parameters:
+    - name: apps
+      in: query
+      description: A comma-separated list of app_ids
+      required: false
+      style: form
+      explode: false
+      schema:
+        type: string  
   responses:
     200:
       description: Success