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.

Sign up for GitHub

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

Jump to bottom

feat(tenant): allow conference_type to be configurable #119

Merged
merged 1 commit into from
Sep 14, 2021
Merged

feat(tenant): allow conference_type to be configurable #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions shard.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ shards:

place_calendar:
git: https://github.com/placeos/calendar.git
version: 4.11.1
version: 4.11.2

placeos:
git: https://github.com/placeos/crystal-client.git
Expand All @@ -131,7 +131,7 @@ shards:

rethinkdb:
git: https://github.com/place-labs/crystal-rethinkdb.git
version: 0.3.1+git.commit.bd193b6fed95619da3d963267bf61ed35b1fd7f5
version: 0.3.1+git.commit.af92ace5eb60e861a41b93456ac5d73b80feb7bb

rethinkdb-orm:
git: https://github.com/spider-gazelle/rethinkdb-orm.git
Expand Down
22 changes: 13 additions & 9 deletions src/models/tenant.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ struct Office365Config
property tenant : String
property client_id : String
property client_secret : String
property conference_type : String? = PlaceCalendar::Office365::DEFAULT_CONFERENCE

def params
{
tenant: @tenant,
client_id: @client_id,
client_secret: @client_secret,
tenant: @tenant,
client_id: @client_id,
client_secret: @client_secret,
conference_type: @conference_type,
}
end
end
Expand All @@ -27,15 +29,17 @@ struct GoogleConfig
property domain : String
property sub : String = ""
property user_agent : String = "PlaceOS"
property conference_type : String? = PlaceCalendar::Google::DEFAULT_CONFERENCE

def params
{
issuer: @issuer,
signing_key: @signing_key,
scopes: @scopes,
domain: @domain,
sub: @sub,
user_agent: @user_agent,
issuer: @issuer,
signing_key: @signing_key,
scopes: @scopes,
domain: @domain,
sub: @sub,
user_agent: @user_agent,
conference_type: @conference_type,
}
end
end
Expand Down