Skip to content

Commit 49ef940

Browse files
committed
Use AccessToken from DB
1 parent afbb365 commit 49ef940

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/Server/AzureTable.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ let mapTag (entity: DynamicTableEntity) : Tag =
154154
let mapUser (entity: DynamicTableEntity) : User =
155155
{ UserID = entity.RowKey
156156
SonosID = getStringProperty "SonosID" entity
157+
SonosAccessToken = getStringProperty "SonosAccessToken" entity
158+
SonosRefreshToken = getStringProperty "SonosRefreshToken" entity
157159
SpeakerType =
158160
match Decode.fromString SpeakerType.Decoder (getStringProperty "SpeakerType" entity) with
159161
| Error msg -> failwith msg

src/Server/Server.fs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ let uploadEndpoint (userID:string) =
123123
})
124124
}
125125

126-
let accessToken = "0df1e468-cd6f-4038-9734-9bcf4777925b"
127126
let group = "RINCON_347E5CF009E001400:3169659583"
128127

129128
open System.Net
@@ -246,8 +245,8 @@ let previousFileEndpoint (userID,token) =
246245
return! setBodyFromString txt next ctx
247246
| SpeakerType.Sonos ->
248247
let logger = ctx.GetLogger "PreviousFile"
249-
let! session = createOrJoinSession logger accessToken group
250-
do! playStream logger accessToken session tag
248+
let! session = createOrJoinSession logger user.SonosAccessToken group
249+
do! playStream logger user.SonosAccessToken session tag
251250

252251
let tag : TagForBox = {
253252
Token = tag.Token
@@ -304,8 +303,8 @@ let nextFileEndpoint (userID,token) =
304303
return! setBodyFromString txt next ctx
305304
| SpeakerType.Sonos ->
306305
let logger = ctx.GetLogger "NextFile"
307-
let! session = createOrJoinSession logger accessToken group
308-
do! playStream logger accessToken session tag
306+
let! session = createOrJoinSession logger user.SonosAccessToken group
307+
do! playStream logger user.SonosAccessToken session tag
309308

310309
let tag : TagForBox = {
311310
Token = tag.Token

src/Shared/Shared.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,24 @@ type SpeakerType =
175175
type User =
176176
{ UserID : string
177177
SpeakerType : SpeakerType
178+
SonosAccessToken : string
179+
SonosRefreshToken : string
178180
SonosID : string }
179181

180182
static member Encoder (user : User) =
181183
Encode.object [
182184
"UserID", Encode.string user.UserID
183185
"SpeakerType", SpeakerType.Encoder user.SpeakerType
186+
"SonosAccessToken", Encode.string user.SonosAccessToken
187+
"SonosRefreshToken", Encode.string user.SonosRefreshToken
184188
"SonosID", Encode.string user.SonosID
185189
]
186190
static member Decoder =
187191
Decode.object (fun get ->
188192
{ UserID = get.Required.Field "UserID" Decode.string
189193
SpeakerType = get.Required.Field "SpeakerType" SpeakerType.Decoder
194+
SonosAccessToken = get.Required.Field "SonosAccessToken" Decode.string
195+
SonosRefreshToken = get.Required.Field "SonosRefreshToken" Decode.string
190196
SonosID = get.Required.Field "SonosID" Decode.string }
191197
)
192198

0 commit comments

Comments
 (0)