Code

Add magic logins#3669

Code

Open

connortechnology wants to merge 33 commits intoZoneMinder:masterZoneMinder/zoneminder:masterfrom connortechnology:add_magic_Loginsconnortechnology/ZoneMinder:add_magic_LoginsCopy head branch name to clipboard

+529-42

Commits

Commits on Mar 1, 2023

• Add some logic to send magic link

  

  Isaac Connor

  committed
  d2bafe8

  Copy full SHA for d2bafe8

• Add Forgot password button

  

  Isaac Connor

  committed
  11cfe82

  Copy full SHA for 11cfe82

• Add MagicLink class

  

  Isaac Connor

  committed
  f1d1cdb

  Copy full SHA for f1d1cdb

• Add MagicLink table

  

  Isaac Connor

  committed
  b312c5a

  Copy full SHA for b312c5a

• Merge branch 'master' into add_magic_Logins

  

  Isaac Connor

  committed
  044214a

  Copy full SHA for 044214a

Commits on Mar 2, 2023

• Fixup table def. Add primary key, autoincremement and defaults

  

  Isaac Connor

  committed
  2596bbd

  Copy full SHA for 2596bbd

• Add email_content

  

  Isaac Connor

  committed
  581781f

  Copy full SHA for 581781f

• Add User() fill in GenerateToken and url()

  

  Isaac Connor

  committed
  705bb40

  Copy full SHA for 705bb40

• Fix inserting including Id

  

  Isaac Connor

  committed
  15eca9c

  Copy full SHA for 15eca9c

• Add Name,Email,Phone defaults and if user has a name assigned, use it instead of Username

  

  Isaac Connor

  committed
  860ea5b

  Copy full SHA for 860ea5b

• Use magic instead of token as that conflict with jwt. user user_id instead of username when doing magic login.

  

  Isaac Connor

  committed
  33c220a

  Copy full SHA for 33c220a

• do error messages if action=login but required fields not there. Uf doing forgotpassword, logout. Fixup sending email, using templates etc

  

  Isaac Connor

  committed
  4d4b787

  Copy full SHA for 4d4b787

• Add saveUserToSession and authByMagic

  

  Isaac Connor

  committed
  b8d272b

  Copy full SHA for b8d272b

• Add get_include_contents and send_email functions

  

  Isaac Connor

  committed
  8793fc2

  Copy full SHA for 8793fc2

• Handle user being false instead of null. Don't redirect to login if asking for changepassword

  

  Isaac Connor

  committed
  c8e6832

  Copy full SHA for c8e6832

• Still do all the header code when view=login i case we are viewing that when logged in, so various things like logout modal work

  

  Isaac Connor

  committed
  da6f1f5

  Copy full SHA for da6f1f5

• add canEdit to _options_users

  

  Isaac Connor

  committed
  2b383c8

  Copy full SHA for 2b383c8

• Spacing

  

  Isaac Connor

  committed
  c30696d

  Copy full SHA for c30696d

• include options_users instead of options_api

  

  Isaac Connor

  committed
  6ae46a2

  Copy full SHA for 6ae46a2

• add changepassword, email content and email css

  

  Isaac Connor

  committed
  ef51214

  Copy full SHA for ef51214

• Add config setting for allowing login by Magic link

  

  Isaac Connor

  committed
  0693f61

  Copy full SHA for 0693f61

• Do auth by Magic link if feature is turned on

  

  Isaac Connor

  committed
  fa60381

  Copy full SHA for fa60381

• since magic auth is done in auth.php now, must be logged in to see changepasword view

  

  Isaac Connor

  committed
  49b37e9

  Copy full SHA for 49b37e9

• Only show forgot password button if auth magic is turned on

  

  Isaac Connor

  committed
  6e5314b

  Copy full SHA for 6e5314b

• Don't do login in view, since we can't redirect

  

  Isaac Connor

  committed
  ccdd6d3

  Copy full SHA for ccdd6d3

• Carry over error_messages in session

  

  Isaac Connor

  committed
  45922a3

  Copy full SHA for 45922a3

• Handle empty Name

  

  Isaac Connor

  committed
  26ea691

  Copy full SHA for 26ea691

• include skin/css based email.css

  

  Isaac Connor

  committed
  7c6be83

  Copy full SHA for 7c6be83

• Add a success message

  

  Isaac Connor

  committed
  6312404

  Copy full SHA for 6312404

• Add css styles for changepassword

  

  Isaac Connor

  committed
  88dd5d2

  Copy full SHA for 88dd5d2

Commits on Mar 3, 2023

• Use sha256 instead of md5

  

  Isaac Connor

  committed
  706a0dc

  Copy full SHA for 706a0dc

• bcrypt hash the password when changing password

  

  Isaac Connor

  committed
  fe1245a

  Copy full SHA for fe1245a

• Handle ZM_AUTH_MAGIC not being defined

  

  Isaac Connor

  committed
  c92dea9

  Copy full SHA for c92dea9