Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix id4me #585

Merged
merged 1 commit into from
Mar 6, 2023
Merged

Fix id4me #585

merged 1 commit into from
Mar 6, 2023

Conversation

julien-nc
Copy link
Member

  • Fix id4me-related imports
  • Catch InvalidOpenIdDomainException exception to show nice error

I tried to import it via mozart but the src dir was not added in lib/Vendor/Id4me. I didn't wanna fight mozart so missing import are done via requiring composer's autoload file and then we directly import from vendor.

…on to show nice error

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
@julien-nc julien-nc added the bug Something isn't working label Feb 27, 2023
@@ -46,6 +46,11 @@
use OCP\IUserSession;
use OCP\Security\ISecureRandom;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a fan of this.

diff --git a/composer.json b/composer.json
index 64f65dc..017a998 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,8 @@
         "classmap_directory": "/lib/autoload/",
         "classmap_prefix": "NEXTCLOUD_USER_OIDC_",
         "packages": [
-            "firebase/php-jwt"
+            "firebase/php-jwt",
+            "id4me/id4me-rp"
         ],
         "delete_vendor_directories": true
     }

should make them available through Mozart and then you should be able to use them with OCA\\UserOIDC\\Vendor\\Id4me...

@julien-nc julien-nc merged commit 4a6b66f into main Mar 6, 2023
@julien-nc julien-nc deleted the fix/noid/broken-id4me branch March 6, 2023 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants