# Conflicts:
#	lib/service/config.dart

…cleanup

…cleanup

# Conflicts:
#	lib/service/config.dart
#	lib/service/groups.dart
#	lib/service/styles.dart

# Conflicts:
#	example/pubspec.lock
#	lib/service/config.dart
#	pubspec.yaml

# Conflicts:
#	lib/model/auth2.dart
#	lib/service/auth2.dart

# Conflicts:
#	example/pubspec.lock
#	lib/service/assets.dart
#	lib/service/config.dart
#	lib/service/geo_fence.dart
#	lib/ui/panels/web_panel.dart
#	lib/ui/popups/popup_message.dart
#	lib/ui/widgets/flex_content.dart
#	lib/ui/widgets/form_field.dart
#	lib/ui/widgets/survey.dart
#	pubspec.yaml

# Conflicts:
#	android/build.gradle
#	lib/service/config.dart
#	pubspec.yaml

* first web auth implementation [#291]

* upgrade some dependencies, modifications to get web apps working (without auth)

* bug fixes, better error handling [#291]

* bug fixes, better error handling, remove hardcoded URL for web identifier [#291]

* improve Auth2Csrf headers, implement web strategy for app configs [#291]

* update changelog

* logout bug fix

* fix errors

* fix merge issues

---------

Co-authored-by: Stephen Hurwit <[email protected]>

# Conflicts:
#	lib/service/auth2.dart
#	pubspec.yaml

…template-cleanup-passkeys

* create platform implementations for web passkeys and mobile passkeys

* fix errors

* bug fixes, challenge not working

* dart:html pain

* attestation object working, but getting tags error

* js interop is nice, passkeys working locally

* update changelog

* add anonymous ids to account preferences

* fix preferences jeson encoding bug

* update changelog

* add flag to enable association of anonymous ids

* map anonymous IDs to timestamps [#309]

* do not overwrite timestamps for existing anonymous IDs

* fix anonymous IDs from json

* fix date issues

---------

Co-authored-by: Stephen Hurwit <[email protected]>

# Conflicts:
#	CHANGELOG.md
#	lib/ui/widgets/ribbon_button.dart
#	lib/utils/utils.dart

…template-cleanup-passkeys

# Conflicts:
#	lib/service/config.dart

…tter-plugin into template-cleanup

…cleanup

# Conflicts:
#	pubspec.yaml

# Conflicts:
#	lib/service/styles.dart
#	lib/ui/widgets/ribbon_button.dart

# Conflicts:
#	CHANGELOG.md
#	example/pubspec.lock
#	lib/service/auth2.dart
#	lib/service/config.dart
#	lib/service/groups.dart
#	lib/service/styles.dart
#	lib/ui/panels/survey_creation_panel.dart
#	lib/ui/panels/web_panel.dart
#	lib/ui/widget_builders/survey.dart
#	lib/ui/widgets/ribbon_button.dart
#	lib/ui/widgets/section_header.dart
#	lib/utils/utils.dart
#	pubspec.yaml

# Conflicts:
#	CHANGELOG.md
#	lib/model/auth2.dart
#	lib/service/auth2.dart
#	lib/service/styles.dart
#	lib/ui/widgets/ribbon_button.dart
#	pubspec.yaml

* update linking to handle passkeys

* add identifier type enum, allow multiple identifier types for passkey auth

* update changelog

* undo testing change

* return alternative sign in options if passkey signin fails

* add refresh change for easier testing

* add username to all passkey auth requests

* passkey auth type code bug fix

* fix phone auth type

* upgrade dependencies, add back error on anonymous auth fail

* add graphql support

* add possibleTypes to graphql client

* allow graphql errors

* fix typo

* testing setup

* allow identifier-less sign in for passkeys

* identifier-less flow for web working

* fix material icon styles

* begin adding auth identifier class and refactoring

* resolve errors

* change passkey to git dependency

* more auth service, model refactoring

* more auth service refactoring

* oidc sso integration

* set route name in onboarding, allow login with identifier ID

* Upgrade to connectivity_plus [rokmetro/vogue-app#45].

* Fixed Android build: require gradle-7.3.3 for Java 17.

* move identifier type, login type enums into auth type, auth identifier classes

* add mastodon functionality

* add relative time util

* update flex ui auth rules

* add media to status creator

* add update username function

* handle mastodon sign up

* add poll display and vote

* remove username from account and email, phone from account profile

* improve encryption util

* fix passkey auth bugs, add app_type_identifier field back to link auth type

* add more error status codes to passkey auth

* change passkey sign up creation options to string

* auth type model fix, ribbon button description padding fix

* use oidcAuthType getter instead of Auth2Type.typeOidcIllinois

* update changelog

* upgrade webview

* handle account secrets

---------

Co-authored-by: Stephen Hurwit <[email protected]>
Co-authored-by: Mihail Varbanov <[email protected]>