[feature] Added support for cross-organization login #1055

.eslintrc.json

@@ -47,5 +47,6 @@
         ]
       }
     ]
-  }
+  },
+  "ignorePatterns": ["openwisp-radius/"]
 }

.github/workflows/ci.yml

@@ -107,7 +107,8 @@ jobs:
 
       - name: Get openwisp-radius
         run: |
-          git clone --depth=1 https://github.com/openwisp/openwisp-radius/ openwisp-radius
+          # TODO: Remove branch before merging
+          git clone --depth=1 --branch issues/692-different-identity-verification https://github.com/openwisp/openwisp-radius/ openwisp-radius
           cd openwisp-radius
           echo "OpenWISP RADIUS commit: $(git rev-parse HEAD)"
           echo "OW_RADIUS_VERSION=$(git rev-parse HEAD)" >> $GITHUB_ENV
@@ -131,6 +132,7 @@ jobs:
           pip install -U pip setuptools wheel
           pip install -U -e ".[saml]"
           pip install -U -r requirements-test.txt
+          pip install --no-deps --no-cache-dir --force-reinstall "https://github.com/openwisp/openwisp-users/tarball/issues/497-export-users"
           pip install -U "Django~=5.2.0"
           ./tests/manage.py migrate
 

browser-test/browser_test_utils.py

@@ -8,9 +8,12 @@
 
 def cleanup_test_data(test_data):
     mobile_data = test_data["mobileVerificationTestUser"]
+    cross_org_data = test_data["crossOrgPhoneVerificationUser"]
     User.objects.filter(username=test_data["testuser"]["email"]).delete()
     User.objects.filter(username=test_data["expiredPasswordUser"]["email"]).delete()
+    User.objects.filter(username=cross_org_data["phoneNumber"]).delete()
     User.objects.filter(username=mobile_data["phoneNumber"]).delete()
     User.objects.filter(username=mobile_data["changePhoneNumber"]).delete()
     Organization.objects.filter(name=mobile_data["organization"]).delete()
     RadiusAccounting.objects.filter(username=test_data["testuser"]["email"]).delete()
+    RadiusAccounting.objects.filter(username=cross_org_data["phoneNumber"]).delete()

browser-test/cross-org-phone-verification.test.js

@@ -0,0 +1,57 @@
+import {until} from "selenium-webdriver";
+import {
+  getDriver,
+  getElementByCss,
+  urls,
+  initialData,
+  initializeData,
+  tearDown,
+  getPhoneToken,
+  successToastSelector,
+} from "./utils";
+
+describe("Selenium tests for cross-organization phone verification", () => {
+  let driver;
+
+  beforeAll(async () => {
+    await initializeData("crossOrgPhoneVerification");
+    driver = await getDriver();
+  }, 30000);
+
+  afterAll(async () => {
+    await tearDown(driver);
+  });
+
+  it("should login to a new organization and complete phone verification", async () => {
+    const data = initialData().crossOrgPhoneVerificationUser;
+    await driver.get(urls.verificationLogin(data.targetOrganization));
+    const username = await getElementByCss(driver, "input#username");
+    await username.sendKeys(data.phoneNumber);
+    const password = await getElementByCss(driver, "input#password");
+    await password.sendKeys(data.password);
+    const submitBtn = await getElementByCss(driver, "input[type=submit]");
+    await submitBtn.click();
+    const successToastDiv = await getElementByCss(driver, successToastSelector);
+    await driver.wait(until.elementIsVisible(successToastDiv));
+    await driver.wait(
+      until.urlContains(
+        `/${data.targetOrganization}/mobile-phone-verification`,
+      ),
+      5000,
+    );
+    const codeInput = await getElementByCss(driver, "input#code");
+    const token = getPhoneToken(data.phoneNumber);
+    await codeInput.sendKeys(token);
+    const verifyBtn = await getElementByCss(driver, "button[type='submit']");
+    await verifyBtn.click();
+    await driver.wait(
+      until.urlContains(`/${data.targetOrganization}/status`),
+      5000,
+    );
+    const emailElement = await getElementByCss(
+      driver,
+      "div > p:nth-child(5) > span",
+    );
+    expect(await emailElement.getText()).toEqual(data.email);
+  });
+});

browser-test/get_phone_token.py

@@ -39,11 +39,13 @@ def load_test_data():
 PhoneToken = load_model("openwisp_radius", "PhoneToken")
 
 test_data = load_test_data()
+phone_number = (
+    sys.argv[2]
+    if len(sys.argv) > 1
+    else test_data["mobileVerificationTestUser"]["phoneNumber"]
+)
 try:
-    user = User.objects.filter(
-        username=test_data["mobileVerificationTestUser"]["phoneNumber"]
-    ).first()
-    phone_token = PhoneToken.objects.filter(user=user).first()
+    phone_token = PhoneToken.objects.filter(phone_number=phone_number).first()
     sys.stdout.write(phone_token.token)
     sys.exit(0)
 except Exception as e:

browser-test/initialize_data.py

@@ -23,6 +23,7 @@ def load_test_data():
 # do not initialize data for registration tests
 registration_tests = "register" in sys.argv
 create_mobile_verification_org = "mobileVerification" in sys.argv
+cross_org_phone_verification_tests = "crossOrgPhoneVerification" in sys.argv
 expired_password_tests = "expiredPassword" in sys.argv
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
@@ -79,6 +80,47 @@ def load_test_data():
     RegisteredUser.objects.create(user=user, method=data["method"])
     OrganizationUser.objects.create(organization=org, user=user)
 
+if cross_org_phone_verification_tests:
+    data = test_data["crossOrgPhoneVerificationUser"]
+    target_org, _ = Organization.objects.get_or_create(
+        slug=data["targetOrganization"], name=data["targetOrganization"]
+    )
+    target_settings, created = OrganizationRadiusSettings.objects.get_or_create(
+        organization=target_org,
+        defaults={
+            "needs_identity_verification": True,
+            "sms_verification": True,
+            "sms_sender": data["email"],
+        },
+    )
+    if not created:
+        target_settings.needs_identity_verification = True
+        target_settings.sms_verification = True
+        target_settings.sms_sender = data["email"]
+        target_settings.save()
+    cross_org_user = User.objects.create_user(
+        username=data["phoneNumber"],
+        password=data["password"],
+        email=data["email"],
+        phone_number=data["phoneNumber"],
+    )
+    try:
+        source_org = Organization.objects.get(slug=data["sourceOrganization"])
+    except Organization.DoesNotExist:
+        print(
+            (
+                f"The source organization {data['sourceOrganization']} does not exist "
+                f"in the OpenWISP Radius environment specified ({OPENWISP_RADIUS_PATH}), "
+                f"please create it and repeat the tests."
+            ),
+            file=sys.stderr,
+        )
+    else:
+        OrganizationUser.objects.create(organization=source_org, user=cross_org_user)
+    RegisteredUser.objects.create(
+        user=cross_org_user, method=data["method"], is_verified=True
+    )
+
 
 try:
     org = Organization.objects.get(slug=test_user_organization)

browser-test/mobile-phone-change.test.js

@@ -59,7 +59,7 @@ describe("Selenium tests for <MobilePhoneChange />", () => {
     expect(await successToastDiv.getText()).toEqual("Login successful");
     let codeInput = await getElementByCss(driver, "input#code");
     await driver.wait(until.elementIsVisible(codeInput));
-    const token = getPhoneToken();
+    const token = getPhoneToken(data.phoneNumber);
     await codeInput.sendKeys(token);
     submitBtn = await getElementByCss(driver, "button[type='submit']");
     await driver.wait(until.elementIsVisible(submitBtn));
@@ -94,7 +94,7 @@ describe("Selenium tests for <MobilePhoneChange />", () => {
     expect(await successToastDiv.getText()).toEqual(
       "SMS verification code sent successfully.",
     );
-    const newToken = getPhoneToken();
+    const newToken = getPhoneToken(data.changePhoneNumber);
     codeInput = await getElementByCss(driver, "input#code");
     await driver.wait(until.elementIsVisible(codeInput));
     await codeInput.sendKeys(newToken);

browser-test/mobile-verfication.test.js

@@ -66,7 +66,7 @@ describe("Selenium tests for <MobileVerification />", () => {
     await driver.wait(until.elementIsVisible(failureToastDiv));
     expect(await failureToastDiv.getText()).toEqual("Invalid code.");
     await driver.navigate().refresh();
-    const token = getPhoneToken();
+    const token = getPhoneToken(data.phoneNumber);
     codeInput = await getElementByCss(driver, "input#code");
     await codeInput.clear();
     await codeInput.sendKeys(token);

browser-test/testData.json

@@ -19,5 +19,13 @@
     "method": "mobile_phone",
     "changePhoneNumber": "+393660011333"
   },
+  "crossOrgPhoneVerificationUser": {
+    "email": "crossorg-phone@openwisp.org",
+    "password": "testuser",
+    "sourceOrganization": "default",
+    "targetOrganization": "mobile",
+    "phoneNumber": "+911234567899",
+    "method": "mobile_phone"
+  },
   "allOrgScript": "analytics.js"
 }

browser-test/utils.js

@@ -72,8 +72,8 @@ export const tearDown = async (driver) => {
   driver.close();
 };
 
-export const getPhoneToken = () => {
-  const result = spawnSync("./browser-test/get_phone_token.py");
+export const getPhoneToken = (phoneNumber) => {
+  const result = spawnSync("./browser-test/get_phone_token.py", [phoneNumber]);
   return result.stdout.toString();
 };