WIP: impr(frontend): Handle alphanumeric GL3 access codes

Author: pizkaz

app/Http/Middleware/RoomAuthenticate.php

@@ -85,7 +85,7 @@ public function handle($request, Closure $next, $allowUnAuthenticated = false)
 
             $accessCode = $request->header('Access-Code');
             // check if access code is correct
-            if (is_numeric($accessCode) && $room->access_code == $accessCode) {
+            if ($room->access_code == $accessCode) {
                 $authenticated = true;
             } else {
                 Counter::get('room_authentication_errors_total')->inc('access_code_invalid');

app/Http/Requests/UpdateRoomSettings.php

@@ -42,12 +42,17 @@ public function rules()
      */
     private function getAccessCodeValidationRule(): array
     {
-        // Support keeping old 6-digit codes (Greenlight v2)
+        // Support keeping
+        // * old 6-digit numeric codes (Greenlight v2)
+        // * old 6-digit alphanumeric codes (Greenlight v3)
         $current = $this->room->access_code ?? '';
         $incoming = $this->str('access_code') ?? '';
+        $alphanumeric = $current == $incoming && ! is_numeric($current);
         $digits = ($current == $incoming && strlen($current) == 6) ? 6 : 9;
 
-        $rules = ['numeric', 'digits:'.$digits, 'bail'];
+        $rules = $alphanumeric
+               ? ['alpha_num:ascii', 'lowercase', 'size:6', 'bail']
+               : ['numeric', 'digits:'.$digits, 'bail'];
 
         // Make sure that the given room type id is a number
         if (is_numeric($this->input('room_type'))) {

app/Models/Room.php

@@ -383,7 +383,8 @@ public function getModeratorOnlyMessage()
         $message = __('rooms.invitation.room', ['roomname' => $this->name, 'platform' => $appName]).'<br>';
         $message .= __('rooms.invitation.link').': '.config('app.url').'/rooms/'.$this->id;
         if ($this->access_code != null) {
-            $message .= '<br>'.__('rooms.invitation.code').': '.implode('-', str_split($this->access_code, 3));
+            $message .= '<br>'.__('rooms.invitation.code').': ';
+            $message .= $this->legacy_code ? implode('-', str_split($this->access_code, 3)) : $this->access_code;
         }
 
         return $message;

resources/js/components/RoomShareButton.vue

@@ -115,8 +115,10 @@ const roomUrl = computed(() => {
 });
 
 const formattedAccessCode = computed(() => {
-  return String(props.room.access_code)
-    .match(/.{1,3}/g)
-    .join("-");
+  return isNaN(props.room.access_code)
+    ? props.room.access_code
+    : String(props.room.access_code)
+        .match(/.{1,3}/g)
+        .join("-");
 });
 </script>

resources/js/views/RoomsView.vue

@@ -119,8 +119,8 @@
                     id="access-code"
                     v-model="accessCodeInput"
                     autofocus
-                    :mask="room.legacy_code ? '999-999' : '999-999-999'"
-                    :placeholder="room.legacy_code ? '123-456' : '123-456-789'"
+                    :mask="room.legacy_code ? '******' : '999-999-999'"
+                    :placeholder="room.legacy_code ? '123abc' : '123-456-789'"
                     :invalid="accessCodeInvalid"
                     :disabled="authThrottledFor > 0"
                     class="text-center"

tests/Backend/Feature/api/v1/Room/RoomTest.php

@@ -557,6 +557,13 @@ public function test_access_code_guests()
         $this->withHeaders(['Access-Code' => '012345'])->getJson(route('api.v1.rooms.show', ['room' => $room]))
             ->assertStatus(200)
             ->assertJsonFragment(['authenticated' => true]);
+
+        // Try with legacy alphanumeric access code
+        $room->access_code = '012abc';
+        $room->save();
+        $this->withHeaders(['Access-Code' => '012abc'])->getJson(route('api.v1.rooms.show', ['room' => $room]))
+            ->assertStatus(200)
+            ->assertJsonFragment(['authenticated' => true]);
     }
 
     /**

tests/Frontend/e2e/RoomsViewGeneral.cy.js

@@ -384,7 +384,7 @@ describe("Room View general", function () {
         cy.contains("rooms.require_access_code").should("be.visible");
 
         // Submit valid access code
-        cy.get("#access-code").type("012345");
+        cy.get("#access-code").type("012abc");
       });
 
     cy.fixture("room.json").then((room) => {
@@ -404,7 +404,7 @@ describe("Room View general", function () {
     cy.get('[data-test="room-login-button"]').click();
 
     cy.wait("@roomRequest").then((interception) => {
-      expect(interception.request.headers["access-code"]).to.eq("012345");
+      expect(interception.request.headers["access-code"]).to.eq("012abc");
     });
 
     cy.get('[data-test="room-access-code-overlay"]').should("not.exist");

tests/Frontend/e2e/RoomsViewSettings.cy.js

@@ -1236,6 +1236,73 @@ describe("Rooms view settings", function () {
     );
   });
 
+  it("change settings with GL3 access code", function () {
+    cy.fixture("roomSettings.json").then((roomSettings) => {
+      roomSettings.data.access_code = "fck4fd";
+      cy.intercept("GET", "api/v1/rooms/abc-def-123/settings", {
+        statusCode: 200,
+        body: roomSettings,
+      }).as("roomSettingsRequest");
+    });
+
+    cy.visit("/rooms/abc-def-123#tab=settings");
+    cy.wait("@roomSettingsRequest");
+
+    cy.get("#room-setting-access_code")
+      .should("have.value", "fck4fd")
+      .and("not.be.disabled");
+
+    // Change settings
+    cy.get("#room-setting-name").clear();
+    cy.get("#room-setting-name").type("Meeting Two");
+
+    // Save settings
+    cy.fixture("roomTypesWithSettings.json").then(() => {
+      cy.fixture("roomSettings.json").then((roomSettings) => {
+        roomSettings.data.name = "Meeting Two";
+        roomSettings.data.access_code = "fck4fd";
+
+        cy.intercept("PUT", "api/v1/rooms/abc-def-123", {
+          statusCode: 200,
+          body: roomSettings,
+        }).as("roomSettingsSaveRequest");
+
+        cy.get('[data-test="room-settings-save-button"]').click();
+      });
+    });
+
+    cy.wait("@roomSettingsSaveRequest").then((interception) => {
+      expect(interception.request.body).to.eql({
+        name: "Meeting Two",
+        expert_mode: true,
+        welcome: "Welcome message",
+        short_description: "Short description",
+        access_code: "fck4fd",
+        room_type: 2,
+        mute_on_start: true,
+        lock_settings_disable_cam: false,
+        webcams_only_for_moderator: true,
+        lock_settings_disable_mic: false,
+        lock_settings_disable_private_chat: false,
+        lock_settings_disable_public_chat: true,
+        lock_settings_disable_note: true,
+        lock_settings_hide_user_list: true,
+        everyone_can_start: false,
+        allow_membership: false,
+        allow_guests: true,
+        default_role: 1,
+        lobby: 2,
+        visibility: 1,
+        record_attendance: false,
+        record: false,
+        auto_start_recording: false,
+      });
+    });
+
+    // Check that settings are shown correctly
+    cy.get("#room-setting-name").should("have.value", "Meeting Two");
+  });
+
   it("change settings errors", function () {
     cy.fixture("roomTypesWithSettings.json").then((roomTypes) => {
       cy.fixture("roomSettings.json").then((roomSettings) => {